From 001e6a1eee2597b65a6e89af48060f770145eec1 Mon Sep 17 00:00:00 2001 From: manishvenu Date: Wed, 25 Mar 2026 10:09:46 -0600 Subject: [PATCH 01/14] New tests --- cime_config/testdefs/testlist_mom.xml | 39 +++++++ .../mom/regional/base/shell_commands | 16 +++ .../mom/regional/base/user_nl_mom | 97 +++++++++++++++++ .../mom/regional/bgc/shell_commands | 16 +++ .../mom/regional/bgc/user_nl_mom | 103 ++++++++++++++++++ 5 files changed, 271 insertions(+) create mode 100644 cime_config/testdefs/testmods_dirs/mom/regional/base/shell_commands create mode 100644 cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom create mode 100644 cime_config/testdefs/testmods_dirs/mom/regional/bgc/shell_commands create mode 100644 cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom diff --git a/cime_config/testdefs/testlist_mom.xml b/cime_config/testdefs/testlist_mom.xml index 8574fc0..604aa42 100644 --- a/cime_config/testdefs/testlist_mom.xml +++ b/cime_config/testdefs/testlist_mom.xml @@ -246,4 +246,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/base/shell_commands b/cime_config/testdefs/testmods_dirs/mom/regional/base/shell_commands new file mode 100644 index 0000000..35fd6d9 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/mom/regional/base/shell_commands @@ -0,0 +1,16 @@ +./xmlchange OCN_NX=60 +./xmlchange OCN_NY=60 +./xmlchange OCN_DOMAIN_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama/ESMF_mesh_panama1_352fd1.nc +./xmlchange ICE_DOMAIN_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama/ESMF_mesh_panama1_352fd1.nc +./xmlchange MASK_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama/ESMF_mesh_panama1_352fd1.nc +./xmlchange ATM_GRID=TL319 +./xmlchange LND_GRID=TL319 +./xmlchange ATM_DOMAIN_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/share/meshes/TL319_151007_ESMFmesh.nc +./xmlchange LND_DOMAIN_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/share/meshes/TL319_151007_ESMFmesh.nc +./xmlchange MOM6_MEMORY_MODE=dynamic_symmetric +./xmlchange RUN_STARTDATE=2000-01-01 +./xmlchange ROF2OCN_LIQ_RMAPNAME=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama/GLOFAS_to_panama1_map_r20_f40_nnsm.nc +./xmlchange ROF2OCN_ICE_RMAPNAME=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama/GLOFAS_to_panama1_map_r20_f40_nnsm.nc + +# Set PE Layout +./xmlchange NTASKS_OCN=20 \ No newline at end of file diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom new file mode 100644 index 0000000..ea37abf --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom @@ -0,0 +1,97 @@ +INPUTDIR = /glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama +TRIPOLAR_N = False +REENTRANT_X = False +REENTRANT_Y = False +NIGLOBAL = 60 +NJGLOBAL = 60 +GRID_CONFIG = mosaic +GRID_FILE = ocean_hgrid_panama1_352fd1.nc +TOPO_CONFIG = file +TOPO_FILE = ocean_topog_panama1_352fd1.nc +MAXIMUM_DEPTH = 3431.7499950346473 +MINIMUM_DEPTH = 9.5 +NK = 75 +COORD_CONFIG = none +ALE_COORDINATE_CONFIG = FILE:ocean_vgrid_panama1_352fd1.nc +REGRIDDING_COORDINATE_MODE = Z* + +! Timesteps (based on grid resolution) +DT = 300.0 +DT_THERM = 900.0 + +! Enable tidal forcing in MOM6 +TIDES = True + +! Enable M2 tidal constituent +TIDE_M2 = True + +! Drag coefficient for tidal forcing +CD_TIDES = 0.0018 + +! Use equilibrium phase for tides +TIDE_USE_EQ_PHASE = True + +! Reference date for tidal forcing +TIDE_REF_DATE = 2000, 01, 01 + +! Add equilibrium phase to OBC tides +OBC_TIDE_ADD_EQ_PHASE = True + +! Number of tidal constituents +OBC_TIDE_N_CONSTITUENTS = 1 + +! List of tidal constituents +OBC_TIDE_CONSTITUENTS = "M2" + +! Reference date for OBC tidal forcing +OBC_TIDE_REF_DATE = 2000, 01, 01 + +! Chlorophyll data file +CHL_FILE = seawifs-clim-1997-2010-panama1.nc + +! Enable chlorophyll from file +CHL_FROM_FILE = TRUE + +! Enable variable penetration for shortwave +VAR_PEN_SW = TRUE + +! Number of shortwave penetration bands +PEN_SW_NBANDS = 3 + +! Initial conditions +INIT_LAYERS_FROM_Z_FILE = True +Z_INIT_ALE_REMAPPING = True +TEMP_SALT_INIT_VERTICAL_REMAP_ONLY = True +DEPRESS_INITIAL_SURFACE = True +VELOCITY_CONFIG = file +TEMP_SALT_Z_INIT_FILE = init_tracers.nc +SURFACE_HEIGHT_IC_FILE = init_eta.nc +VELOCITY_FILE = init_vel.nc +Z_INIT_FILE_PTEMP_VAR = temp +Z_INIT_FILE_SALT_VAR = salt +SURFACE_HEIGHT_IC_VAR = eta_t +U_IC_VAR = u +V_IC_VAR = v + +! Open boundary conditions +OBC_NUMBER_OF_SEGMENTS = 4 +OBC_FREESLIP_VORTICITY = False +OBC_FREESLIP_STRAIN = False +OBC_COMPUTED_VORTICITY = True +OBC_COMPUTED_STRAIN = True +OBC_ZERO_BIHARMONIC = True +OBC_TRACER_RESERVOIR_LENGTH_SCALE_OUT = 3.0E+04 +OBC_TRACER_RESERVOIR_LENGTH_SCALE_IN = 3000.0 +BRUSHCUTTER_MODE = True +OBC_SEGMENT_001 = "J=0,I=0:N,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" +OBC_SEGMENT_001_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 +OBC_SEGMENT_001_DATA = "U=file:forcing_obc_segment_001.nc(u),V=file:forcing_obc_segment_001.nc(v),SSH=file:forcing_obc_segment_001.nc(eta),TEMP=file:forcing_obc_segment_001.nc(temp),SALT=file:forcing_obc_segment_001.nc(salt),Uamp=file:tu_segment_001.nc(uamp),Uphase=file:tu_segment_001.nc(uphase),Vamp=file:tu_segment_001.nc(vamp),Vphase=file:tu_segment_001.nc(vphase),SSHamp=file:tz_segment_001.nc(zamp),SSHphase=file:tz_segment_001.nc(zphase)" +OBC_SEGMENT_002 = "J=N,I=N:0,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" +OBC_SEGMENT_002_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 +OBC_SEGMENT_002_DATA = "U=file:forcing_obc_segment_002.nc(u),V=file:forcing_obc_segment_002.nc(v),SSH=file:forcing_obc_segment_002.nc(eta),TEMP=file:forcing_obc_segment_002.nc(temp),SALT=file:forcing_obc_segment_002.nc(salt),Uamp=file:tu_segment_002.nc(uamp),Uphase=file:tu_segment_002.nc(uphase),Vamp=file:tu_segment_002.nc(vamp),Vphase=file:tu_segment_002.nc(vphase),SSHamp=file:tz_segment_002.nc(zamp),SSHphase=file:tz_segment_002.nc(zphase)" +OBC_SEGMENT_003 = "I=0,J=N:0,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" +OBC_SEGMENT_003_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 +OBC_SEGMENT_003_DATA = "U=file:forcing_obc_segment_003.nc(u),V=file:forcing_obc_segment_003.nc(v),SSH=file:forcing_obc_segment_003.nc(eta),TEMP=file:forcing_obc_segment_003.nc(temp),SALT=file:forcing_obc_segment_003.nc(salt),Uamp=file:tu_segment_003.nc(uamp),Uphase=file:tu_segment_003.nc(uphase),Vamp=file:tu_segment_003.nc(vamp),Vphase=file:tu_segment_003.nc(vphase),SSHamp=file:tz_segment_003.nc(zamp),SSHphase=file:tz_segment_003.nc(zphase)" +OBC_SEGMENT_004 = "I=N,J=0:N,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" +OBC_SEGMENT_004_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 +OBC_SEGMENT_004_DATA = "U=file:forcing_obc_segment_004.nc(u),V=file:forcing_obc_segment_004.nc(v),SSH=file:forcing_obc_segment_004.nc(eta),TEMP=file:forcing_obc_segment_004.nc(temp),SALT=file:forcing_obc_segment_004.nc(salt),Uamp=file:tu_segment_004.nc(uamp),Uphase=file:tu_segment_004.nc(uphase),Vamp=file:tu_segment_004.nc(vamp),Vphase=file:tu_segment_004.nc(vphase),SSHamp=file:tz_segment_004.nc(zamp),SSHphase=file:tz_segment_004.nc(zphase)" \ No newline at end of file diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/shell_commands b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/shell_commands new file mode 100644 index 0000000..4103447 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/shell_commands @@ -0,0 +1,16 @@ +./xmlchange OCN_NX=60 +./xmlchange OCN_NY=60 +./xmlchange OCN_DOMAIN_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama-bgc/ESMF_mesh_panama1_5490e0.nc +./xmlchange ICE_DOMAIN_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama-bgc/ESMF_mesh_panama1_5490e0.nc +./xmlchange MASK_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama-bgc/ESMF_mesh_panama1_5490e0.nc +./xmlchange ATM_GRID=TL319 +./xmlchange LND_GRID=TL319 +./xmlchange ATM_DOMAIN_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/share/meshes/TL319_151007_ESMFmesh.nc +./xmlchange LND_DOMAIN_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/share/meshes/TL319_151007_ESMFmesh.nc +./xmlchange MOM6_MEMORY_MODE=dynamic_symmetric +./xmlchange RUN_STARTDATE=2000-01-01 +./xmlchange ROF2OCN_LIQ_RMAPNAME=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama-bgc/GLOFAS_to_panama1_map_r20_f40_nnsm.nc +./xmlchange ROF2OCN_ICE_RMAPNAME=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama-bgc/GLOFAS_to_panama1_map_r20_f40_nnsm.nc + +# Set PE Layout +./xmlchange NTASKS_OCN=30 \ No newline at end of file diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom new file mode 100644 index 0000000..7871ac4 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom @@ -0,0 +1,103 @@ +INPUTDIR = /glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama-bgc +TRIPOLAR_N = False +REENTRANT_X = False +REENTRANT_Y = False +NIGLOBAL = 60 +NJGLOBAL = 60 +GRID_CONFIG = mosaic +GRID_FILE = ocean_hgrid_panama1_5490e0.nc +TOPO_CONFIG = file +TOPO_FILE = ocean_topog_panama1_5490e0.nc +MAXIMUM_DEPTH = 3431.7499950346473 +MINIMUM_DEPTH = 9.5 +NK = 75 +COORD_CONFIG = none +ALE_COORDINATE_CONFIG = FILE:ocean_vgrid_panama1_5490e0.nc +REGRIDDING_COORDINATE_MODE = Z* + +! Timesteps (based on grid resolution) +DT = 300.0 +DT_THERM = 900.0 + +! Enable tidal forcing in MOM6 +TIDES = True + +! Enable M2 tidal constituent +TIDE_M2 = True + +! Drag coefficient for tidal forcing +CD_TIDES = 0.0018 + +! Use equilibrium phase for tides +TIDE_USE_EQ_PHASE = True + +! Reference date for tidal forcing +TIDE_REF_DATE = 2000, 01, 01 + +! Add equilibrium phase to OBC tides +OBC_TIDE_ADD_EQ_PHASE = True + +! Number of tidal constituents +OBC_TIDE_N_CONSTITUENTS = 1 + +! List of tidal constituents +OBC_TIDE_CONSTITUENTS = "M2" + +! Reference date for OBC tidal forcing +OBC_TIDE_REF_DATE = 2000, 01, 01 + +! Maximum number of tracer fields, bumped to accomodate MARBL tracers +MAX_FIELDS = 400 + +! MARBL initial conditions file +MARBL_TRACERS_IC_FILE = ecosys_jan_IC_omip_latlon_1x1_180W_c231221.nc + +! MARBL sedimentary iron flux file +MARBL_FESEDFLUX_FILE = fesedflux_total_reduce_oxic_panama1_5490e0.nc + +! MARBL event iron flux file +MARBL_FEVENTFLUX_FILE = feventflux_5gmol_panama1_5490e0.nc + +! Enable river nutrient fluxes in MOM6 +READ_RIV_FLUXES = True + +! River nutrient flux file +RIV_FLUX_FILE = river_nutrients_panama1_5490e0_nnsm.nc + +! Initial conditions +INIT_LAYERS_FROM_Z_FILE = True +Z_INIT_ALE_REMAPPING = True +TEMP_SALT_INIT_VERTICAL_REMAP_ONLY = True +DEPRESS_INITIAL_SURFACE = True +VELOCITY_CONFIG = file +TEMP_SALT_Z_INIT_FILE = init_tracers.nc +SURFACE_HEIGHT_IC_FILE = init_eta.nc +VELOCITY_FILE = init_vel.nc +Z_INIT_FILE_PTEMP_VAR = temp +Z_INIT_FILE_SALT_VAR = salt +SURFACE_HEIGHT_IC_VAR = eta_t +U_IC_VAR = u +V_IC_VAR = v + +! Open boundary conditions +OBC_NUMBER_OF_SEGMENTS = 4 +OBC_FREESLIP_VORTICITY = False +OBC_FREESLIP_STRAIN = False +OBC_COMPUTED_VORTICITY = True +OBC_COMPUTED_STRAIN = True +OBC_ZERO_BIHARMONIC = True +OBC_TRACER_RESERVOIR_LENGTH_SCALE_OUT = 3.0E+04 +OBC_TRACER_RESERVOIR_LENGTH_SCALE_IN = 3000.0 +BRUSHCUTTER_MODE = True +OBC_SEGMENT_001 = "J=0,I=0:N,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" +OBC_SEGMENT_001_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 +OBC_SEGMENT_001_DATA = "U=file:forcing_obc_segment_001.nc(u),V=file:forcing_obc_segment_001.nc(v),SSH=file:forcing_obc_segment_001.nc(eta),TEMP=file:forcing_obc_segment_001.nc(temp),SALT=file:forcing_obc_segment_001.nc(salt),Uamp=file:tu_segment_001.nc(uamp),Uphase=file:tu_segment_001.nc(uphase),Vamp=file:tu_segment_001.nc(vamp),Vphase=file:tu_segment_001.nc(vphase),SSHamp=file:tz_segment_001.nc(zamp),SSHphase=file:tz_segment_001.nc(zphase),PO4=file:forcing_obc_segment_001.nc(PO4),NO3=file:forcing_obc_segment_001.nc(NO3),SiO3=file:forcing_obc_segment_001.nc(SiO3),NH4=file:forcing_obc_segment_001.nc(NH4),Fe=file:forcing_obc_segment_001.nc(Fe),Lig=file:forcing_obc_segment_001.nc(Lig),O2=file:forcing_obc_segment_001.nc(O2),DIC=file:forcing_obc_segment_001.nc(DIC),DIC_ALT_CO2=file:forcing_obc_segment_001.nc(DIC_ALT_CO2),ALK=file:forcing_obc_segment_001.nc(ALK),ALK_ALT_CO2=file:forcing_obc_segment_001.nc(ALK_ALT_CO2),DOC=file:forcing_obc_segment_001.nc(DOC),DON=file:forcing_obc_segment_001.nc(DON),DOP=file:forcing_obc_segment_001.nc(DOP),DOPr=file:forcing_obc_segment_001.nc(DOPr),DONr=file:forcing_obc_segment_001.nc(DONr),DOCr=file:forcing_obc_segment_001.nc(DOCr),microzooC=file:forcing_obc_segment_001.nc(microzooC),mesozooC=file:forcing_obc_segment_001.nc(mesozooC),spChl=file:forcing_obc_segment_001.nc(spChl),spC=file:forcing_obc_segment_001.nc(spC),spP=file:forcing_obc_segment_001.nc(spP),spFe=file:forcing_obc_segment_001.nc(spFe),diatChl=file:forcing_obc_segment_001.nc(diatChl),diatC=file:forcing_obc_segment_001.nc(diatC),diatP=file:forcing_obc_segment_001.nc(diatP),diatFe=file:forcing_obc_segment_001.nc(diatFe),diatSi=file:forcing_obc_segment_001.nc(diatSi),diazChl=file:forcing_obc_segment_001.nc(diazChl),diazC=file:forcing_obc_segment_001.nc(diazC),diazP=file:forcing_obc_segment_001.nc(diazP),diazFe=file:forcing_obc_segment_001.nc(diazFe),coccoChl=file:forcing_obc_segment_001.nc(coccoChl),coccoC=file:forcing_obc_segment_001.nc(coccoC),coccoP=file:forcing_obc_segment_001.nc(coccoP),coccoFe=file:forcing_obc_segment_001.nc(coccoFe),coccoCaCO3=file:forcing_obc_segment_001.nc(coccoCaCO3)" +OBC_SEGMENT_002 = "J=N,I=N:0,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" +OBC_SEGMENT_002_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 +OBC_SEGMENT_002_DATA = "U=file:forcing_obc_segment_002.nc(u),V=file:forcing_obc_segment_002.nc(v),SSH=file:forcing_obc_segment_002.nc(eta),TEMP=file:forcing_obc_segment_002.nc(temp),SALT=file:forcing_obc_segment_002.nc(salt),Uamp=file:tu_segment_002.nc(uamp),Uphase=file:tu_segment_002.nc(uphase),Vamp=file:tu_segment_002.nc(vamp),Vphase=file:tu_segment_002.nc(vphase),SSHamp=file:tz_segment_002.nc(zamp),SSHphase=file:tz_segment_002.nc(zphase),PO4=file:forcing_obc_segment_002.nc(PO4),NO3=file:forcing_obc_segment_002.nc(NO3),SiO3=file:forcing_obc_segment_002.nc(SiO3),NH4=file:forcing_obc_segment_002.nc(NH4),Fe=file:forcing_obc_segment_002.nc(Fe),Lig=file:forcing_obc_segment_002.nc(Lig),O2=file:forcing_obc_segment_002.nc(O2),DIC=file:forcing_obc_segment_002.nc(DIC),DIC_ALT_CO2=file:forcing_obc_segment_002.nc(DIC_ALT_CO2),ALK=file:forcing_obc_segment_002.nc(ALK),ALK_ALT_CO2=file:forcing_obc_segment_002.nc(ALK_ALT_CO2),DOC=file:forcing_obc_segment_002.nc(DOC),DON=file:forcing_obc_segment_002.nc(DON),DOP=file:forcing_obc_segment_002.nc(DOP),DOPr=file:forcing_obc_segment_002.nc(DOPr),DONr=file:forcing_obc_segment_002.nc(DONr),DOCr=file:forcing_obc_segment_002.nc(DOCr),microzooC=file:forcing_obc_segment_002.nc(microzooC),mesozooC=file:forcing_obc_segment_002.nc(mesozooC),spChl=file:forcing_obc_segment_002.nc(spChl),spC=file:forcing_obc_segment_002.nc(spC),spP=file:forcing_obc_segment_002.nc(spP),spFe=file:forcing_obc_segment_002.nc(spFe),diatChl=file:forcing_obc_segment_002.nc(diatChl),diatC=file:forcing_obc_segment_002.nc(diatC),diatP=file:forcing_obc_segment_002.nc(diatP),diatFe=file:forcing_obc_segment_002.nc(diatFe),diatSi=file:forcing_obc_segment_002.nc(diatSi),diazChl=file:forcing_obc_segment_002.nc(diazChl),diazC=file:forcing_obc_segment_002.nc(diazC),diazP=file:forcing_obc_segment_002.nc(diazP),diazFe=file:forcing_obc_segment_002.nc(diazFe),coccoChl=file:forcing_obc_segment_002.nc(coccoChl),coccoC=file:forcing_obc_segment_002.nc(coccoC),coccoP=file:forcing_obc_segment_002.nc(coccoP),coccoFe=file:forcing_obc_segment_002.nc(coccoFe),coccoCaCO3=file:forcing_obc_segment_002.nc(coccoCaCO3)" +OBC_SEGMENT_003 = "I=0,J=N:0,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" +OBC_SEGMENT_003_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 +OBC_SEGMENT_003_DATA = "U=file:forcing_obc_segment_003.nc(u),V=file:forcing_obc_segment_003.nc(v),SSH=file:forcing_obc_segment_003.nc(eta),TEMP=file:forcing_obc_segment_003.nc(temp),SALT=file:forcing_obc_segment_003.nc(salt),Uamp=file:tu_segment_003.nc(uamp),Uphase=file:tu_segment_003.nc(uphase),Vamp=file:tu_segment_003.nc(vamp),Vphase=file:tu_segment_003.nc(vphase),SSHamp=file:tz_segment_003.nc(zamp),SSHphase=file:tz_segment_003.nc(zphase),PO4=file:forcing_obc_segment_003.nc(PO4),NO3=file:forcing_obc_segment_003.nc(NO3),SiO3=file:forcing_obc_segment_003.nc(SiO3),NH4=file:forcing_obc_segment_003.nc(NH4),Fe=file:forcing_obc_segment_003.nc(Fe),Lig=file:forcing_obc_segment_003.nc(Lig),O2=file:forcing_obc_segment_003.nc(O2),DIC=file:forcing_obc_segment_003.nc(DIC),DIC_ALT_CO2=file:forcing_obc_segment_003.nc(DIC_ALT_CO2),ALK=file:forcing_obc_segment_003.nc(ALK),ALK_ALT_CO2=file:forcing_obc_segment_003.nc(ALK_ALT_CO2),DOC=file:forcing_obc_segment_003.nc(DOC),DON=file:forcing_obc_segment_003.nc(DON),DOP=file:forcing_obc_segment_003.nc(DOP),DOPr=file:forcing_obc_segment_003.nc(DOPr),DONr=file:forcing_obc_segment_003.nc(DONr),DOCr=file:forcing_obc_segment_003.nc(DOCr),microzooC=file:forcing_obc_segment_003.nc(microzooC),mesozooC=file:forcing_obc_segment_003.nc(mesozooC),spChl=file:forcing_obc_segment_003.nc(spChl),spC=file:forcing_obc_segment_003.nc(spC),spP=file:forcing_obc_segment_003.nc(spP),spFe=file:forcing_obc_segment_003.nc(spFe),diatChl=file:forcing_obc_segment_003.nc(diatChl),diatC=file:forcing_obc_segment_003.nc(diatC),diatP=file:forcing_obc_segment_003.nc(diatP),diatFe=file:forcing_obc_segment_003.nc(diatFe),diatSi=file:forcing_obc_segment_003.nc(diatSi),diazChl=file:forcing_obc_segment_003.nc(diazChl),diazC=file:forcing_obc_segment_003.nc(diazC),diazP=file:forcing_obc_segment_003.nc(diazP),diazFe=file:forcing_obc_segment_003.nc(diazFe),coccoChl=file:forcing_obc_segment_003.nc(coccoChl),coccoC=file:forcing_obc_segment_003.nc(coccoC),coccoP=file:forcing_obc_segment_003.nc(coccoP),coccoFe=file:forcing_obc_segment_003.nc(coccoFe),coccoCaCO3=file:forcing_obc_segment_003.nc(coccoCaCO3)" +OBC_SEGMENT_004 = "I=N,J=0:N,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" +OBC_SEGMENT_004_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 +OBC_SEGMENT_004_DATA = "U=file:forcing_obc_segment_004.nc(u),V=file:forcing_obc_segment_004.nc(v),SSH=file:forcing_obc_segment_004.nc(eta),TEMP=file:forcing_obc_segment_004.nc(temp),SALT=file:forcing_obc_segment_004.nc(salt),Uamp=file:tu_segment_004.nc(uamp),Uphase=file:tu_segment_004.nc(uphase),Vamp=file:tu_segment_004.nc(vamp),Vphase=file:tu_segment_004.nc(vphase),SSHamp=file:tz_segment_004.nc(zamp),SSHphase=file:tz_segment_004.nc(zphase),PO4=file:forcing_obc_segment_004.nc(PO4),NO3=file:forcing_obc_segment_004.nc(NO3),SiO3=file:forcing_obc_segment_004.nc(SiO3),NH4=file:forcing_obc_segment_004.nc(NH4),Fe=file:forcing_obc_segment_004.nc(Fe),Lig=file:forcing_obc_segment_004.nc(Lig),O2=file:forcing_obc_segment_004.nc(O2),DIC=file:forcing_obc_segment_004.nc(DIC),DIC_ALT_CO2=file:forcing_obc_segment_004.nc(DIC_ALT_CO2),ALK=file:forcing_obc_segment_004.nc(ALK),ALK_ALT_CO2=file:forcing_obc_segment_004.nc(ALK_ALT_CO2),DOC=file:forcing_obc_segment_004.nc(DOC),DON=file:forcing_obc_segment_004.nc(DON),DOP=file:forcing_obc_segment_004.nc(DOP),DOPr=file:forcing_obc_segment_004.nc(DOPr),DONr=file:forcing_obc_segment_004.nc(DONr),DOCr=file:forcing_obc_segment_004.nc(DOCr),microzooC=file:forcing_obc_segment_004.nc(microzooC),mesozooC=file:forcing_obc_segment_004.nc(mesozooC),spChl=file:forcing_obc_segment_004.nc(spChl),spC=file:forcing_obc_segment_004.nc(spC),spP=file:forcing_obc_segment_004.nc(spP),spFe=file:forcing_obc_segment_004.nc(spFe),diatChl=file:forcing_obc_segment_004.nc(diatChl),diatC=file:forcing_obc_segment_004.nc(diatC),diatP=file:forcing_obc_segment_004.nc(diatP),diatFe=file:forcing_obc_segment_004.nc(diatFe),diatSi=file:forcing_obc_segment_004.nc(diatSi),diazChl=file:forcing_obc_segment_004.nc(diazChl),diazC=file:forcing_obc_segment_004.nc(diazC),diazP=file:forcing_obc_segment_004.nc(diazP),diazFe=file:forcing_obc_segment_004.nc(diazFe),coccoChl=file:forcing_obc_segment_004.nc(coccoChl),coccoC=file:forcing_obc_segment_004.nc(coccoC),coccoP=file:forcing_obc_segment_004.nc(coccoP),coccoFe=file:forcing_obc_segment_004.nc(coccoFe),coccoCaCO3=file:forcing_obc_segment_004.nc(coccoCaCO3)" \ No newline at end of file From 2373b8495dc5bd8d0c89ac0e32bd8cdb7d85f57b Mon Sep 17 00:00:00 2001 From: manishvenu Date: Tue, 5 May 2026 09:26:36 -0600 Subject: [PATCH 02/14] Line Add --- MOM6 | 2 +- .../testdefs/testmods_dirs/mom/regional/base/user_nl_mom | 3 ++- .../testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/MOM6 b/MOM6 index b15bc97..dbce657 160000 --- a/MOM6 +++ b/MOM6 @@ -1 +1 @@ -Subproject commit b15bc9780bc630236b048fcfd27b5ad177f55abe +Subproject commit dbce6577ee2537049174b024a1ace3669ba637ff diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom index ea37abf..645136d 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom @@ -94,4 +94,5 @@ OBC_SEGMENT_003_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 OBC_SEGMENT_003_DATA = "U=file:forcing_obc_segment_003.nc(u),V=file:forcing_obc_segment_003.nc(v),SSH=file:forcing_obc_segment_003.nc(eta),TEMP=file:forcing_obc_segment_003.nc(temp),SALT=file:forcing_obc_segment_003.nc(salt),Uamp=file:tu_segment_003.nc(uamp),Uphase=file:tu_segment_003.nc(uphase),Vamp=file:tu_segment_003.nc(vamp),Vphase=file:tu_segment_003.nc(vphase),SSHamp=file:tz_segment_003.nc(zamp),SSHphase=file:tz_segment_003.nc(zphase)" OBC_SEGMENT_004 = "I=N,J=0:N,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_004_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_004_DATA = "U=file:forcing_obc_segment_004.nc(u),V=file:forcing_obc_segment_004.nc(v),SSH=file:forcing_obc_segment_004.nc(eta),TEMP=file:forcing_obc_segment_004.nc(temp),SALT=file:forcing_obc_segment_004.nc(salt),Uamp=file:tu_segment_004.nc(uamp),Uphase=file:tu_segment_004.nc(uphase),Vamp=file:tu_segment_004.nc(vamp),Vphase=file:tu_segment_004.nc(vphase),SSHamp=file:tz_segment_004.nc(zamp),SSHphase=file:tz_segment_004.nc(zphase)" \ No newline at end of file +OBC_SEGMENT_004_DATA = "U=file:forcing_obc_segment_004.nc(u),V=file:forcing_obc_segment_004.nc(v),SSH=file:forcing_obc_segment_004.nc(eta),TEMP=file:forcing_obc_segment_004.nc(temp),SALT=file:forcing_obc_segment_004.nc(salt),Uamp=file:tu_segment_004.nc(uamp),Uphase=file:tu_segment_004.nc(uphase),Vamp=file:tu_segment_004.nc(vamp),Vphase=file:tu_segment_004.nc(vphase),SSHamp=file:tz_segment_004.nc(zamp),SSHphase=file:tz_segment_004.nc(zphase)" +! We need to add one line at the end so we can concatenate other testing user_nl_mom files (if you don't they just get added to the last line) diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom index 7871ac4..422a5ff 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom @@ -100,4 +100,5 @@ OBC_SEGMENT_003_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 OBC_SEGMENT_003_DATA = "U=file:forcing_obc_segment_003.nc(u),V=file:forcing_obc_segment_003.nc(v),SSH=file:forcing_obc_segment_003.nc(eta),TEMP=file:forcing_obc_segment_003.nc(temp),SALT=file:forcing_obc_segment_003.nc(salt),Uamp=file:tu_segment_003.nc(uamp),Uphase=file:tu_segment_003.nc(uphase),Vamp=file:tu_segment_003.nc(vamp),Vphase=file:tu_segment_003.nc(vphase),SSHamp=file:tz_segment_003.nc(zamp),SSHphase=file:tz_segment_003.nc(zphase),PO4=file:forcing_obc_segment_003.nc(PO4),NO3=file:forcing_obc_segment_003.nc(NO3),SiO3=file:forcing_obc_segment_003.nc(SiO3),NH4=file:forcing_obc_segment_003.nc(NH4),Fe=file:forcing_obc_segment_003.nc(Fe),Lig=file:forcing_obc_segment_003.nc(Lig),O2=file:forcing_obc_segment_003.nc(O2),DIC=file:forcing_obc_segment_003.nc(DIC),DIC_ALT_CO2=file:forcing_obc_segment_003.nc(DIC_ALT_CO2),ALK=file:forcing_obc_segment_003.nc(ALK),ALK_ALT_CO2=file:forcing_obc_segment_003.nc(ALK_ALT_CO2),DOC=file:forcing_obc_segment_003.nc(DOC),DON=file:forcing_obc_segment_003.nc(DON),DOP=file:forcing_obc_segment_003.nc(DOP),DOPr=file:forcing_obc_segment_003.nc(DOPr),DONr=file:forcing_obc_segment_003.nc(DONr),DOCr=file:forcing_obc_segment_003.nc(DOCr),microzooC=file:forcing_obc_segment_003.nc(microzooC),mesozooC=file:forcing_obc_segment_003.nc(mesozooC),spChl=file:forcing_obc_segment_003.nc(spChl),spC=file:forcing_obc_segment_003.nc(spC),spP=file:forcing_obc_segment_003.nc(spP),spFe=file:forcing_obc_segment_003.nc(spFe),diatChl=file:forcing_obc_segment_003.nc(diatChl),diatC=file:forcing_obc_segment_003.nc(diatC),diatP=file:forcing_obc_segment_003.nc(diatP),diatFe=file:forcing_obc_segment_003.nc(diatFe),diatSi=file:forcing_obc_segment_003.nc(diatSi),diazChl=file:forcing_obc_segment_003.nc(diazChl),diazC=file:forcing_obc_segment_003.nc(diazC),diazP=file:forcing_obc_segment_003.nc(diazP),diazFe=file:forcing_obc_segment_003.nc(diazFe),coccoChl=file:forcing_obc_segment_003.nc(coccoChl),coccoC=file:forcing_obc_segment_003.nc(coccoC),coccoP=file:forcing_obc_segment_003.nc(coccoP),coccoFe=file:forcing_obc_segment_003.nc(coccoFe),coccoCaCO3=file:forcing_obc_segment_003.nc(coccoCaCO3)" OBC_SEGMENT_004 = "I=N,J=0:N,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_004_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_004_DATA = "U=file:forcing_obc_segment_004.nc(u),V=file:forcing_obc_segment_004.nc(v),SSH=file:forcing_obc_segment_004.nc(eta),TEMP=file:forcing_obc_segment_004.nc(temp),SALT=file:forcing_obc_segment_004.nc(salt),Uamp=file:tu_segment_004.nc(uamp),Uphase=file:tu_segment_004.nc(uphase),Vamp=file:tu_segment_004.nc(vamp),Vphase=file:tu_segment_004.nc(vphase),SSHamp=file:tz_segment_004.nc(zamp),SSHphase=file:tz_segment_004.nc(zphase),PO4=file:forcing_obc_segment_004.nc(PO4),NO3=file:forcing_obc_segment_004.nc(NO3),SiO3=file:forcing_obc_segment_004.nc(SiO3),NH4=file:forcing_obc_segment_004.nc(NH4),Fe=file:forcing_obc_segment_004.nc(Fe),Lig=file:forcing_obc_segment_004.nc(Lig),O2=file:forcing_obc_segment_004.nc(O2),DIC=file:forcing_obc_segment_004.nc(DIC),DIC_ALT_CO2=file:forcing_obc_segment_004.nc(DIC_ALT_CO2),ALK=file:forcing_obc_segment_004.nc(ALK),ALK_ALT_CO2=file:forcing_obc_segment_004.nc(ALK_ALT_CO2),DOC=file:forcing_obc_segment_004.nc(DOC),DON=file:forcing_obc_segment_004.nc(DON),DOP=file:forcing_obc_segment_004.nc(DOP),DOPr=file:forcing_obc_segment_004.nc(DOPr),DONr=file:forcing_obc_segment_004.nc(DONr),DOCr=file:forcing_obc_segment_004.nc(DOCr),microzooC=file:forcing_obc_segment_004.nc(microzooC),mesozooC=file:forcing_obc_segment_004.nc(mesozooC),spChl=file:forcing_obc_segment_004.nc(spChl),spC=file:forcing_obc_segment_004.nc(spC),spP=file:forcing_obc_segment_004.nc(spP),spFe=file:forcing_obc_segment_004.nc(spFe),diatChl=file:forcing_obc_segment_004.nc(diatChl),diatC=file:forcing_obc_segment_004.nc(diatC),diatP=file:forcing_obc_segment_004.nc(diatP),diatFe=file:forcing_obc_segment_004.nc(diatFe),diatSi=file:forcing_obc_segment_004.nc(diatSi),diazChl=file:forcing_obc_segment_004.nc(diazChl),diazC=file:forcing_obc_segment_004.nc(diazC),diazP=file:forcing_obc_segment_004.nc(diazP),diazFe=file:forcing_obc_segment_004.nc(diazFe),coccoChl=file:forcing_obc_segment_004.nc(coccoChl),coccoC=file:forcing_obc_segment_004.nc(coccoC),coccoP=file:forcing_obc_segment_004.nc(coccoP),coccoFe=file:forcing_obc_segment_004.nc(coccoFe),coccoCaCO3=file:forcing_obc_segment_004.nc(coccoCaCO3)" \ No newline at end of file +OBC_SEGMENT_004_DATA = "U=file:forcing_obc_segment_004.nc(u),V=file:forcing_obc_segment_004.nc(v),SSH=file:forcing_obc_segment_004.nc(eta),TEMP=file:forcing_obc_segment_004.nc(temp),SALT=file:forcing_obc_segment_004.nc(salt),Uamp=file:tu_segment_004.nc(uamp),Uphase=file:tu_segment_004.nc(uphase),Vamp=file:tu_segment_004.nc(vamp),Vphase=file:tu_segment_004.nc(vphase),SSHamp=file:tz_segment_004.nc(zamp),SSHphase=file:tz_segment_004.nc(zphase),PO4=file:forcing_obc_segment_004.nc(PO4),NO3=file:forcing_obc_segment_004.nc(NO3),SiO3=file:forcing_obc_segment_004.nc(SiO3),NH4=file:forcing_obc_segment_004.nc(NH4),Fe=file:forcing_obc_segment_004.nc(Fe),Lig=file:forcing_obc_segment_004.nc(Lig),O2=file:forcing_obc_segment_004.nc(O2),DIC=file:forcing_obc_segment_004.nc(DIC),DIC_ALT_CO2=file:forcing_obc_segment_004.nc(DIC_ALT_CO2),ALK=file:forcing_obc_segment_004.nc(ALK),ALK_ALT_CO2=file:forcing_obc_segment_004.nc(ALK_ALT_CO2),DOC=file:forcing_obc_segment_004.nc(DOC),DON=file:forcing_obc_segment_004.nc(DON),DOP=file:forcing_obc_segment_004.nc(DOP),DOPr=file:forcing_obc_segment_004.nc(DOPr),DONr=file:forcing_obc_segment_004.nc(DONr),DOCr=file:forcing_obc_segment_004.nc(DOCr),microzooC=file:forcing_obc_segment_004.nc(microzooC),mesozooC=file:forcing_obc_segment_004.nc(mesozooC),spChl=file:forcing_obc_segment_004.nc(spChl),spC=file:forcing_obc_segment_004.nc(spC),spP=file:forcing_obc_segment_004.nc(spP),spFe=file:forcing_obc_segment_004.nc(spFe),diatChl=file:forcing_obc_segment_004.nc(diatChl),diatC=file:forcing_obc_segment_004.nc(diatC),diatP=file:forcing_obc_segment_004.nc(diatP),diatFe=file:forcing_obc_segment_004.nc(diatFe),diatSi=file:forcing_obc_segment_004.nc(diatSi),diazChl=file:forcing_obc_segment_004.nc(diazChl),diazC=file:forcing_obc_segment_004.nc(diazC),diazP=file:forcing_obc_segment_004.nc(diazP),diazFe=file:forcing_obc_segment_004.nc(diazFe),coccoChl=file:forcing_obc_segment_004.nc(coccoChl),coccoC=file:forcing_obc_segment_004.nc(coccoC),coccoP=file:forcing_obc_segment_004.nc(coccoP),coccoFe=file:forcing_obc_segment_004.nc(coccoFe),coccoCaCO3=file:forcing_obc_segment_004.nc(coccoCaCO3)" +! We need to add one line at the end so we can concatenate other testing user_nl_mom files (if you don't they just get added to the last line) From 38b9affb7504bd83e54f72ac90f70d9cee6968fa Mon Sep 17 00:00:00 2001 From: manishvenu Date: Tue, 5 May 2026 09:50:47 -0600 Subject: [PATCH 03/14] Reformatted BGC --- .../mom/regional/bgc/user_nl_mom | 33 ++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom index 422a5ff..ced3e42 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom @@ -91,14 +91,39 @@ OBC_TRACER_RESERVOIR_LENGTH_SCALE_IN = 3000.0 BRUSHCUTTER_MODE = True OBC_SEGMENT_001 = "J=0,I=0:N,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_001_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_001_DATA = "U=file:forcing_obc_segment_001.nc(u),V=file:forcing_obc_segment_001.nc(v),SSH=file:forcing_obc_segment_001.nc(eta),TEMP=file:forcing_obc_segment_001.nc(temp),SALT=file:forcing_obc_segment_001.nc(salt),Uamp=file:tu_segment_001.nc(uamp),Uphase=file:tu_segment_001.nc(uphase),Vamp=file:tu_segment_001.nc(vamp),Vphase=file:tu_segment_001.nc(vphase),SSHamp=file:tz_segment_001.nc(zamp),SSHphase=file:tz_segment_001.nc(zphase),PO4=file:forcing_obc_segment_001.nc(PO4),NO3=file:forcing_obc_segment_001.nc(NO3),SiO3=file:forcing_obc_segment_001.nc(SiO3),NH4=file:forcing_obc_segment_001.nc(NH4),Fe=file:forcing_obc_segment_001.nc(Fe),Lig=file:forcing_obc_segment_001.nc(Lig),O2=file:forcing_obc_segment_001.nc(O2),DIC=file:forcing_obc_segment_001.nc(DIC),DIC_ALT_CO2=file:forcing_obc_segment_001.nc(DIC_ALT_CO2),ALK=file:forcing_obc_segment_001.nc(ALK),ALK_ALT_CO2=file:forcing_obc_segment_001.nc(ALK_ALT_CO2),DOC=file:forcing_obc_segment_001.nc(DOC),DON=file:forcing_obc_segment_001.nc(DON),DOP=file:forcing_obc_segment_001.nc(DOP),DOPr=file:forcing_obc_segment_001.nc(DOPr),DONr=file:forcing_obc_segment_001.nc(DONr),DOCr=file:forcing_obc_segment_001.nc(DOCr),microzooC=file:forcing_obc_segment_001.nc(microzooC),mesozooC=file:forcing_obc_segment_001.nc(mesozooC),spChl=file:forcing_obc_segment_001.nc(spChl),spC=file:forcing_obc_segment_001.nc(spC),spP=file:forcing_obc_segment_001.nc(spP),spFe=file:forcing_obc_segment_001.nc(spFe),diatChl=file:forcing_obc_segment_001.nc(diatChl),diatC=file:forcing_obc_segment_001.nc(diatC),diatP=file:forcing_obc_segment_001.nc(diatP),diatFe=file:forcing_obc_segment_001.nc(diatFe),diatSi=file:forcing_obc_segment_001.nc(diatSi),diazChl=file:forcing_obc_segment_001.nc(diazChl),diazC=file:forcing_obc_segment_001.nc(diazC),diazP=file:forcing_obc_segment_001.nc(diazP),diazFe=file:forcing_obc_segment_001.nc(diazFe),coccoChl=file:forcing_obc_segment_001.nc(coccoChl),coccoC=file:forcing_obc_segment_001.nc(coccoC),coccoP=file:forcing_obc_segment_001.nc(coccoP),coccoFe=file:forcing_obc_segment_001.nc(coccoFe),coccoCaCO3=file:forcing_obc_segment_001.nc(coccoCaCO3)" +OBC_SEGMENT_001_DATA = "U=file:forcing_obc_segment_001.nc(u),V=file:forcing_obc_segment_001.nc(v),SSH=file:forcing_obc_segment_001.nc(eta),TEMP=file:forcing_obc_segment_001.nc(temp),SALT=file:forcing_obc_segment_001.nc(salt),Uamp=file:tu_segment_001.nc(uamp),Uphase=file:tu_segment_001.nc(uphase),Vamp=file:tu_segment_001.nc(vamp),Vphase=file:tu_segment_001.nc(vphase),SSHamp=file:tz_segment_001.nc(zamp),SSHphase=file:tz_segment_001.nc(zphase)" OBC_SEGMENT_002 = "J=N,I=N:0,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_002_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_002_DATA = "U=file:forcing_obc_segment_002.nc(u),V=file:forcing_obc_segment_002.nc(v),SSH=file:forcing_obc_segment_002.nc(eta),TEMP=file:forcing_obc_segment_002.nc(temp),SALT=file:forcing_obc_segment_002.nc(salt),Uamp=file:tu_segment_002.nc(uamp),Uphase=file:tu_segment_002.nc(uphase),Vamp=file:tu_segment_002.nc(vamp),Vphase=file:tu_segment_002.nc(vphase),SSHamp=file:tz_segment_002.nc(zamp),SSHphase=file:tz_segment_002.nc(zphase),PO4=file:forcing_obc_segment_002.nc(PO4),NO3=file:forcing_obc_segment_002.nc(NO3),SiO3=file:forcing_obc_segment_002.nc(SiO3),NH4=file:forcing_obc_segment_002.nc(NH4),Fe=file:forcing_obc_segment_002.nc(Fe),Lig=file:forcing_obc_segment_002.nc(Lig),O2=file:forcing_obc_segment_002.nc(O2),DIC=file:forcing_obc_segment_002.nc(DIC),DIC_ALT_CO2=file:forcing_obc_segment_002.nc(DIC_ALT_CO2),ALK=file:forcing_obc_segment_002.nc(ALK),ALK_ALT_CO2=file:forcing_obc_segment_002.nc(ALK_ALT_CO2),DOC=file:forcing_obc_segment_002.nc(DOC),DON=file:forcing_obc_segment_002.nc(DON),DOP=file:forcing_obc_segment_002.nc(DOP),DOPr=file:forcing_obc_segment_002.nc(DOPr),DONr=file:forcing_obc_segment_002.nc(DONr),DOCr=file:forcing_obc_segment_002.nc(DOCr),microzooC=file:forcing_obc_segment_002.nc(microzooC),mesozooC=file:forcing_obc_segment_002.nc(mesozooC),spChl=file:forcing_obc_segment_002.nc(spChl),spC=file:forcing_obc_segment_002.nc(spC),spP=file:forcing_obc_segment_002.nc(spP),spFe=file:forcing_obc_segment_002.nc(spFe),diatChl=file:forcing_obc_segment_002.nc(diatChl),diatC=file:forcing_obc_segment_002.nc(diatC),diatP=file:forcing_obc_segment_002.nc(diatP),diatFe=file:forcing_obc_segment_002.nc(diatFe),diatSi=file:forcing_obc_segment_002.nc(diatSi),diazChl=file:forcing_obc_segment_002.nc(diazChl),diazC=file:forcing_obc_segment_002.nc(diazC),diazP=file:forcing_obc_segment_002.nc(diazP),diazFe=file:forcing_obc_segment_002.nc(diazFe),coccoChl=file:forcing_obc_segment_002.nc(coccoChl),coccoC=file:forcing_obc_segment_002.nc(coccoC),coccoP=file:forcing_obc_segment_002.nc(coccoP),coccoFe=file:forcing_obc_segment_002.nc(coccoFe),coccoCaCO3=file:forcing_obc_segment_002.nc(coccoCaCO3)" +OBC_SEGMENT_002_DATA = "U=file:forcing_obc_segment_002.nc(u),V=file:forcing_obc_segment_002.nc(v),SSH=file:forcing_obc_segment_002.nc(eta),TEMP=file:forcing_obc_segment_002.nc(temp),SALT=file:forcing_obc_segment_002.nc(salt),Uamp=file:tu_segment_002.nc(uamp),Uphase=file:tu_segment_002.nc(uphase),Vamp=file:tu_segment_002.nc(vamp),Vphase=file:tu_segment_002.nc(vphase),SSHamp=file:tz_segment_002.nc(zamp),SSHphase=file:tz_segment_002.nc(zphase)" OBC_SEGMENT_003 = "I=0,J=N:0,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_003_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_003_DATA = "U=file:forcing_obc_segment_003.nc(u),V=file:forcing_obc_segment_003.nc(v),SSH=file:forcing_obc_segment_003.nc(eta),TEMP=file:forcing_obc_segment_003.nc(temp),SALT=file:forcing_obc_segment_003.nc(salt),Uamp=file:tu_segment_003.nc(uamp),Uphase=file:tu_segment_003.nc(uphase),Vamp=file:tu_segment_003.nc(vamp),Vphase=file:tu_segment_003.nc(vphase),SSHamp=file:tz_segment_003.nc(zamp),SSHphase=file:tz_segment_003.nc(zphase),PO4=file:forcing_obc_segment_003.nc(PO4),NO3=file:forcing_obc_segment_003.nc(NO3),SiO3=file:forcing_obc_segment_003.nc(SiO3),NH4=file:forcing_obc_segment_003.nc(NH4),Fe=file:forcing_obc_segment_003.nc(Fe),Lig=file:forcing_obc_segment_003.nc(Lig),O2=file:forcing_obc_segment_003.nc(O2),DIC=file:forcing_obc_segment_003.nc(DIC),DIC_ALT_CO2=file:forcing_obc_segment_003.nc(DIC_ALT_CO2),ALK=file:forcing_obc_segment_003.nc(ALK),ALK_ALT_CO2=file:forcing_obc_segment_003.nc(ALK_ALT_CO2),DOC=file:forcing_obc_segment_003.nc(DOC),DON=file:forcing_obc_segment_003.nc(DON),DOP=file:forcing_obc_segment_003.nc(DOP),DOPr=file:forcing_obc_segment_003.nc(DOPr),DONr=file:forcing_obc_segment_003.nc(DONr),DOCr=file:forcing_obc_segment_003.nc(DOCr),microzooC=file:forcing_obc_segment_003.nc(microzooC),mesozooC=file:forcing_obc_segment_003.nc(mesozooC),spChl=file:forcing_obc_segment_003.nc(spChl),spC=file:forcing_obc_segment_003.nc(spC),spP=file:forcing_obc_segment_003.nc(spP),spFe=file:forcing_obc_segment_003.nc(spFe),diatChl=file:forcing_obc_segment_003.nc(diatChl),diatC=file:forcing_obc_segment_003.nc(diatC),diatP=file:forcing_obc_segment_003.nc(diatP),diatFe=file:forcing_obc_segment_003.nc(diatFe),diatSi=file:forcing_obc_segment_003.nc(diatSi),diazChl=file:forcing_obc_segment_003.nc(diazChl),diazC=file:forcing_obc_segment_003.nc(diazC),diazP=file:forcing_obc_segment_003.nc(diazP),diazFe=file:forcing_obc_segment_003.nc(diazFe),coccoChl=file:forcing_obc_segment_003.nc(coccoChl),coccoC=file:forcing_obc_segment_003.nc(coccoC),coccoP=file:forcing_obc_segment_003.nc(coccoP),coccoFe=file:forcing_obc_segment_003.nc(coccoFe),coccoCaCO3=file:forcing_obc_segment_003.nc(coccoCaCO3)" +OBC_SEGMENT_003_DATA = "U=file:forcing_obc_segment_003.nc(u),V=file:forcing_obc_segment_003.nc(v),SSH=file:forcing_obc_segment_003.nc(eta),TEMP=file:forcing_obc_segment_003.nc(temp),SALT=file:forcing_obc_segment_003.nc(salt),Uamp=file:tu_segment_003.nc(uamp),Uphase=file:tu_segment_003.nc(uphase),Vamp=file:tu_segment_003.nc(vamp),Vphase=file:tu_segment_003.nc(vphase),SSHamp=file:tz_segment_003.nc(zamp),SSHphase=file:tz_segment_003.nc(zphase)" OBC_SEGMENT_004 = "I=N,J=0:N,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_004_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_004_DATA = "U=file:forcing_obc_segment_004.nc(u),V=file:forcing_obc_segment_004.nc(v),SSH=file:forcing_obc_segment_004.nc(eta),TEMP=file:forcing_obc_segment_004.nc(temp),SALT=file:forcing_obc_segment_004.nc(salt),Uamp=file:tu_segment_004.nc(uamp),Uphase=file:tu_segment_004.nc(uphase),Vamp=file:tu_segment_004.nc(vamp),Vphase=file:tu_segment_004.nc(vphase),SSHamp=file:tz_segment_004.nc(zamp),SSHphase=file:tz_segment_004.nc(zphase),PO4=file:forcing_obc_segment_004.nc(PO4),NO3=file:forcing_obc_segment_004.nc(NO3),SiO3=file:forcing_obc_segment_004.nc(SiO3),NH4=file:forcing_obc_segment_004.nc(NH4),Fe=file:forcing_obc_segment_004.nc(Fe),Lig=file:forcing_obc_segment_004.nc(Lig),O2=file:forcing_obc_segment_004.nc(O2),DIC=file:forcing_obc_segment_004.nc(DIC),DIC_ALT_CO2=file:forcing_obc_segment_004.nc(DIC_ALT_CO2),ALK=file:forcing_obc_segment_004.nc(ALK),ALK_ALT_CO2=file:forcing_obc_segment_004.nc(ALK_ALT_CO2),DOC=file:forcing_obc_segment_004.nc(DOC),DON=file:forcing_obc_segment_004.nc(DON),DOP=file:forcing_obc_segment_004.nc(DOP),DOPr=file:forcing_obc_segment_004.nc(DOPr),DONr=file:forcing_obc_segment_004.nc(DONr),DOCr=file:forcing_obc_segment_004.nc(DOCr),microzooC=file:forcing_obc_segment_004.nc(microzooC),mesozooC=file:forcing_obc_segment_004.nc(mesozooC),spChl=file:forcing_obc_segment_004.nc(spChl),spC=file:forcing_obc_segment_004.nc(spC),spP=file:forcing_obc_segment_004.nc(spP),spFe=file:forcing_obc_segment_004.nc(spFe),diatChl=file:forcing_obc_segment_004.nc(diatChl),diatC=file:forcing_obc_segment_004.nc(diatC),diatP=file:forcing_obc_segment_004.nc(diatP),diatFe=file:forcing_obc_segment_004.nc(diatFe),diatSi=file:forcing_obc_segment_004.nc(diatSi),diazChl=file:forcing_obc_segment_004.nc(diazChl),diazC=file:forcing_obc_segment_004.nc(diazC),diazP=file:forcing_obc_segment_004.nc(diazP),diazFe=file:forcing_obc_segment_004.nc(diazFe),coccoChl=file:forcing_obc_segment_004.nc(coccoChl),coccoC=file:forcing_obc_segment_004.nc(coccoC),coccoP=file:forcing_obc_segment_004.nc(coccoP),coccoFe=file:forcing_obc_segment_004.nc(coccoFe),coccoCaCO3=file:forcing_obc_segment_004.nc(coccoCaCO3)" +OBC_SEGMENT_004_DATA = "U=file:forcing_obc_segment_004.nc(u),V=file:forcing_obc_segment_004.nc(v),SSH=file:forcing_obc_segment_004.nc(eta),TEMP=file:forcing_obc_segment_004.nc(temp),SALT=file:forcing_obc_segment_004.nc(salt),Uamp=file:tu_segment_004.nc(uamp),Uphase=file:tu_segment_004.nc(uphase),Vamp=file:tu_segment_004.nc(vamp),Vphase=file:tu_segment_004.nc(vphase),SSHamp=file:tz_segment_004.nc(zamp),SSHphase=file:tz_segment_004.nc(zphase)" +OBC_DATA_PO4=PO4_obc_segment.nc(PO4) +OBC_DATA_NO3=NO3_obc_segment.nc(NO3) +OBC_DATA_SiO3=SiO3_obc_segment.nc(SiO3) +OBC_DATA_NH4=NH4_obc_segment.nc(NH4) +OBC_DATA_Fe=Fe_obc_segment.nc(Fe) +OBC_DATA_Lig=Lig_obc_segment.nc(Lig) +OBC_DATA_O2=O2_obc_segment.nc(O2) +OBC_DATA_DIC=DIC_obc_segment.nc(DIC) +OBC_DATA_DIC_ALT_CO2=DIC_ALT_CO2_obc_segment.nc(DIC_ALT_CO2) +OBC_DATA_ALK=ALK_obc_segment.nc(ALK) +OBC_DATA_ALK_ALT_CO2=ALK_ALT_CO2_obc_segment.nc(ALK_ALT_CO2) +OBC_DATA_DOC=DOC_obc_segment.nc(DOC) +OBC_DATA_DON=DON_obc_segment.nc(DON) +OBC_DATA_DOP=DOP_obc_segment.nc(DOP) +OBC_DATA_DOPr=DOPr_obc_segment.nc(DOPr) +OBC_DATA_DONr=DONr_obc_segment.nc(DONr) +OBC_DATA_DOCr=DOCr_obc_segment.nc(DOCr) +OBC_DATA_microzooC=microzooC_obc_segment.nc(microzooC) +OBC_DATA_mesozooC=mesozooC_obc_segment.nc(mesozooC) +OBC_DATA_spChl=spChl_obc_segment.nc(spChl) +OBC_DATA_spC=spC_obc_segment.nc(spC) +OBC_DATA_spP=spP_obc_segment.nc(spP) +OBC_DATA_spFe=spFe_obc_segment.nc(spFe) +OBC_DATA_diatChl=diatChl_obc_segment.nc(diatChl) +OBC_DATA_diatC=diatC_obc_segment.nc(diatC) ! We need to add one line at the end so we can concatenate other testing user_nl_mom files (if you don't they just get added to the last line) From 947569ce4960aa268a17ce162b81305d1c08a43a Mon Sep 17 00:00:00 2001 From: manishvenu Date: Tue, 5 May 2026 10:32:10 -0600 Subject: [PATCH 04/14] in terms of din loc root --- .../testmods_dirs/mom/regional/base/shell_commands | 14 +++++++------- .../testmods_dirs/mom/regional/base/user_nl_mom | 2 +- .../testmods_dirs/mom/regional/bgc/shell_commands | 14 +++++++------- .../testmods_dirs/mom/regional/bgc/user_nl_mom | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/base/shell_commands b/cime_config/testdefs/testmods_dirs/mom/regional/base/shell_commands index 35fd6d9..14833cd 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/base/shell_commands +++ b/cime_config/testdefs/testmods_dirs/mom/regional/base/shell_commands @@ -1,16 +1,16 @@ ./xmlchange OCN_NX=60 ./xmlchange OCN_NY=60 -./xmlchange OCN_DOMAIN_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama/ESMF_mesh_panama1_352fd1.nc -./xmlchange ICE_DOMAIN_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama/ESMF_mesh_panama1_352fd1.nc -./xmlchange MASK_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama/ESMF_mesh_panama1_352fd1.nc +./xmlchange OCN_DOMAIN_MESH=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/ESMF_mesh_panama1_352fd1.nc +./xmlchange ICE_DOMAIN_MESH=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/ESMF_mesh_panama1_352fd1.nc +./xmlchange MASK_MESH=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/ESMF_mesh_panama1_352fd1.nc ./xmlchange ATM_GRID=TL319 ./xmlchange LND_GRID=TL319 -./xmlchange ATM_DOMAIN_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/share/meshes/TL319_151007_ESMFmesh.nc -./xmlchange LND_DOMAIN_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/share/meshes/TL319_151007_ESMFmesh.nc +./xmlchange ATM_DOMAIN_MESH=${DIN_LOC_ROOT}/share/meshes/TL319_151007_ESMFmesh.nc +./xmlchange LND_DOMAIN_MESH=${DIN_LOC_ROOT}/share/meshes/TL319_151007_ESMFmesh.nc ./xmlchange MOM6_MEMORY_MODE=dynamic_symmetric ./xmlchange RUN_STARTDATE=2000-01-01 -./xmlchange ROF2OCN_LIQ_RMAPNAME=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama/GLOFAS_to_panama1_map_r20_f40_nnsm.nc -./xmlchange ROF2OCN_ICE_RMAPNAME=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama/GLOFAS_to_panama1_map_r20_f40_nnsm.nc +./xmlchange ROF2OCN_LIQ_RMAPNAME=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/GLOFAS_to_panama1_map_r20_f40_nnsm.nc +./xmlchange ROF2OCN_ICE_RMAPNAME=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/GLOFAS_to_panama1_map_r20_f40_nnsm.nc # Set PE Layout ./xmlchange NTASKS_OCN=20 \ No newline at end of file diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom index 645136d..75edec6 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom @@ -1,4 +1,4 @@ -INPUTDIR = /glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama +INPUTDIR = ${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama TRIPOLAR_N = False REENTRANT_X = False REENTRANT_Y = False diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/shell_commands b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/shell_commands index 4103447..23260ae 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/shell_commands +++ b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/shell_commands @@ -1,16 +1,16 @@ ./xmlchange OCN_NX=60 ./xmlchange OCN_NY=60 -./xmlchange OCN_DOMAIN_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama-bgc/ESMF_mesh_panama1_5490e0.nc -./xmlchange ICE_DOMAIN_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama-bgc/ESMF_mesh_panama1_5490e0.nc -./xmlchange MASK_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama-bgc/ESMF_mesh_panama1_5490e0.nc +./xmlchange OCN_DOMAIN_MESH=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/ESMF_mesh_panama1_5490e0.nc +./xmlchange ICE_DOMAIN_MESH=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/ESMF_mesh_panama1_5490e0.nc +./xmlchange MASK_MESH=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/ESMF_mesh_panama1_5490e0.nc ./xmlchange ATM_GRID=TL319 ./xmlchange LND_GRID=TL319 -./xmlchange ATM_DOMAIN_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/share/meshes/TL319_151007_ESMFmesh.nc -./xmlchange LND_DOMAIN_MESH=/glade/campaign/cesm/cesmdata/cseg/inputdata/share/meshes/TL319_151007_ESMFmesh.nc +./xmlchange ATM_DOMAIN_MESH=${DIN_LOC_ROOT}/share/meshes/TL319_151007_ESMFmesh.nc +./xmlchange LND_DOMAIN_MESH=${DIN_LOC_ROOT}/share/meshes/TL319_151007_ESMFmesh.nc ./xmlchange MOM6_MEMORY_MODE=dynamic_symmetric ./xmlchange RUN_STARTDATE=2000-01-01 -./xmlchange ROF2OCN_LIQ_RMAPNAME=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama-bgc/GLOFAS_to_panama1_map_r20_f40_nnsm.nc -./xmlchange ROF2OCN_ICE_RMAPNAME=/glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama-bgc/GLOFAS_to_panama1_map_r20_f40_nnsm.nc +./xmlchange ROF2OCN_LIQ_RMAPNAME=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/GLOFAS_to_panama1_map_r20_f40_nnsm.nc +./xmlchange ROF2OCN_ICE_RMAPNAME=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/GLOFAS_to_panama1_map_r20_f40_nnsm.nc # Set PE Layout ./xmlchange NTASKS_OCN=30 \ No newline at end of file diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom index ced3e42..133ca1c 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom @@ -1,4 +1,4 @@ -INPUTDIR = /glade/campaign/cesm/cesmdata/cseg/inputdata/ocn/mom/croc/testing_data/panama-bgc +INPUTDIR = ${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc TRIPOLAR_N = False REENTRANT_X = False REENTRANT_Y = False From a34efb3034f6e88f906c2e3d43a8c721a0c87af6 Mon Sep 17 00:00:00 2001 From: manishvenu Date: Tue, 5 May 2026 10:41:03 -0600 Subject: [PATCH 05/14] Try Adding DIN_LOC_ROOT --- .../testmods_dirs/mom/regional/base/shell_commands | 14 +++++++------- .../testmods_dirs/mom/regional/base/user_nl_mom | 2 +- .../testmods_dirs/mom/regional/bgc/shell_commands | 14 +++++++------- .../testmods_dirs/mom/regional/bgc/user_nl_mom | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/base/shell_commands b/cime_config/testdefs/testmods_dirs/mom/regional/base/shell_commands index 14833cd..5ef8c9e 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/base/shell_commands +++ b/cime_config/testdefs/testmods_dirs/mom/regional/base/shell_commands @@ -1,16 +1,16 @@ ./xmlchange OCN_NX=60 ./xmlchange OCN_NY=60 -./xmlchange OCN_DOMAIN_MESH=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/ESMF_mesh_panama1_352fd1.nc -./xmlchange ICE_DOMAIN_MESH=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/ESMF_mesh_panama1_352fd1.nc -./xmlchange MASK_MESH=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/ESMF_mesh_panama1_352fd1.nc +./xmlchange OCN_DOMAIN_MESH='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/ESMF_mesh_panama1_352fd1.nc' +./xmlchange ICE_DOMAIN_MESH='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/ESMF_mesh_panama1_352fd1.nc' +./xmlchange MASK_MESH='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/ESMF_mesh_panama1_352fd1.nc' ./xmlchange ATM_GRID=TL319 ./xmlchange LND_GRID=TL319 -./xmlchange ATM_DOMAIN_MESH=${DIN_LOC_ROOT}/share/meshes/TL319_151007_ESMFmesh.nc -./xmlchange LND_DOMAIN_MESH=${DIN_LOC_ROOT}/share/meshes/TL319_151007_ESMFmesh.nc +./xmlchange ATM_DOMAIN_MESH='${DIN_LOC_ROOT}/share/meshes/TL319_151007_ESMFmesh.nc' +./xmlchange LND_DOMAIN_MESH='${DIN_LOC_ROOT}/share/meshes/TL319_151007_ESMFmesh.nc' ./xmlchange MOM6_MEMORY_MODE=dynamic_symmetric ./xmlchange RUN_STARTDATE=2000-01-01 -./xmlchange ROF2OCN_LIQ_RMAPNAME=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/GLOFAS_to_panama1_map_r20_f40_nnsm.nc -./xmlchange ROF2OCN_ICE_RMAPNAME=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/GLOFAS_to_panama1_map_r20_f40_nnsm.nc +./xmlchange ROF2OCN_LIQ_RMAPNAME='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/GLOFAS_to_panama1_map_r20_f40_nnsm.nc' +./xmlchange ROF2OCN_ICE_RMAPNAME='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama/GLOFAS_to_panama1_map_r20_f40_nnsm.nc' # Set PE Layout ./xmlchange NTASKS_OCN=20 \ No newline at end of file diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom index 75edec6..9cff136 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom @@ -1,4 +1,4 @@ -INPUTDIR = ${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama +INPUTDIR = "${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama" TRIPOLAR_N = False REENTRANT_X = False REENTRANT_Y = False diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/shell_commands b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/shell_commands index 23260ae..028122d 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/shell_commands +++ b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/shell_commands @@ -1,16 +1,16 @@ ./xmlchange OCN_NX=60 ./xmlchange OCN_NY=60 -./xmlchange OCN_DOMAIN_MESH=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/ESMF_mesh_panama1_5490e0.nc -./xmlchange ICE_DOMAIN_MESH=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/ESMF_mesh_panama1_5490e0.nc -./xmlchange MASK_MESH=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/ESMF_mesh_panama1_5490e0.nc +./xmlchange OCN_DOMAIN_MESH='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/ESMF_mesh_panama1_5490e0.nc' +./xmlchange ICE_DOMAIN_MESH='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/ESMF_mesh_panama1_5490e0.nc' +./xmlchange MASK_MESH='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/ESMF_mesh_panama1_5490e0.nc' ./xmlchange ATM_GRID=TL319 ./xmlchange LND_GRID=TL319 -./xmlchange ATM_DOMAIN_MESH=${DIN_LOC_ROOT}/share/meshes/TL319_151007_ESMFmesh.nc -./xmlchange LND_DOMAIN_MESH=${DIN_LOC_ROOT}/share/meshes/TL319_151007_ESMFmesh.nc +./xmlchange ATM_DOMAIN_MESH='${DIN_LOC_ROOT}/share/meshes/TL319_151007_ESMFmesh.nc' +./xmlchange LND_DOMAIN_MESH='${DIN_LOC_ROOT}/share/meshes/TL319_151007_ESMFmesh.nc' ./xmlchange MOM6_MEMORY_MODE=dynamic_symmetric ./xmlchange RUN_STARTDATE=2000-01-01 -./xmlchange ROF2OCN_LIQ_RMAPNAME=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/GLOFAS_to_panama1_map_r20_f40_nnsm.nc -./xmlchange ROF2OCN_ICE_RMAPNAME=${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/GLOFAS_to_panama1_map_r20_f40_nnsm.nc +./xmlchange ROF2OCN_LIQ_RMAPNAME='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/GLOFAS_to_panama1_map_r20_f40_nnsm.nc' +./xmlchange ROF2OCN_ICE_RMAPNAME='${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc/GLOFAS_to_panama1_map_r20_f40_nnsm.nc' # Set PE Layout ./xmlchange NTASKS_OCN=30 \ No newline at end of file diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom index 133ca1c..57e765e 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom @@ -1,4 +1,4 @@ -INPUTDIR = ${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc +INPUTDIR = "${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc" TRIPOLAR_N = False REENTRANT_X = False REENTRANT_Y = False From 1a291800c3d41a65508e1968b07dde14d7fbaca0 Mon Sep 17 00:00:00 2001 From: manishvenu Date: Tue, 5 May 2026 13:56:59 -0600 Subject: [PATCH 06/14] Changes --- .../testdefs/testmods_dirs/mom/regional/base/user_nl_mom | 2 +- .../testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom index 9cff136..505b108 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom @@ -1,4 +1,4 @@ -INPUTDIR = "${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama" +INPUTDIR = "$DIN_LOC_ROOT/ocn/mom/croc/testing_data/panama" TRIPOLAR_N = False REENTRANT_X = False REENTRANT_Y = False diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom index 57e765e..e77bfa4 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom @@ -1,4 +1,4 @@ -INPUTDIR = "${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc" +INPUTDIR = "$DIN_LOC_ROOT/ocn/mom/croc/testing_data/panama-bgc" TRIPOLAR_N = False REENTRANT_X = False REENTRANT_Y = False @@ -50,7 +50,7 @@ OBC_TIDE_REF_DATE = 2000, 01, 01 MAX_FIELDS = 400 ! MARBL initial conditions file -MARBL_TRACERS_IC_FILE = ecosys_jan_IC_omip_latlon_1x1_180W_c231221.nc +MARBL_TRACERS_IC_FILE = ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc ! MARBL sedimentary iron flux file MARBL_FESEDFLUX_FILE = fesedflux_total_reduce_oxic_panama1_5490e0.nc From 49462f7e5d9f7b7be42e9d7598e3bb91c02d003f Mon Sep 17 00:00:00 2001 From: manishvenu Date: Tue, 5 May 2026 16:08:20 -0600 Subject: [PATCH 07/14] Reduced FIle --- .../testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom index e77bfa4..799b59f 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom @@ -58,6 +58,9 @@ MARBL_FESEDFLUX_FILE = fesedflux_total_reduce_oxic_panama1_5490e0.nc ! MARBL event iron flux file MARBL_FEVENTFLUX_FILE = feventflux_5gmol_panama1_5490e0.nc +! MARBL event iron flux reduced file +MARBL_FESEDFLUXRED_FILE = feventfluxred_5gmol_panama1_5490e0.nc + ! Enable river nutrient fluxes in MOM6 READ_RIV_FLUXES = True From f74950f32bad59c7ed6d0ddd4549d6c47ffe3aa3 Mon Sep 17 00:00:00 2001 From: manishvenu Date: Tue, 5 May 2026 17:18:32 -0600 Subject: [PATCH 08/14] Back: --- cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom index 799b59f..63a9e25 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom @@ -65,7 +65,7 @@ MARBL_FESEDFLUXRED_FILE = feventfluxred_5gmol_panama1_5490e0.nc READ_RIV_FLUXES = True ! River nutrient flux file -RIV_FLUX_FILE = river_nutrients_panama1_5490e0_nnsm.nc +RIV_FLUX_FILE = riv_nutri.nc ! Initial conditions INIT_LAYERS_FROM_Z_FILE = True From 57d19bd322c74ac03ee8ba4cff84af427daf889f Mon Sep 17 00:00:00 2001 From: manishvenu Date: Wed, 6 May 2026 11:52:02 -0600 Subject: [PATCH 09/14] Relative Path --- .../testdefs/testmods_dirs/mom/regional/base/user_nl_mom | 2 +- cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom index 505b108..89eddf0 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom @@ -1,4 +1,4 @@ -INPUTDIR = "$DIN_LOC_ROOT/ocn/mom/croc/testing_data/panama" +INPUTDIR = "ocn/mom/croc/testing_data/panama" TRIPOLAR_N = False REENTRANT_X = False REENTRANT_Y = False diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom index 63a9e25..7381eb3 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom @@ -1,4 +1,4 @@ -INPUTDIR = "$DIN_LOC_ROOT/ocn/mom/croc/testing_data/panama-bgc" +INPUTDIR = "ocn/mom/croc/testing_data/panama-bgc" TRIPOLAR_N = False REENTRANT_X = False REENTRANT_Y = False From 5d510979a28d25736a3a00634748a4ed8d2f9f4c Mon Sep 17 00:00:00 2001 From: manishvenu Date: Wed, 6 May 2026 11:52:36 -0600 Subject: [PATCH 10/14] Fix Riv nutri Path --- cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom index 7381eb3..5c14194 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom @@ -65,7 +65,7 @@ MARBL_FESEDFLUXRED_FILE = feventfluxred_5gmol_panama1_5490e0.nc READ_RIV_FLUXES = True ! River nutrient flux file -RIV_FLUX_FILE = riv_nutri.nc +RIV_FLUX_FILE = river_nutrients_panama1_5490e0_nnsm.nc ! Initial conditions INIT_LAYERS_FROM_Z_FILE = True From 53ca8464c63e43a356ebc2835d35c46ce092ab83 Mon Sep 17 00:00:00 2001 From: manishvenu Date: Thu, 7 May 2026 10:56:02 -0600 Subject: [PATCH 11/14] INPUTDIR Changes --- .../testdefs/testmods_dirs/mom/regional/base/user_nl_mom | 2 +- .../testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom | 2 +- param_templates/MOM_input.yaml | 5 ++++- param_templates/json/MOM_input.json | 6 +++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom index 89eddf0..41e932c 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom @@ -1,4 +1,4 @@ -INPUTDIR = "ocn/mom/croc/testing_data/panama" +!INPUTDIR is set by the MOM_input.yaml because it requires a hard-coded path TRIPOLAR_N = False REENTRANT_X = False REENTRANT_Y = False diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom index 5c14194..d549f68 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom @@ -1,4 +1,4 @@ -INPUTDIR = "ocn/mom/croc/testing_data/panama-bgc" +!INPUTDIR is set by the MOM_input.yaml because it requires a hard-coded path TRIPOLAR_N = False REENTRANT_X = False REENTRANT_Y = False diff --git a/param_templates/MOM_input.yaml b/param_templates/MOM_input.yaml index fbbcc35..dbbb74a 100644 --- a/param_templates/MOM_input.yaml +++ b/param_templates/MOM_input.yaml @@ -34,7 +34,10 @@ Global: description: | "The directory in which input files are found." datatype: string - value: ${DIN_LOC_ROOT}/ocn/mom/${OCN_GRID} + value: + $MOM6_DOMAIN_TYPE == "REGIONAL" and $TEST == True and $MARBL_CONFIG == "off": $DIN_LOC_ROOT/ocn/mom/croc/testing_data/panama + $MOM6_DOMAIN_TYPE == "REGIONAL" and $TEST == True and $MARBL_CONFIG != "off": $DIN_LOC_ROOT/ocn/mom/croc/testing_data/panama-bgc + else: ${DIN_LOC_ROOT}/ocn/mom/${OCN_GRID} TRIPOLAR_N: description: | "[Boolean] default = False diff --git a/param_templates/json/MOM_input.json b/param_templates/json/MOM_input.json index 4958db0..35121df 100644 --- a/param_templates/json/MOM_input.json +++ b/param_templates/json/MOM_input.json @@ -3,7 +3,11 @@ "INPUTDIR": { "description": "\"The directory in which input files are found.\"\n", "datatype": "string", - "value": "${DIN_LOC_ROOT}/ocn/mom/${OCN_GRID}" + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\" and $TEST == True and $MARBL_CONFIG == \"off\"": "$DIN_LOC_ROOT/ocn/mom/croc/testing_data/panama", + "$MOM6_DOMAIN_TYPE == \"REGIONAL\" and $TEST == True and $MARBL_CONFIG != \"off\"": "$DIN_LOC_ROOT/ocn/mom/croc/testing_data/panama-bgc", + "else": "${DIN_LOC_ROOT}/ocn/mom/${OCN_GRID}" + } }, "TRIPOLAR_N": { "description": "\"[Boolean] default = False\nUse tripolar connectivity at the northern edge of the\ndomain. With TRIPOLAR_N, NIGLOBAL must be even.\"\n", From e27a674c5a64442f9db1c600ad346431c13fac7e Mon Sep 17 00:00:00 2001 From: manishvenu Date: Thu, 7 May 2026 10:59:00 -0600 Subject: [PATCH 12/14] Bracket --- param_templates/MOM_input.yaml | 4 ++-- param_templates/json/MOM_input.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/param_templates/MOM_input.yaml b/param_templates/MOM_input.yaml index dbbb74a..5ad735c 100644 --- a/param_templates/MOM_input.yaml +++ b/param_templates/MOM_input.yaml @@ -35,8 +35,8 @@ Global: "The directory in which input files are found." datatype: string value: - $MOM6_DOMAIN_TYPE == "REGIONAL" and $TEST == True and $MARBL_CONFIG == "off": $DIN_LOC_ROOT/ocn/mom/croc/testing_data/panama - $MOM6_DOMAIN_TYPE == "REGIONAL" and $TEST == True and $MARBL_CONFIG != "off": $DIN_LOC_ROOT/ocn/mom/croc/testing_data/panama-bgc + $MOM6_DOMAIN_TYPE == "REGIONAL" and $TEST == True and $MARBL_CONFIG == "off": ${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama + $MOM6_DOMAIN_TYPE == "REGIONAL" and $TEST == True and $MARBL_CONFIG != "off": ${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc else: ${DIN_LOC_ROOT}/ocn/mom/${OCN_GRID} TRIPOLAR_N: description: | diff --git a/param_templates/json/MOM_input.json b/param_templates/json/MOM_input.json index 35121df..408b588 100644 --- a/param_templates/json/MOM_input.json +++ b/param_templates/json/MOM_input.json @@ -4,8 +4,8 @@ "description": "\"The directory in which input files are found.\"\n", "datatype": "string", "value": { - "$MOM6_DOMAIN_TYPE == \"REGIONAL\" and $TEST == True and $MARBL_CONFIG == \"off\"": "$DIN_LOC_ROOT/ocn/mom/croc/testing_data/panama", - "$MOM6_DOMAIN_TYPE == \"REGIONAL\" and $TEST == True and $MARBL_CONFIG != \"off\"": "$DIN_LOC_ROOT/ocn/mom/croc/testing_data/panama-bgc", + "$MOM6_DOMAIN_TYPE == \"REGIONAL\" and $TEST == True and $MARBL_CONFIG == \"off\"": "${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama", + "$MOM6_DOMAIN_TYPE == \"REGIONAL\" and $TEST == True and $MARBL_CONFIG != \"off\"": "${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc", "else": "${DIN_LOC_ROOT}/ocn/mom/${OCN_GRID}" } }, From ebc231588ff944e687e4ffba4bd74739826a568f Mon Sep 17 00:00:00 2001 From: manishvenu Date: Thu, 7 May 2026 11:14:46 -0600 Subject: [PATCH 13/14] Try This --- .../mom/regional/base/user_nl_mom | 22 ++--- .../mom/regional/bgc/user_nl_mom | 80 +++++++++---------- param_templates/MOM_input.yaml | 3 +- param_templates/json/MOM_input.json | 3 +- 4 files changed, 53 insertions(+), 55 deletions(-) diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom index 41e932c..a1c6bfa 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom @@ -5,14 +5,14 @@ REENTRANT_Y = False NIGLOBAL = 60 NJGLOBAL = 60 GRID_CONFIG = mosaic -GRID_FILE = ocean_hgrid_panama1_352fd1.nc +GRID_FILE = panama/ocean_hgrid_panama1_352fd1.nc TOPO_CONFIG = file -TOPO_FILE = ocean_topog_panama1_352fd1.nc +TOPO_FILE = panama/ocean_topog_panama1_352fd1.nc MAXIMUM_DEPTH = 3431.7499950346473 MINIMUM_DEPTH = 9.5 NK = 75 COORD_CONFIG = none -ALE_COORDINATE_CONFIG = FILE:ocean_vgrid_panama1_352fd1.nc +ALE_COORDINATE_CONFIG = file:panama/ocean_vgrid_panama1_352fd1.nc REGRIDDING_COORDINATE_MODE = Z* ! Timesteps (based on grid resolution) @@ -47,7 +47,7 @@ OBC_TIDE_CONSTITUENTS = "M2" OBC_TIDE_REF_DATE = 2000, 01, 01 ! Chlorophyll data file -CHL_FILE = seawifs-clim-1997-2010-panama1.nc +CHL_FILE = panama/seawifs-clim-1997-2010-panama1.nc ! Enable chlorophyll from file CHL_FROM_FILE = TRUE @@ -64,9 +64,9 @@ Z_INIT_ALE_REMAPPING = True TEMP_SALT_INIT_VERTICAL_REMAP_ONLY = True DEPRESS_INITIAL_SURFACE = True VELOCITY_CONFIG = file -TEMP_SALT_Z_INIT_FILE = init_tracers.nc -SURFACE_HEIGHT_IC_FILE = init_eta.nc -VELOCITY_FILE = init_vel.nc +TEMP_SALT_Z_INIT_FILE = panama/init_tracers.nc +SURFACE_HEIGHT_IC_FILE = panama/init_eta.nc +VELOCITY_FILE = panama/init_vel.nc Z_INIT_FILE_PTEMP_VAR = temp Z_INIT_FILE_SALT_VAR = salt SURFACE_HEIGHT_IC_VAR = eta_t @@ -85,14 +85,14 @@ OBC_TRACER_RESERVOIR_LENGTH_SCALE_IN = 3000.0 BRUSHCUTTER_MODE = True OBC_SEGMENT_001 = "J=0,I=0:N,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_001_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_001_DATA = "U=file:forcing_obc_segment_001.nc(u),V=file:forcing_obc_segment_001.nc(v),SSH=file:forcing_obc_segment_001.nc(eta),TEMP=file:forcing_obc_segment_001.nc(temp),SALT=file:forcing_obc_segment_001.nc(salt),Uamp=file:tu_segment_001.nc(uamp),Uphase=file:tu_segment_001.nc(uphase),Vamp=file:tu_segment_001.nc(vamp),Vphase=file:tu_segment_001.nc(vphase),SSHamp=file:tz_segment_001.nc(zamp),SSHphase=file:tz_segment_001.nc(zphase)" +OBC_SEGMENT_001_DATA = "U=file:panama/forcing_obc_segment_001.nc(u),V=file:panama/forcing_obc_segment_001.nc(v),SSH=file:panama/forcing_obc_segment_001.nc(eta),TEMP=file:panama/forcing_obc_segment_001.nc(temp),SALT=file:panama/forcing_obc_segment_001.nc(salt),Uamp=file:panama/tu_segment_001.nc(uamp),Uphase=file:panama/tu_segment_001.nc(uphase),Vamp=file:panama/tu_segment_001.nc(vamp),Vphase=file:panama/tu_segment_001.nc(vphase),SSHamp=file:panama/tz_segment_001.nc(zamp),SSHphase=file:panama/tz_segment_001.nc(zphase)" OBC_SEGMENT_002 = "J=N,I=N:0,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_002_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_002_DATA = "U=file:forcing_obc_segment_002.nc(u),V=file:forcing_obc_segment_002.nc(v),SSH=file:forcing_obc_segment_002.nc(eta),TEMP=file:forcing_obc_segment_002.nc(temp),SALT=file:forcing_obc_segment_002.nc(salt),Uamp=file:tu_segment_002.nc(uamp),Uphase=file:tu_segment_002.nc(uphase),Vamp=file:tu_segment_002.nc(vamp),Vphase=file:tu_segment_002.nc(vphase),SSHamp=file:tz_segment_002.nc(zamp),SSHphase=file:tz_segment_002.nc(zphase)" +OBC_SEGMENT_002_DATA = "U=file:panama/forcing_obc_segment_002.nc(u),V=file:panama/forcing_obc_segment_002.nc(v),SSH=file:panama/forcing_obc_segment_002.nc(eta),TEMP=file:panama/forcing_obc_segment_002.nc(temp),SALT=file:panama/forcing_obc_segment_002.nc(salt),Uamp=file:panama/tu_segment_002.nc(uamp),Uphase=file:panama/tu_segment_002.nc(uphase),Vamp=file:panama/tu_segment_002.nc(vamp),Vphase=file:panama/tu_segment_002.nc(vphase),SSHamp=file:panama/tz_segment_002.nc(zamp),SSHphase=file:panama/tz_segment_002.nc(zphase)" OBC_SEGMENT_003 = "I=0,J=N:0,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_003_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_003_DATA = "U=file:forcing_obc_segment_003.nc(u),V=file:forcing_obc_segment_003.nc(v),SSH=file:forcing_obc_segment_003.nc(eta),TEMP=file:forcing_obc_segment_003.nc(temp),SALT=file:forcing_obc_segment_003.nc(salt),Uamp=file:tu_segment_003.nc(uamp),Uphase=file:tu_segment_003.nc(uphase),Vamp=file:tu_segment_003.nc(vamp),Vphase=file:tu_segment_003.nc(vphase),SSHamp=file:tz_segment_003.nc(zamp),SSHphase=file:tz_segment_003.nc(zphase)" +OBC_SEGMENT_003_DATA = "U=file:panama/forcing_obc_segment_003.nc(u),V=file:panama/forcing_obc_segment_003.nc(v),SSH=file:panama/forcing_obc_segment_003.nc(eta),TEMP=file:panama/forcing_obc_segment_003.nc(temp),SALT=file:panama/forcing_obc_segment_003.nc(salt),Uamp=file:panama/tu_segment_003.nc(uamp),Uphase=file:panama/tu_segment_003.nc(uphase),Vamp=file:panama/tu_segment_003.nc(vamp),Vphase=file:panama/tu_segment_003.nc(vphase),SSHamp=file:panama/tz_segment_003.nc(zamp),SSHphase=file:panama/tz_segment_003.nc(zphase)" OBC_SEGMENT_004 = "I=N,J=0:N,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_004_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_004_DATA = "U=file:forcing_obc_segment_004.nc(u),V=file:forcing_obc_segment_004.nc(v),SSH=file:forcing_obc_segment_004.nc(eta),TEMP=file:forcing_obc_segment_004.nc(temp),SALT=file:forcing_obc_segment_004.nc(salt),Uamp=file:tu_segment_004.nc(uamp),Uphase=file:tu_segment_004.nc(uphase),Vamp=file:tu_segment_004.nc(vamp),Vphase=file:tu_segment_004.nc(vphase),SSHamp=file:tz_segment_004.nc(zamp),SSHphase=file:tz_segment_004.nc(zphase)" +OBC_SEGMENT_004_DATA = "U=file:panama/forcing_obc_segment_004.nc(u),V=file:panama/forcing_obc_segment_004.nc(v),SSH=file:panama/forcing_obc_segment_004.nc(eta),TEMP=file:panama/forcing_obc_segment_004.nc(temp),SALT=file:panama/forcing_obc_segment_004.nc(salt),Uamp=file:panama/tu_segment_004.nc(uamp),Uphase=file:panama/tu_segment_004.nc(uphase),Vamp=file:panama/tu_segment_004.nc(vamp),Vphase=file:panama/tu_segment_004.nc(vphase),SSHamp=file:panama/tz_segment_004.nc(zamp),SSHphase=file:panama/tz_segment_004.nc(zphase)" ! We need to add one line at the end so we can concatenate other testing user_nl_mom files (if you don't they just get added to the last line) diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom index d549f68..04fc346 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom @@ -5,14 +5,14 @@ REENTRANT_Y = False NIGLOBAL = 60 NJGLOBAL = 60 GRID_CONFIG = mosaic -GRID_FILE = ocean_hgrid_panama1_5490e0.nc +GRID_FILE = panama-bgc/ocean_hgrid_panama1_5490e0.nc TOPO_CONFIG = file -TOPO_FILE = ocean_topog_panama1_5490e0.nc +TOPO_FILE = panama-bgc/ocean_topog_panama1_5490e0.nc MAXIMUM_DEPTH = 3431.7499950346473 MINIMUM_DEPTH = 9.5 NK = 75 COORD_CONFIG = none -ALE_COORDINATE_CONFIG = FILE:ocean_vgrid_panama1_5490e0.nc +ALE_COORDINATE_CONFIG = file:panama-bgc/ocean_vgrid_panama1_5490e0.nc REGRIDDING_COORDINATE_MODE = Z* ! Timesteps (based on grid resolution) @@ -50,22 +50,22 @@ OBC_TIDE_REF_DATE = 2000, 01, 01 MAX_FIELDS = 400 ! MARBL initial conditions file -MARBL_TRACERS_IC_FILE = ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc +MARBL_TRACERS_IC_FILE = panama-bgc/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc ! MARBL sedimentary iron flux file -MARBL_FESEDFLUX_FILE = fesedflux_total_reduce_oxic_panama1_5490e0.nc +MARBL_FESEDFLUX_FILE = panama-bgc/fesedflux_total_reduce_oxic_panama1_5490e0.nc ! MARBL event iron flux file -MARBL_FEVENTFLUX_FILE = feventflux_5gmol_panama1_5490e0.nc +MARBL_FEVENTFLUX_FILE = panama-bgc/feventflux_5gmol_panama1_5490e0.nc ! MARBL event iron flux reduced file -MARBL_FESEDFLUXRED_FILE = feventfluxred_5gmol_panama1_5490e0.nc +MARBL_FESEDFLUXRED_FILE = panama-bgc/feventfluxred_5gmol_panama1_5490e0.nc ! Enable river nutrient fluxes in MOM6 READ_RIV_FLUXES = True ! River nutrient flux file -RIV_FLUX_FILE = river_nutrients_panama1_5490e0_nnsm.nc +RIV_FLUX_FILE = panama-bgc/river_nutrients_panama1_5490e0_nnsm.nc ! Initial conditions INIT_LAYERS_FROM_Z_FILE = True @@ -73,9 +73,9 @@ Z_INIT_ALE_REMAPPING = True TEMP_SALT_INIT_VERTICAL_REMAP_ONLY = True DEPRESS_INITIAL_SURFACE = True VELOCITY_CONFIG = file -TEMP_SALT_Z_INIT_FILE = init_tracers.nc -SURFACE_HEIGHT_IC_FILE = init_eta.nc -VELOCITY_FILE = init_vel.nc +TEMP_SALT_Z_INIT_FILE = panama-bgc/init_tracers.nc +SURFACE_HEIGHT_IC_FILE = panama-bgc/init_eta.nc +VELOCITY_FILE = panama-bgc/init_vel.nc Z_INIT_FILE_PTEMP_VAR = temp Z_INIT_FILE_SALT_VAR = salt SURFACE_HEIGHT_IC_VAR = eta_t @@ -94,39 +94,39 @@ OBC_TRACER_RESERVOIR_LENGTH_SCALE_IN = 3000.0 BRUSHCUTTER_MODE = True OBC_SEGMENT_001 = "J=0,I=0:N,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_001_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_001_DATA = "U=file:forcing_obc_segment_001.nc(u),V=file:forcing_obc_segment_001.nc(v),SSH=file:forcing_obc_segment_001.nc(eta),TEMP=file:forcing_obc_segment_001.nc(temp),SALT=file:forcing_obc_segment_001.nc(salt),Uamp=file:tu_segment_001.nc(uamp),Uphase=file:tu_segment_001.nc(uphase),Vamp=file:tu_segment_001.nc(vamp),Vphase=file:tu_segment_001.nc(vphase),SSHamp=file:tz_segment_001.nc(zamp),SSHphase=file:tz_segment_001.nc(zphase)" +OBC_SEGMENT_001_DATA = "U=file:panama-bgc/forcing_obc_segment_001.nc(u),V=file:panama-bgc/forcing_obc_segment_001.nc(v),SSH=file:panama-bgc/forcing_obc_segment_001.nc(eta),TEMP=file:panama-bgc/forcing_obc_segment_001.nc(temp),SALT=file:panama-bgc/forcing_obc_segment_001.nc(salt),Uamp=file:panama-bgc/tu_segment_001.nc(uamp),Uphase=file:panama-bgc/tu_segment_001.nc(uphase),Vamp=file:panama-bgc/tu_segment_001.nc(vamp),Vphase=file:panama-bgc/tu_segment_001.nc(vphase),SSHamp=file:panama-bgc/tz_segment_001.nc(zamp),SSHphase=file:panama-bgc/tz_segment_001.nc(zphase)" OBC_SEGMENT_002 = "J=N,I=N:0,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_002_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_002_DATA = "U=file:forcing_obc_segment_002.nc(u),V=file:forcing_obc_segment_002.nc(v),SSH=file:forcing_obc_segment_002.nc(eta),TEMP=file:forcing_obc_segment_002.nc(temp),SALT=file:forcing_obc_segment_002.nc(salt),Uamp=file:tu_segment_002.nc(uamp),Uphase=file:tu_segment_002.nc(uphase),Vamp=file:tu_segment_002.nc(vamp),Vphase=file:tu_segment_002.nc(vphase),SSHamp=file:tz_segment_002.nc(zamp),SSHphase=file:tz_segment_002.nc(zphase)" +OBC_SEGMENT_002_DATA = "U=file:panama-bgc/forcing_obc_segment_002.nc(u),V=file:panama-bgc/forcing_obc_segment_002.nc(v),SSH=file:panama-bgc/forcing_obc_segment_002.nc(eta),TEMP=file:panama-bgc/forcing_obc_segment_002.nc(temp),SALT=file:panama-bgc/forcing_obc_segment_002.nc(salt),Uamp=file:panama-bgc/tu_segment_002.nc(uamp),Uphase=file:panama-bgc/tu_segment_002.nc(uphase),Vamp=file:panama-bgc/tu_segment_002.nc(vamp),Vphase=file:panama-bgc/tu_segment_002.nc(vphase),SSHamp=file:panama-bgc/tz_segment_002.nc(zamp),SSHphase=file:panama-bgc/tz_segment_002.nc(zphase)" OBC_SEGMENT_003 = "I=0,J=N:0,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_003_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_003_DATA = "U=file:forcing_obc_segment_003.nc(u),V=file:forcing_obc_segment_003.nc(v),SSH=file:forcing_obc_segment_003.nc(eta),TEMP=file:forcing_obc_segment_003.nc(temp),SALT=file:forcing_obc_segment_003.nc(salt),Uamp=file:tu_segment_003.nc(uamp),Uphase=file:tu_segment_003.nc(uphase),Vamp=file:tu_segment_003.nc(vamp),Vphase=file:tu_segment_003.nc(vphase),SSHamp=file:tz_segment_003.nc(zamp),SSHphase=file:tz_segment_003.nc(zphase)" +OBC_SEGMENT_003_DATA = "U=file:panama-bgc/forcing_obc_segment_003.nc(u),V=file:panama-bgc/forcing_obc_segment_003.nc(v),SSH=file:panama-bgc/forcing_obc_segment_003.nc(eta),TEMP=file:panama-bgc/forcing_obc_segment_003.nc(temp),SALT=file:panama-bgc/forcing_obc_segment_003.nc(salt),Uamp=file:panama-bgc/tu_segment_003.nc(uamp),Uphase=file:panama-bgc/tu_segment_003.nc(uphase),Vamp=file:panama-bgc/tu_segment_003.nc(vamp),Vphase=file:panama-bgc/tu_segment_003.nc(vphase),SSHamp=file:panama-bgc/tz_segment_003.nc(zamp),SSHphase=file:panama-bgc/tz_segment_003.nc(zphase)" OBC_SEGMENT_004 = "I=N,J=0:N,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_004_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_004_DATA = "U=file:forcing_obc_segment_004.nc(u),V=file:forcing_obc_segment_004.nc(v),SSH=file:forcing_obc_segment_004.nc(eta),TEMP=file:forcing_obc_segment_004.nc(temp),SALT=file:forcing_obc_segment_004.nc(salt),Uamp=file:tu_segment_004.nc(uamp),Uphase=file:tu_segment_004.nc(uphase),Vamp=file:tu_segment_004.nc(vamp),Vphase=file:tu_segment_004.nc(vphase),SSHamp=file:tz_segment_004.nc(zamp),SSHphase=file:tz_segment_004.nc(zphase)" -OBC_DATA_PO4=PO4_obc_segment.nc(PO4) -OBC_DATA_NO3=NO3_obc_segment.nc(NO3) -OBC_DATA_SiO3=SiO3_obc_segment.nc(SiO3) -OBC_DATA_NH4=NH4_obc_segment.nc(NH4) -OBC_DATA_Fe=Fe_obc_segment.nc(Fe) -OBC_DATA_Lig=Lig_obc_segment.nc(Lig) -OBC_DATA_O2=O2_obc_segment.nc(O2) -OBC_DATA_DIC=DIC_obc_segment.nc(DIC) -OBC_DATA_DIC_ALT_CO2=DIC_ALT_CO2_obc_segment.nc(DIC_ALT_CO2) -OBC_DATA_ALK=ALK_obc_segment.nc(ALK) -OBC_DATA_ALK_ALT_CO2=ALK_ALT_CO2_obc_segment.nc(ALK_ALT_CO2) -OBC_DATA_DOC=DOC_obc_segment.nc(DOC) -OBC_DATA_DON=DON_obc_segment.nc(DON) -OBC_DATA_DOP=DOP_obc_segment.nc(DOP) -OBC_DATA_DOPr=DOPr_obc_segment.nc(DOPr) -OBC_DATA_DONr=DONr_obc_segment.nc(DONr) -OBC_DATA_DOCr=DOCr_obc_segment.nc(DOCr) -OBC_DATA_microzooC=microzooC_obc_segment.nc(microzooC) -OBC_DATA_mesozooC=mesozooC_obc_segment.nc(mesozooC) -OBC_DATA_spChl=spChl_obc_segment.nc(spChl) -OBC_DATA_spC=spC_obc_segment.nc(spC) -OBC_DATA_spP=spP_obc_segment.nc(spP) -OBC_DATA_spFe=spFe_obc_segment.nc(spFe) -OBC_DATA_diatChl=diatChl_obc_segment.nc(diatChl) -OBC_DATA_diatC=diatC_obc_segment.nc(diatC) +OBC_SEGMENT_004_DATA = "U=file:panama-bgc/forcing_obc_segment_004.nc(u),V=file:panama-bgc/forcing_obc_segment_004.nc(v),SSH=file:panama-bgc/forcing_obc_segment_004.nc(eta),TEMP=file:panama-bgc/forcing_obc_segment_004.nc(temp),SALT=file:panama-bgc/forcing_obc_segment_004.nc(salt),Uamp=file:panama-bgc/tu_segment_004.nc(uamp),Uphase=file:panama-bgc/tu_segment_004.nc(uphase),Vamp=file:panama-bgc/tu_segment_004.nc(vamp),Vphase=file:panama-bgc/tu_segment_004.nc(vphase),SSHamp=file:panama-bgc/tz_segment_004.nc(zamp),SSHphase=file:panama-bgc/tz_segment_004.nc(zphase)" +OBC_DATA_PO4=panama-bgc/PO4_obc_segment.nc(PO4) +OBC_DATA_NO3=panama-bgc/NO3_obc_segment.nc(NO3) +OBC_DATA_SiO3=panama-bgc/SiO3_obc_segment.nc(SiO3) +OBC_DATA_NH4=panama-bgc/NH4_obc_segment.nc(NH4) +OBC_DATA_Fe=panama-bgc/Fe_obc_segment.nc(Fe) +OBC_DATA_Lig=panama-bgc/Lig_obc_segment.nc(Lig) +OBC_DATA_O2=panama-bgc/O2_obc_segment.nc(O2) +OBC_DATA_DIC=panama-bgc/DIC_obc_segment.nc(DIC) +OBC_DATA_DIC_ALT_CO2=panama-bgc/DIC_ALT_CO2_obc_segment.nc(DIC_ALT_CO2) +OBC_DATA_ALK=panama-bgc/ALK_obc_segment.nc(ALK) +OBC_DATA_ALK_ALT_CO2=panama-bgc/ALK_ALT_CO2_obc_segment.nc(ALK_ALT_CO2) +OBC_DATA_DOC=panama-bgc/DOC_obc_segment.nc(DOC) +OBC_DATA_DON=panama-bgc/DON_obc_segment.nc(DON) +OBC_DATA_DOP=panama-bgc/DOP_obc_segment.nc(DOP) +OBC_DATA_DOPr=panama-bgc/DOPr_obc_segment.nc(DOPr) +OBC_DATA_DONr=panama-bgc/DONr_obc_segment.nc(DONr) +OBC_DATA_DOCr=panama-bgc/DOCr_obc_segment.nc(DOCr) +OBC_DATA_microzooC=panama-bgc/microzooC_obc_segment.nc(microzooC) +OBC_DATA_mesozooC=panama-bgc/mesozooC_obc_segment.nc(mesozooC) +OBC_DATA_spChl=panama-bgc/spChl_obc_segment.nc(spChl) +OBC_DATA_spC=panama-bgc/spC_obc_segment.nc(spC) +OBC_DATA_spP=panama-bgc/spP_obc_segment.nc(spP) +OBC_DATA_spFe=panama-bgc/spFe_obc_segment.nc(spFe) +OBC_DATA_diatChl=panama-bgc/diatChl_obc_segment.nc(diatChl) +OBC_DATA_diatC=panama-bgc/diatC_obc_segment.nc(diatC) ! We need to add one line at the end so we can concatenate other testing user_nl_mom files (if you don't they just get added to the last line) diff --git a/param_templates/MOM_input.yaml b/param_templates/MOM_input.yaml index 5ad735c..e0185c6 100644 --- a/param_templates/MOM_input.yaml +++ b/param_templates/MOM_input.yaml @@ -35,8 +35,7 @@ Global: "The directory in which input files are found." datatype: string value: - $MOM6_DOMAIN_TYPE == "REGIONAL" and $TEST == True and $MARBL_CONFIG == "off": ${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama - $MOM6_DOMAIN_TYPE == "REGIONAL" and $TEST == True and $MARBL_CONFIG != "off": ${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc + $MOM6_DOMAIN_TYPE == "REGIONAL" and $TEST == True: ${DIN_LOC_ROOT}/ocn/mom/croc/testing_data else: ${DIN_LOC_ROOT}/ocn/mom/${OCN_GRID} TRIPOLAR_N: description: | diff --git a/param_templates/json/MOM_input.json b/param_templates/json/MOM_input.json index 408b588..ff76e97 100644 --- a/param_templates/json/MOM_input.json +++ b/param_templates/json/MOM_input.json @@ -4,8 +4,7 @@ "description": "\"The directory in which input files are found.\"\n", "datatype": "string", "value": { - "$MOM6_DOMAIN_TYPE == \"REGIONAL\" and $TEST == True and $MARBL_CONFIG == \"off\"": "${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama", - "$MOM6_DOMAIN_TYPE == \"REGIONAL\" and $TEST == True and $MARBL_CONFIG != \"off\"": "${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc", + "$MOM6_DOMAIN_TYPE == \"REGIONAL\" and $TEST == True": "${DIN_LOC_ROOT}/ocn/mom/croc/testing_data", "else": "${DIN_LOC_ROOT}/ocn/mom/${OCN_GRID}" } }, From 795f8b577c3a3fe442c35e061e5825e2eb03ecff Mon Sep 17 00:00:00 2001 From: manishvenu Date: Thu, 7 May 2026 11:53:06 -0600 Subject: [PATCH 14/14] Revert "Try This" This reverts commit ebc231588ff944e687e4ffba4bd74739826a568f. --- .../mom/regional/base/user_nl_mom | 22 ++--- .../mom/regional/bgc/user_nl_mom | 80 +++++++++---------- param_templates/MOM_input.yaml | 3 +- param_templates/json/MOM_input.json | 3 +- 4 files changed, 55 insertions(+), 53 deletions(-) diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom index a1c6bfa..41e932c 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/base/user_nl_mom @@ -5,14 +5,14 @@ REENTRANT_Y = False NIGLOBAL = 60 NJGLOBAL = 60 GRID_CONFIG = mosaic -GRID_FILE = panama/ocean_hgrid_panama1_352fd1.nc +GRID_FILE = ocean_hgrid_panama1_352fd1.nc TOPO_CONFIG = file -TOPO_FILE = panama/ocean_topog_panama1_352fd1.nc +TOPO_FILE = ocean_topog_panama1_352fd1.nc MAXIMUM_DEPTH = 3431.7499950346473 MINIMUM_DEPTH = 9.5 NK = 75 COORD_CONFIG = none -ALE_COORDINATE_CONFIG = file:panama/ocean_vgrid_panama1_352fd1.nc +ALE_COORDINATE_CONFIG = FILE:ocean_vgrid_panama1_352fd1.nc REGRIDDING_COORDINATE_MODE = Z* ! Timesteps (based on grid resolution) @@ -47,7 +47,7 @@ OBC_TIDE_CONSTITUENTS = "M2" OBC_TIDE_REF_DATE = 2000, 01, 01 ! Chlorophyll data file -CHL_FILE = panama/seawifs-clim-1997-2010-panama1.nc +CHL_FILE = seawifs-clim-1997-2010-panama1.nc ! Enable chlorophyll from file CHL_FROM_FILE = TRUE @@ -64,9 +64,9 @@ Z_INIT_ALE_REMAPPING = True TEMP_SALT_INIT_VERTICAL_REMAP_ONLY = True DEPRESS_INITIAL_SURFACE = True VELOCITY_CONFIG = file -TEMP_SALT_Z_INIT_FILE = panama/init_tracers.nc -SURFACE_HEIGHT_IC_FILE = panama/init_eta.nc -VELOCITY_FILE = panama/init_vel.nc +TEMP_SALT_Z_INIT_FILE = init_tracers.nc +SURFACE_HEIGHT_IC_FILE = init_eta.nc +VELOCITY_FILE = init_vel.nc Z_INIT_FILE_PTEMP_VAR = temp Z_INIT_FILE_SALT_VAR = salt SURFACE_HEIGHT_IC_VAR = eta_t @@ -85,14 +85,14 @@ OBC_TRACER_RESERVOIR_LENGTH_SCALE_IN = 3000.0 BRUSHCUTTER_MODE = True OBC_SEGMENT_001 = "J=0,I=0:N,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_001_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_001_DATA = "U=file:panama/forcing_obc_segment_001.nc(u),V=file:panama/forcing_obc_segment_001.nc(v),SSH=file:panama/forcing_obc_segment_001.nc(eta),TEMP=file:panama/forcing_obc_segment_001.nc(temp),SALT=file:panama/forcing_obc_segment_001.nc(salt),Uamp=file:panama/tu_segment_001.nc(uamp),Uphase=file:panama/tu_segment_001.nc(uphase),Vamp=file:panama/tu_segment_001.nc(vamp),Vphase=file:panama/tu_segment_001.nc(vphase),SSHamp=file:panama/tz_segment_001.nc(zamp),SSHphase=file:panama/tz_segment_001.nc(zphase)" +OBC_SEGMENT_001_DATA = "U=file:forcing_obc_segment_001.nc(u),V=file:forcing_obc_segment_001.nc(v),SSH=file:forcing_obc_segment_001.nc(eta),TEMP=file:forcing_obc_segment_001.nc(temp),SALT=file:forcing_obc_segment_001.nc(salt),Uamp=file:tu_segment_001.nc(uamp),Uphase=file:tu_segment_001.nc(uphase),Vamp=file:tu_segment_001.nc(vamp),Vphase=file:tu_segment_001.nc(vphase),SSHamp=file:tz_segment_001.nc(zamp),SSHphase=file:tz_segment_001.nc(zphase)" OBC_SEGMENT_002 = "J=N,I=N:0,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_002_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_002_DATA = "U=file:panama/forcing_obc_segment_002.nc(u),V=file:panama/forcing_obc_segment_002.nc(v),SSH=file:panama/forcing_obc_segment_002.nc(eta),TEMP=file:panama/forcing_obc_segment_002.nc(temp),SALT=file:panama/forcing_obc_segment_002.nc(salt),Uamp=file:panama/tu_segment_002.nc(uamp),Uphase=file:panama/tu_segment_002.nc(uphase),Vamp=file:panama/tu_segment_002.nc(vamp),Vphase=file:panama/tu_segment_002.nc(vphase),SSHamp=file:panama/tz_segment_002.nc(zamp),SSHphase=file:panama/tz_segment_002.nc(zphase)" +OBC_SEGMENT_002_DATA = "U=file:forcing_obc_segment_002.nc(u),V=file:forcing_obc_segment_002.nc(v),SSH=file:forcing_obc_segment_002.nc(eta),TEMP=file:forcing_obc_segment_002.nc(temp),SALT=file:forcing_obc_segment_002.nc(salt),Uamp=file:tu_segment_002.nc(uamp),Uphase=file:tu_segment_002.nc(uphase),Vamp=file:tu_segment_002.nc(vamp),Vphase=file:tu_segment_002.nc(vphase),SSHamp=file:tz_segment_002.nc(zamp),SSHphase=file:tz_segment_002.nc(zphase)" OBC_SEGMENT_003 = "I=0,J=N:0,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_003_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_003_DATA = "U=file:panama/forcing_obc_segment_003.nc(u),V=file:panama/forcing_obc_segment_003.nc(v),SSH=file:panama/forcing_obc_segment_003.nc(eta),TEMP=file:panama/forcing_obc_segment_003.nc(temp),SALT=file:panama/forcing_obc_segment_003.nc(salt),Uamp=file:panama/tu_segment_003.nc(uamp),Uphase=file:panama/tu_segment_003.nc(uphase),Vamp=file:panama/tu_segment_003.nc(vamp),Vphase=file:panama/tu_segment_003.nc(vphase),SSHamp=file:panama/tz_segment_003.nc(zamp),SSHphase=file:panama/tz_segment_003.nc(zphase)" +OBC_SEGMENT_003_DATA = "U=file:forcing_obc_segment_003.nc(u),V=file:forcing_obc_segment_003.nc(v),SSH=file:forcing_obc_segment_003.nc(eta),TEMP=file:forcing_obc_segment_003.nc(temp),SALT=file:forcing_obc_segment_003.nc(salt),Uamp=file:tu_segment_003.nc(uamp),Uphase=file:tu_segment_003.nc(uphase),Vamp=file:tu_segment_003.nc(vamp),Vphase=file:tu_segment_003.nc(vphase),SSHamp=file:tz_segment_003.nc(zamp),SSHphase=file:tz_segment_003.nc(zphase)" OBC_SEGMENT_004 = "I=N,J=0:N,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_004_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_004_DATA = "U=file:panama/forcing_obc_segment_004.nc(u),V=file:panama/forcing_obc_segment_004.nc(v),SSH=file:panama/forcing_obc_segment_004.nc(eta),TEMP=file:panama/forcing_obc_segment_004.nc(temp),SALT=file:panama/forcing_obc_segment_004.nc(salt),Uamp=file:panama/tu_segment_004.nc(uamp),Uphase=file:panama/tu_segment_004.nc(uphase),Vamp=file:panama/tu_segment_004.nc(vamp),Vphase=file:panama/tu_segment_004.nc(vphase),SSHamp=file:panama/tz_segment_004.nc(zamp),SSHphase=file:panama/tz_segment_004.nc(zphase)" +OBC_SEGMENT_004_DATA = "U=file:forcing_obc_segment_004.nc(u),V=file:forcing_obc_segment_004.nc(v),SSH=file:forcing_obc_segment_004.nc(eta),TEMP=file:forcing_obc_segment_004.nc(temp),SALT=file:forcing_obc_segment_004.nc(salt),Uamp=file:tu_segment_004.nc(uamp),Uphase=file:tu_segment_004.nc(uphase),Vamp=file:tu_segment_004.nc(vamp),Vphase=file:tu_segment_004.nc(vphase),SSHamp=file:tz_segment_004.nc(zamp),SSHphase=file:tz_segment_004.nc(zphase)" ! We need to add one line at the end so we can concatenate other testing user_nl_mom files (if you don't they just get added to the last line) diff --git a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom index 04fc346..d549f68 100644 --- a/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom +++ b/cime_config/testdefs/testmods_dirs/mom/regional/bgc/user_nl_mom @@ -5,14 +5,14 @@ REENTRANT_Y = False NIGLOBAL = 60 NJGLOBAL = 60 GRID_CONFIG = mosaic -GRID_FILE = panama-bgc/ocean_hgrid_panama1_5490e0.nc +GRID_FILE = ocean_hgrid_panama1_5490e0.nc TOPO_CONFIG = file -TOPO_FILE = panama-bgc/ocean_topog_panama1_5490e0.nc +TOPO_FILE = ocean_topog_panama1_5490e0.nc MAXIMUM_DEPTH = 3431.7499950346473 MINIMUM_DEPTH = 9.5 NK = 75 COORD_CONFIG = none -ALE_COORDINATE_CONFIG = file:panama-bgc/ocean_vgrid_panama1_5490e0.nc +ALE_COORDINATE_CONFIG = FILE:ocean_vgrid_panama1_5490e0.nc REGRIDDING_COORDINATE_MODE = Z* ! Timesteps (based on grid resolution) @@ -50,22 +50,22 @@ OBC_TIDE_REF_DATE = 2000, 01, 01 MAX_FIELDS = 400 ! MARBL initial conditions file -MARBL_TRACERS_IC_FILE = panama-bgc/ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc +MARBL_TRACERS_IC_FILE = ecosys_jan_IC_omip_latlon_1x1_180W_c250613.nc ! MARBL sedimentary iron flux file -MARBL_FESEDFLUX_FILE = panama-bgc/fesedflux_total_reduce_oxic_panama1_5490e0.nc +MARBL_FESEDFLUX_FILE = fesedflux_total_reduce_oxic_panama1_5490e0.nc ! MARBL event iron flux file -MARBL_FEVENTFLUX_FILE = panama-bgc/feventflux_5gmol_panama1_5490e0.nc +MARBL_FEVENTFLUX_FILE = feventflux_5gmol_panama1_5490e0.nc ! MARBL event iron flux reduced file -MARBL_FESEDFLUXRED_FILE = panama-bgc/feventfluxred_5gmol_panama1_5490e0.nc +MARBL_FESEDFLUXRED_FILE = feventfluxred_5gmol_panama1_5490e0.nc ! Enable river nutrient fluxes in MOM6 READ_RIV_FLUXES = True ! River nutrient flux file -RIV_FLUX_FILE = panama-bgc/river_nutrients_panama1_5490e0_nnsm.nc +RIV_FLUX_FILE = river_nutrients_panama1_5490e0_nnsm.nc ! Initial conditions INIT_LAYERS_FROM_Z_FILE = True @@ -73,9 +73,9 @@ Z_INIT_ALE_REMAPPING = True TEMP_SALT_INIT_VERTICAL_REMAP_ONLY = True DEPRESS_INITIAL_SURFACE = True VELOCITY_CONFIG = file -TEMP_SALT_Z_INIT_FILE = panama-bgc/init_tracers.nc -SURFACE_HEIGHT_IC_FILE = panama-bgc/init_eta.nc -VELOCITY_FILE = panama-bgc/init_vel.nc +TEMP_SALT_Z_INIT_FILE = init_tracers.nc +SURFACE_HEIGHT_IC_FILE = init_eta.nc +VELOCITY_FILE = init_vel.nc Z_INIT_FILE_PTEMP_VAR = temp Z_INIT_FILE_SALT_VAR = salt SURFACE_HEIGHT_IC_VAR = eta_t @@ -94,39 +94,39 @@ OBC_TRACER_RESERVOIR_LENGTH_SCALE_IN = 3000.0 BRUSHCUTTER_MODE = True OBC_SEGMENT_001 = "J=0,I=0:N,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_001_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_001_DATA = "U=file:panama-bgc/forcing_obc_segment_001.nc(u),V=file:panama-bgc/forcing_obc_segment_001.nc(v),SSH=file:panama-bgc/forcing_obc_segment_001.nc(eta),TEMP=file:panama-bgc/forcing_obc_segment_001.nc(temp),SALT=file:panama-bgc/forcing_obc_segment_001.nc(salt),Uamp=file:panama-bgc/tu_segment_001.nc(uamp),Uphase=file:panama-bgc/tu_segment_001.nc(uphase),Vamp=file:panama-bgc/tu_segment_001.nc(vamp),Vphase=file:panama-bgc/tu_segment_001.nc(vphase),SSHamp=file:panama-bgc/tz_segment_001.nc(zamp),SSHphase=file:panama-bgc/tz_segment_001.nc(zphase)" +OBC_SEGMENT_001_DATA = "U=file:forcing_obc_segment_001.nc(u),V=file:forcing_obc_segment_001.nc(v),SSH=file:forcing_obc_segment_001.nc(eta),TEMP=file:forcing_obc_segment_001.nc(temp),SALT=file:forcing_obc_segment_001.nc(salt),Uamp=file:tu_segment_001.nc(uamp),Uphase=file:tu_segment_001.nc(uphase),Vamp=file:tu_segment_001.nc(vamp),Vphase=file:tu_segment_001.nc(vphase),SSHamp=file:tz_segment_001.nc(zamp),SSHphase=file:tz_segment_001.nc(zphase)" OBC_SEGMENT_002 = "J=N,I=N:0,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_002_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_002_DATA = "U=file:panama-bgc/forcing_obc_segment_002.nc(u),V=file:panama-bgc/forcing_obc_segment_002.nc(v),SSH=file:panama-bgc/forcing_obc_segment_002.nc(eta),TEMP=file:panama-bgc/forcing_obc_segment_002.nc(temp),SALT=file:panama-bgc/forcing_obc_segment_002.nc(salt),Uamp=file:panama-bgc/tu_segment_002.nc(uamp),Uphase=file:panama-bgc/tu_segment_002.nc(uphase),Vamp=file:panama-bgc/tu_segment_002.nc(vamp),Vphase=file:panama-bgc/tu_segment_002.nc(vphase),SSHamp=file:panama-bgc/tz_segment_002.nc(zamp),SSHphase=file:panama-bgc/tz_segment_002.nc(zphase)" +OBC_SEGMENT_002_DATA = "U=file:forcing_obc_segment_002.nc(u),V=file:forcing_obc_segment_002.nc(v),SSH=file:forcing_obc_segment_002.nc(eta),TEMP=file:forcing_obc_segment_002.nc(temp),SALT=file:forcing_obc_segment_002.nc(salt),Uamp=file:tu_segment_002.nc(uamp),Uphase=file:tu_segment_002.nc(uphase),Vamp=file:tu_segment_002.nc(vamp),Vphase=file:tu_segment_002.nc(vphase),SSHamp=file:tz_segment_002.nc(zamp),SSHphase=file:tz_segment_002.nc(zphase)" OBC_SEGMENT_003 = "I=0,J=N:0,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_003_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_003_DATA = "U=file:panama-bgc/forcing_obc_segment_003.nc(u),V=file:panama-bgc/forcing_obc_segment_003.nc(v),SSH=file:panama-bgc/forcing_obc_segment_003.nc(eta),TEMP=file:panama-bgc/forcing_obc_segment_003.nc(temp),SALT=file:panama-bgc/forcing_obc_segment_003.nc(salt),Uamp=file:panama-bgc/tu_segment_003.nc(uamp),Uphase=file:panama-bgc/tu_segment_003.nc(uphase),Vamp=file:panama-bgc/tu_segment_003.nc(vamp),Vphase=file:panama-bgc/tu_segment_003.nc(vphase),SSHamp=file:panama-bgc/tz_segment_003.nc(zamp),SSHphase=file:panama-bgc/tz_segment_003.nc(zphase)" +OBC_SEGMENT_003_DATA = "U=file:forcing_obc_segment_003.nc(u),V=file:forcing_obc_segment_003.nc(v),SSH=file:forcing_obc_segment_003.nc(eta),TEMP=file:forcing_obc_segment_003.nc(temp),SALT=file:forcing_obc_segment_003.nc(salt),Uamp=file:tu_segment_003.nc(uamp),Uphase=file:tu_segment_003.nc(uphase),Vamp=file:tu_segment_003.nc(vamp),Vphase=file:tu_segment_003.nc(vphase),SSHamp=file:tz_segment_003.nc(zamp),SSHphase=file:tz_segment_003.nc(zphase)" OBC_SEGMENT_004 = "I=N,J=0:N,FLATHER,ORLANSKI,NUDGED,ORLANSKI_TAN,NUDGED_TAN" OBC_SEGMENT_004_VELOCITY_NUDGING_TIMESCALES = 0.3, 360.0 -OBC_SEGMENT_004_DATA = "U=file:panama-bgc/forcing_obc_segment_004.nc(u),V=file:panama-bgc/forcing_obc_segment_004.nc(v),SSH=file:panama-bgc/forcing_obc_segment_004.nc(eta),TEMP=file:panama-bgc/forcing_obc_segment_004.nc(temp),SALT=file:panama-bgc/forcing_obc_segment_004.nc(salt),Uamp=file:panama-bgc/tu_segment_004.nc(uamp),Uphase=file:panama-bgc/tu_segment_004.nc(uphase),Vamp=file:panama-bgc/tu_segment_004.nc(vamp),Vphase=file:panama-bgc/tu_segment_004.nc(vphase),SSHamp=file:panama-bgc/tz_segment_004.nc(zamp),SSHphase=file:panama-bgc/tz_segment_004.nc(zphase)" -OBC_DATA_PO4=panama-bgc/PO4_obc_segment.nc(PO4) -OBC_DATA_NO3=panama-bgc/NO3_obc_segment.nc(NO3) -OBC_DATA_SiO3=panama-bgc/SiO3_obc_segment.nc(SiO3) -OBC_DATA_NH4=panama-bgc/NH4_obc_segment.nc(NH4) -OBC_DATA_Fe=panama-bgc/Fe_obc_segment.nc(Fe) -OBC_DATA_Lig=panama-bgc/Lig_obc_segment.nc(Lig) -OBC_DATA_O2=panama-bgc/O2_obc_segment.nc(O2) -OBC_DATA_DIC=panama-bgc/DIC_obc_segment.nc(DIC) -OBC_DATA_DIC_ALT_CO2=panama-bgc/DIC_ALT_CO2_obc_segment.nc(DIC_ALT_CO2) -OBC_DATA_ALK=panama-bgc/ALK_obc_segment.nc(ALK) -OBC_DATA_ALK_ALT_CO2=panama-bgc/ALK_ALT_CO2_obc_segment.nc(ALK_ALT_CO2) -OBC_DATA_DOC=panama-bgc/DOC_obc_segment.nc(DOC) -OBC_DATA_DON=panama-bgc/DON_obc_segment.nc(DON) -OBC_DATA_DOP=panama-bgc/DOP_obc_segment.nc(DOP) -OBC_DATA_DOPr=panama-bgc/DOPr_obc_segment.nc(DOPr) -OBC_DATA_DONr=panama-bgc/DONr_obc_segment.nc(DONr) -OBC_DATA_DOCr=panama-bgc/DOCr_obc_segment.nc(DOCr) -OBC_DATA_microzooC=panama-bgc/microzooC_obc_segment.nc(microzooC) -OBC_DATA_mesozooC=panama-bgc/mesozooC_obc_segment.nc(mesozooC) -OBC_DATA_spChl=panama-bgc/spChl_obc_segment.nc(spChl) -OBC_DATA_spC=panama-bgc/spC_obc_segment.nc(spC) -OBC_DATA_spP=panama-bgc/spP_obc_segment.nc(spP) -OBC_DATA_spFe=panama-bgc/spFe_obc_segment.nc(spFe) -OBC_DATA_diatChl=panama-bgc/diatChl_obc_segment.nc(diatChl) -OBC_DATA_diatC=panama-bgc/diatC_obc_segment.nc(diatC) +OBC_SEGMENT_004_DATA = "U=file:forcing_obc_segment_004.nc(u),V=file:forcing_obc_segment_004.nc(v),SSH=file:forcing_obc_segment_004.nc(eta),TEMP=file:forcing_obc_segment_004.nc(temp),SALT=file:forcing_obc_segment_004.nc(salt),Uamp=file:tu_segment_004.nc(uamp),Uphase=file:tu_segment_004.nc(uphase),Vamp=file:tu_segment_004.nc(vamp),Vphase=file:tu_segment_004.nc(vphase),SSHamp=file:tz_segment_004.nc(zamp),SSHphase=file:tz_segment_004.nc(zphase)" +OBC_DATA_PO4=PO4_obc_segment.nc(PO4) +OBC_DATA_NO3=NO3_obc_segment.nc(NO3) +OBC_DATA_SiO3=SiO3_obc_segment.nc(SiO3) +OBC_DATA_NH4=NH4_obc_segment.nc(NH4) +OBC_DATA_Fe=Fe_obc_segment.nc(Fe) +OBC_DATA_Lig=Lig_obc_segment.nc(Lig) +OBC_DATA_O2=O2_obc_segment.nc(O2) +OBC_DATA_DIC=DIC_obc_segment.nc(DIC) +OBC_DATA_DIC_ALT_CO2=DIC_ALT_CO2_obc_segment.nc(DIC_ALT_CO2) +OBC_DATA_ALK=ALK_obc_segment.nc(ALK) +OBC_DATA_ALK_ALT_CO2=ALK_ALT_CO2_obc_segment.nc(ALK_ALT_CO2) +OBC_DATA_DOC=DOC_obc_segment.nc(DOC) +OBC_DATA_DON=DON_obc_segment.nc(DON) +OBC_DATA_DOP=DOP_obc_segment.nc(DOP) +OBC_DATA_DOPr=DOPr_obc_segment.nc(DOPr) +OBC_DATA_DONr=DONr_obc_segment.nc(DONr) +OBC_DATA_DOCr=DOCr_obc_segment.nc(DOCr) +OBC_DATA_microzooC=microzooC_obc_segment.nc(microzooC) +OBC_DATA_mesozooC=mesozooC_obc_segment.nc(mesozooC) +OBC_DATA_spChl=spChl_obc_segment.nc(spChl) +OBC_DATA_spC=spC_obc_segment.nc(spC) +OBC_DATA_spP=spP_obc_segment.nc(spP) +OBC_DATA_spFe=spFe_obc_segment.nc(spFe) +OBC_DATA_diatChl=diatChl_obc_segment.nc(diatChl) +OBC_DATA_diatC=diatC_obc_segment.nc(diatC) ! We need to add one line at the end so we can concatenate other testing user_nl_mom files (if you don't they just get added to the last line) diff --git a/param_templates/MOM_input.yaml b/param_templates/MOM_input.yaml index e0185c6..5ad735c 100644 --- a/param_templates/MOM_input.yaml +++ b/param_templates/MOM_input.yaml @@ -35,7 +35,8 @@ Global: "The directory in which input files are found." datatype: string value: - $MOM6_DOMAIN_TYPE == "REGIONAL" and $TEST == True: ${DIN_LOC_ROOT}/ocn/mom/croc/testing_data + $MOM6_DOMAIN_TYPE == "REGIONAL" and $TEST == True and $MARBL_CONFIG == "off": ${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama + $MOM6_DOMAIN_TYPE == "REGIONAL" and $TEST == True and $MARBL_CONFIG != "off": ${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc else: ${DIN_LOC_ROOT}/ocn/mom/${OCN_GRID} TRIPOLAR_N: description: | diff --git a/param_templates/json/MOM_input.json b/param_templates/json/MOM_input.json index ff76e97..408b588 100644 --- a/param_templates/json/MOM_input.json +++ b/param_templates/json/MOM_input.json @@ -4,7 +4,8 @@ "description": "\"The directory in which input files are found.\"\n", "datatype": "string", "value": { - "$MOM6_DOMAIN_TYPE == \"REGIONAL\" and $TEST == True": "${DIN_LOC_ROOT}/ocn/mom/croc/testing_data", + "$MOM6_DOMAIN_TYPE == \"REGIONAL\" and $TEST == True and $MARBL_CONFIG == \"off\"": "${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama", + "$MOM6_DOMAIN_TYPE == \"REGIONAL\" and $TEST == True and $MARBL_CONFIG != \"off\"": "${DIN_LOC_ROOT}/ocn/mom/croc/testing_data/panama-bgc", "else": "${DIN_LOC_ROOT}/ocn/mom/${OCN_GRID}" } },