From 001e6a1eee2597b65a6e89af48060f770145eec1 Mon Sep 17 00:00:00 2001 From: manishvenu Date: Wed, 25 Mar 2026 10:09:46 -0600 Subject: [PATCH 01/23] 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 4ec21f8c771a9369540925b21c883d623cdbd8bc Mon Sep 17 00:00:00 2001 From: manishvenu Date: Wed, 25 Mar 2026 10:57:26 -0600 Subject: [PATCH 02/23] MOM_interface changes for regional, only todo is the mom6_domian tupe mom_input changes --- cime_config/config_component.xml | 16 +++- cime_config/config_compsets.xml | 44 ++++++++++ cime_config/config_pes.xml | 134 +++++++++++++++++++++++++++++++ 3 files changed, 193 insertions(+), 1 deletion(-) diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 1ccec36..d2f6f69 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -5,9 +5,10 @@ - MOM6 OCEAN + MOM6 OCEAN MARBL Biogeochemistry Tracer Library base biotic tracers MARBL Biogeochemistry Tracer Library abiotic DIC tracers + Regional Setup @@ -204,6 +205,19 @@ + + char + REGIONAL,GLOBAL + GLOBAL + + REGIONAL + + case_comp + env_run.xml + Flag to turn on/off the regional/global defaults for MOM_input + + + ========================================= MOM6 naming conventions diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 6e5cf63..eba40d9 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -73,6 +73,28 @@ 1850_DATM%JRA_SLND_DICE%SSMI_MOM6%MARBL-ABIO_DROF%JRA_SGLC_SWAV + + + + CR_JRA + 1850_DATM%JRA_SLND_SICE_MOM6%REGIONAL_SROF_SGLC_SWAV + + + + CR1850MARBL_JRA + 1850_DATM%JRA_SLND_SICE_MOM6%REGIONAL%MARBL-BIO_SROF_SGLC_SWAV + + + + CR_JRA_GLOFAS + 1850_DATM%JRA_SLND_SICE_MOM6%REGIONAL_DROF%GLOFAS_SGLC_SWAV + + + + CR1850MARBL_JRA_GLOFAS + 1850_DATM%JRA_SLND_SICE_MOM6%REGIONAL%MARBL-BIO_DROF%GLOFAS_SGLC_SWAV + + @@ -120,4 +142,26 @@ 1850_DATM%JRA-1p5-2023_SLND_CICE_MOM6%MARBL-ABIO_DROF%JRA-1p5-2023_SGLC_WW3 + + + + GR_JRA + 1850_DATM%JRA_SLND_CICE_MOM6%REGIONAL_SROF_SGLC_SWAV + + + + GR1850MARBL_JRA + 1850_DATM%JRA_SLND_CICE_MOM6%REGIONAL%MARBL-BIO_SROF_SGLC_SWAV + + + + GR_JRA_GLOFAS + 1850_DATM%JRA_SLND_CICE_MOM6%REGIONAL_DROF%GLOFAS_SGLC_SWAV + + + + GR1850MARBL_JRA_GLOFAS + 1850_DATM%JRA_SLND_CICE_MOM6%REGIONAL%MARBL-BIO_DROF%GLOFAS_SGLC_SWAV + + diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index a3e8648..8f96cfb 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -39,6 +39,140 @@ + + + Regional modeling configuration with SICE + + 128 + 128 + 128 + 128 + 128 + 128 + 128 + 128 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + 0 + 128 + 0 + 0 + 0 + + + + Regional modeling configuration with SICE and MARBL-BIO + + 128 + 128 + 128 + 128 + 384 + 128 + 128 + 128 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + 0 + 128 + 0 + 0 + 0 + + + + Regional modeling configuration with CICE + + 128 + 128 + 128 + 128 + 128 + 128 + 128 + 128 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + 128 + 256 + 0 + 0 + 0 + + + + Regional modeling configuration with CICE and MARBL-BIO + + 128 + 128 + 128 + 128 + 384 + 128 + 128 + 128 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + 128 + 256 + 0 + 0 + 0 + + + From e7d30555efaabb8f99cad0431933efa9511b8e67 Mon Sep 17 00:00:00 2001 From: manishvenu Date: Wed, 25 Mar 2026 14:23:28 -0600 Subject: [PATCH 03/23] MOM_input changes --- param_templates/MOM_input.yaml | 252 +++++++++++++++++++++++- param_templates/json/MOM_input.json | 291 +++++++++++++++++++++++----- 2 files changed, 491 insertions(+), 52 deletions(-) diff --git a/param_templates/MOM_input.yaml b/param_templates/MOM_input.yaml index fbbcc35..f5cd3fd 100644 --- a/param_templates/MOM_input.yaml +++ b/param_templates/MOM_input.yaml @@ -108,6 +108,17 @@ Global: units: Boolean value: $OCN_GRID == "tx2_3v2": False + $MOM6_DOMAIN_TYPE == "REGIONAL": False + DIABATIC_FIRST: + description: | + "[Boolean] default = False + If true, apply diabatic and thermodynamic processes, + including buoyancy forcing and mass gain or loss, + before stepping the dynamics forward." + datatype: logical + units: Boolean + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": True HREF_FOR_MLD: description: | "[m] default = 0.0 @@ -247,6 +258,7 @@ Global: $OCN_GRID == "tx2_3v2": 3992.0 $OCN_GRID == "tx0.25v1": 3992.0 $OCN_GRID == "MISOMIP": 3974.0 + $MOM6_DOMAIN_TYPE == "REGIONAL": 3992.0 USE_PSURF_IN_EOS: description: | "[Boolean] default = True @@ -264,6 +276,7 @@ Global: value: $OCN_GRID == "tx2_3v2": True $OCN_GRID == "tx0.25v1": True + $MOM6_DOMAIN_TYPE == "REGIONAL": True SAVE_INITIAL_CONDS: description: | "[Boolean] default = False @@ -303,6 +316,7 @@ Global: $OCN_GRID == "tx2_3v2": -7.75E-08 $OCN_GRID == "tx0.25v1": -7.75E-08 $OCN_GRID == "MISOMIP": -7.53E-08 + $MOM6_DOMAIN_TYPE == "REGIONAL": -7.75E-08 USE_IDEAL_AGE_TRACER: description: | "[Boolean] default = False @@ -489,6 +503,7 @@ Global: value: $OCN_GRID == "tx0.25v1": "file" $OCN_GRID == "MISOMIP": "linear" + $MOM6_DOMAIN_TYPE == "REGIONAL": "ALE" REMAP_UV_USING_OLD_ALG: description: | "[Boolean] default = True @@ -638,7 +653,11 @@ Global: PQM_IH4IH3 (4th-order accurate) PQM_IH6IH5 (5th-order accurate)" datatype: string - value: "PPM_CW" + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": + "PPM_H4" + else: + "PPM_CW" REMAP_VEL_CONSERVE_KE: description: | "[Boolean] default = False @@ -729,6 +748,7 @@ Global: value: $OCN_GRID == "tx2_3v2": True $OCN_GRID == "tx0.25v1": True + $MOM6_DOMAIN_TYPE == "REGIONAL": True RESOLN_SCALED_KH: description: | "[Boolean] default = False @@ -827,6 +847,7 @@ Global: value: $OCN_GRID == "tx2_3v2": True $OCN_GRID == "tx0.25v1": True + $MOM6_DOMAIN_TYPE == "REGIONAL": True USE_STANLEY_ISO: description: | "[Boolean] default = False @@ -935,6 +956,7 @@ Global: $MOM6_VERTICAL_GRID in ["zstar_65L", "zstar_75L"]: "Z*" $MOM6_VERTICAL_GRID == "hycom1": "HYCOM1" $MOM6_VERTICAL_GRID == "sigma_shelf_zstar": "SIGMA_SHELF_ZSTAR" + $MOM6_DOMAIN_TYPE == "REGIONAL": "Z*" ALE_COORDINATE_CONFIG: description: | "default = 'UNIFORM' @@ -1123,6 +1145,7 @@ Global: value: $OCN_GRID == "tx0.25v1": 0.01 $OCN_GRID == "MISOMIP": 0.001 + $MOM6_DOMAIN_TYPE == "REGIONAL": 0.01 USE_LEITHY: description: | "[Boolean] default = False @@ -1188,6 +1211,7 @@ Global: units: m value: $OCN_GRID == "MISOMIP": 20.0 + $MOM6_DOMAIN_TYPE == "REGIONAL": 0.9 else: 0.5 CHANNEL_DRAG: description: | @@ -1220,6 +1244,7 @@ Global: value: $OCN_GRID == "tx2_3v2": 1.0 $OCN_GRID == "tx0.25v1": 1.25 + $MOM6_DOMAIN_TYPE == "REGIONAL": 1.25 U_TRUNC_FILE: description: | "default = '' @@ -1390,6 +1415,17 @@ Global: value: $OCN_GRID == "tx2_3v2": True $OCN_GRID == "tx0.25v1": True + $MOM6_DOMAIN_TYPE == "REGIONAL": True + BT_NONLIN_STRESS: + description: | + "[Boolean] default = False + If true, use the full depth of the ocean at the start of the barotropic step + when calculating the surface stress contribution to the barotropic + acclerations. Otherwise use the depth based on bathyT." + datatype: logical + units: Boolean + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": True BT_THICK_SCHEME: description: | "default = 'HYBRID' @@ -1444,6 +1480,7 @@ Global: value: $OCN_GRID == "tx0.25v1": -0.9 $OCN_GRID == "MISOMIP": -0.9 + $MOM6_DOMAIN_TYPE == "REGIONAL": -0.9 else: -0.95 DEPTH_MIN_DYN_PSURF: description: | @@ -1468,6 +1505,7 @@ Global: units: Pa value: $OCN_GRID == "tx0.25v1": 0.0 + $MOM6_DOMAIN_TYPE == "REGIONAL": 0.0 KHTH: description: | "[m2 s-1] default = 0.0 @@ -1507,6 +1545,7 @@ Global: units: nondimensional value: $OCN_GRID == "tx0.25v1": 0.1 + $MOM6_DOMAIN_TYPE == "REGIONAL": 0.1 STOCH_EOS: description: "[Boolean] default = False @@ -1608,6 +1647,7 @@ Global: value: $OCN_GRID == "tx2_3v2": 1.0 $OCN_GRID == "tx0.25v1": 1.0 + $MOM6_DOMAIN_TYPE == "REGIONAL": 1.0 MLE_FRONT_LENGTH: description: | "[m] default = 0.0 @@ -1620,6 +1660,7 @@ Global: value: $OCN_GRID == "tx2_3v2": 1000.0 $OCN_GRID == "tx0.25v1": 500.0 + $MOM6_DOMAIN_TYPE == "REGIONAL": 1500.0 MLE_FRONT_LENGTH_FROM_FILE: description: | "[Boolean] default = False @@ -1640,6 +1681,7 @@ Global: value: $OCN_GRID == "tx2_3v2": 3.45600E+05 $OCN_GRID == "tx0.25v1": 2.592E+06 + $MOM6_DOMAIN_TYPE == "REGIONAL": 2.592E+06 USE_STANLEY_ML: description: | "[Boolean] default = False @@ -1659,6 +1701,7 @@ Global: units: Boolean value: $OCN_GRID == "tx2_3v2": True + $MOM6_DOMAIN_TYPE == "REGIONAL": True BBL_MIXING_AS_MAX: description: | "[Boolean] default = True @@ -1670,6 +1713,7 @@ Global: value: $OCN_GRID == "tx2_3v2": False $OCN_GRID == "tx0.25v1": False + $MOM6_DOMAIN_TYPE == "REGIONAL": False USE_LOTW_BBL_DIFFUSIVITY: description: | "[Boolean] default = False @@ -1714,6 +1758,7 @@ Global: $OCN_GRID == "tx2_3v2": 1.0E-07 $OCN_GRID == "tx0.25v1": 1.5E-05 $OCN_GRID == "MISOMIP": 5.0E-05 + $MOM6_DOMAIN_TYPE == "REGIONAL": 1.0E-06 else: 2.0E-05 KDML: description: | @@ -1745,6 +1790,7 @@ Global: units: m2 s-1 value: $OCN_GRID == "tx2_3v2": 1.0E-07 + $MOM6_DOMAIN_TYPE == "REGIONAL": 2.0E-07 else: 2.0E-06 INT_TIDE_DECAY_SCALE: description: | @@ -1780,6 +1826,7 @@ Global: units: nondim value: $OCN_GRID == "tx0.25v1": 0.0018 + $MOM6_DOMAIN_TYPE == "REGIONAL": 0.0018 USE_RIGID_SEA_ICE: description: | "[Boolean] default = False @@ -1789,6 +1836,7 @@ Global: units: Boolean value: $OCN_GRID == "tx0.25v1": True + $MOM6_DOMAIN_TYPE == "REGIONAL": True SEA_ICE_RIGID_MASS: description: | "[kg m-2] default = 1000.0 @@ -1798,6 +1846,7 @@ Global: units: kg m-2 value: $OCN_GRID == "tx0.25v1": 100.0 + $MOM6_DOMAIN_TYPE == "REGIONAL": 100.0 H2_FILE: description: | "The path to the file containing the sub-grid-scale @@ -1814,6 +1863,7 @@ Global: units: Boolean value: $OCN_GRID == "tx2_3v2": True + $MOM6_DOMAIN_TYPE == "REGIONAL": True USE_CVMix_TIDAL: description: | "[Boolean] default = False @@ -1868,6 +1918,7 @@ Global: units: Boolean value: $OCN_GRID == "tx2_3v2": True + $MOM6_DOMAIN_TYPE == "REGIONAL": True NU_ZERO: description: | "[m2 s-1] default = 0.005 @@ -1894,6 +1945,7 @@ Global: units: nondim value: $OCN_GRID == "tx2_3v2": 1 + $MOM6_DOMAIN_TYPE == "REGIONAL": 1 USE_CVMIX_DDIFF: description: | "[Boolean] default = False @@ -1904,6 +1956,7 @@ Global: units: Boolean value: $OCN_GRID == "tx2_3v2": True + $MOM6_DOMAIN_TYPE == "REGIONAL": True MAX_ENT_IT: description: | "default = 5 @@ -1943,6 +1996,7 @@ Global: units: Boolean value: $OCN_GRID == "tx2_3v2": True + $MOM6_DOMAIN_TYPE == "REGIONAL": True MSTAR_MODE: description: | "[units=nondim] default = 0 @@ -2195,6 +2249,7 @@ Global: value: $OCN_GRID == "tx2_3v2": '"PPM:H3"' $OCN_GRID == "tx0.25v1": '"PPM:H3"' + $MOM6_DOMAIN_TYPE == "REGIONAL": '"PPM:H3"' KHTR_USE_EBT_STRUCT: description: | "[Boolean] default = False @@ -2248,6 +2303,7 @@ Global: value: $OCN_GRID == "tx2_3v2": True $OCN_GRID == "tx0.25v1": True + $MOM6_DOMAIN_TYPE == "REGIONAL": True MAX_TR_DIFFUSION_CFL: description: | "[nondim] default = -1.0 @@ -2401,6 +2457,7 @@ Global: $OCN_GRID == "tx2_3v2": 1.0 $OCN_GRID == "tx0.25v1": 0.25 $OCN_GRID == "MISOMIP": 1.0 + $MOM6_DOMAIN_TYPE == "REGIONAL": 1.0 ENERGETICS_SFC_PBL: description: | "[Boolean] default = False @@ -2721,6 +2778,7 @@ Global: value: $OCN_GRID == "tx0.25v1": 0.06 $OCN_GRID == "MISOMIP": 0.06 + $MOM6_DOMAIN_TYPE == "REGIONAL": 0.015 USE_JACKSON_PARAM: description: | "[Boolean] default = False @@ -2758,6 +2816,7 @@ Global: units: Boolean value: $OCN_GRID == "tx0.25v1": True + $MOM6_DOMAIN_TYPE == "REGIONAL": True BAD_VAL_SSH_MAX: description: | "[m] default = 20.0 @@ -2767,6 +2826,7 @@ Global: units: m value: $OCN_GRID == "tx0.25v1": 50.0 # TODO + $MOM6_DOMAIN_TYPE == "REGIONAL": 50.0 BAD_VAL_SSS_MAX: description: | "default = 45.0 @@ -2785,6 +2845,7 @@ Global: units: deg C value: $OCN_GRID == "tx0.25v1": 65.0 + $MOM6_DOMAIN_TYPE == "REGIONAL": 65.0 BAD_VAL_SST_MIN: description: | "default = -2.1 @@ -2795,6 +2856,7 @@ Global: value: $OCN_GRID == "tx2_3v2": -3.0 $OCN_GRID == "tx0.25v1": -3.0 + $MOM6_DOMAIN_TYPE == "REGIONAL": -3.0 DEFAULT_ANSWER_DATE: description: | "[Boolean] default = True @@ -2843,6 +2905,7 @@ Global: value: $OCN_GRID == "tx2_3v2": True $OCN_GRID == "tx0.25v1": True + $MOM6_DOMAIN_TYPE == "REGIONAL": True else: False PARALLEL_RESTARTFILES: description: | @@ -2853,6 +2916,7 @@ Global: units: Boolean value: $OCN_GRID == "tx0.25v1": True + $MOM6_DOMAIN_TYPE == "REGIONAL": True FPMIX: description: | "[Boolean] default = False @@ -2891,6 +2955,7 @@ Global: units: Boolean value: $OCN_GRID == "MISOMIP": False + $MOM6_DOMAIN_TYPE == "REGIONAL": False RHO_0: description: | "[kg m-3] default = 1035.0 @@ -3133,6 +3198,7 @@ Global: units: m value: $OCN_GRID == "MISOMIP": 1.0E-12 + $MOM6_DOMAIN_TYPE == "REGIONAL": 1.0E-06 HYCOM1_ONLY_IMPROVES: description: | "[Boolean] default = False @@ -3290,6 +3356,7 @@ Global: units: m2 s-1 value: $OCN_GRID == "tx2_3v2": 1.0E-06 + $MOM6_DOMAIN_TYPE == "REGIONAL": 1.0E-06 else: 1.0E-04 KV_BBL_MIN: description: | @@ -3346,6 +3413,7 @@ Global: units: Boolean value: $OCN_GRID == "MISOMIP": True + $MOM6_DOMAIN_TYPE == "REGIONAL": True HARMONIC_BL_SCALE: description: | "[nondim] default = 0.0 @@ -3367,6 +3435,7 @@ Global: value: $OCN_GRID == "MISOMIP": True $OCN_GRID == "tx0.25v1": True + $MOM6_DOMAIN_TYPE == "REGIONAL": True CORRECT_DENSITY: description: | "[Boolean] default = True @@ -3387,6 +3456,7 @@ Global: units: nondim value: $OCN_GRID == "MISOMIP": 0.0 + $MOM6_DOMAIN_TYPE == "REGIONAL" : 0.0 IGNORE_FLUXES_OVER_LAND: description: | "[Boolean] default = False @@ -3577,6 +3647,7 @@ Global: units: Boolean value: $OCN_GRID == "MISOMIP": False + $MOM6_DOMAIN_TYPE == "REGIONAL": False DATE_STAMPED_STDOUT: description: | "[Boolean] default = True @@ -3605,11 +3676,17 @@ Global: else: "PPM_CW" MLE_USE_PBL_MLD: description: | - "TODO" + "TODO + + [Boolean] default = False + If true, the MLE parameterization will use the mixed-layer depth provided by + the active PBL parameterization. If false, MLE will estimate a MLD based on a + density difference with the surface using the parameter MLE_DENSITY_DIFF." datatype: logical value: $OCN_GRID == "tx0.25v1": True $OCN_GRID == "MISOMIP": True + $MOM6_DOMAIN_TYPE == "REGIONAL": True EPBL_IS_ADDITIVE: description: | "[Boolean] default = True @@ -3620,6 +3697,7 @@ Global: units: Boolean value: $OCN_GRID == "tx0.25v1": False + $MOM6_DOMAIN_TYPE == "REGIONAL": False GEOTHERMAL_SCALE: description: | "[W m-2 or various] default = 0.0 @@ -3809,6 +3887,173 @@ Global: datatype: real value: $OCN_GRID == "tx2_3v2": 0.75 + OBC_FREESLIP_VORTICITY: + description: | + "[Boolean] default = True + If true, sets the normal gradient of tangential velocity to zero in the + relative vorticity on open boundaries. This cannot be true if another + OBC_XXX_VORTICITY option is True. + " + datatype: logical + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": False + OBC_COMPUTED_VORTICITY: + description: | + "[Boolean] default = False + If true, uses the external values of tangential velocity in the relative + vorticity on open boundaries. This cannot be true if another OBC_XXX_VORTICITY + option is True. + " + datatype: logical + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": True + OBC_FREESLIP_STRAIN: + description: | + "[Boolean] default = True + If true, sets the normal gradient of tangential velocity to zero in the strain + use in the stress tensor on open boundaries. This cannot be true if another + OBC_XXX_STRAIN option is True. + " + datatype: logical + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": False + OBC_COMPUTED_STRAIN: + description: | + "[Boolean] default = False + If true, sets the normal gradient of tangential velocity to zero in the strain + use in the stress tensor on open boundaries. This cannot be true if another + OBC_XXX_STRAIN option is True. + " + datatype: logical + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": True + OBC_ZERO_BIHARMONIC: + description: | + "[Boolean] default = False + If true, zeros the Laplacian of flow on open boundaries in the biharmonic + viscosity term. + " + datatype: logical + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": True + OBC_RAMP_TIMESCALE: + description: | + "[days] default = 1.0 + If RAMP_OBCS is true, this sets the ramping timescale. + " + datatype: real + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": 2.0 + OBC_TRACER_RESERVOIR_LENGTH_SCALE_OUT: + description: | + "[m] default = 0.0 + An effective length scale for restoring the tracer concentration at the + boundaries to externally imposed values when the flow is exiting the domain. + " + datatype: real + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": 9000.0 + OBC_TRACER_RESERVOIR_LENGTH_SCALE_IN: + description: | + "[m] default = 0.0 + An effective length scale for restoring the tracer concentration at the + boundaries to values from the interior when the flow is entering the domain. + " + datatype: real + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": 9000.0 + OBC_TIDE_ADD_EQ_PHASE: + description: | + "[Boolean] default = False + If true, add the equilibrium phase argument to the specified tidal phases. + " + datatype: logical + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": True + OBC_TIDE_ADD_NODAL: + description: | + "[Boolean] default = False + If true, include 18.6 year nodal modulation in the boundary tidal forcing. + " + datatype: logical + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": True + DEPRESS_INITIAL_SURFACE: + description: | + "[Boolean] default = False + If true, depress the initial surface to avoid huge tsunamis when a large + surface pressure is applied. + " + datatype: logical + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": True + CHANNEL_DRAG_MAX_BBL_THICK: + description: | + "[m] default = -1.0 + The maximum bottom boundary layer thickness over which the channel drag is + exerted, or a negative value for no fixed limit, instead basing the BBL + thickness on the bottom stress, rotation and stratification. The default is + proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. + " + datatype: real + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": 5.0 + DIRECT_STRESS: + description: | + "[Boolean] default = False + If true, the wind stress is distributed over the topmost HMIX_STRESS of fluid + (like in HYCOM), and an added mixed layer viscosity or a physically based + boundary layer turbulence parameterization is not needed for stability. + " + datatype: logical + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": True + SADOURNY: + description: | + "[Boolean] default = True + If true, the Coriolis terms are discretized with the Sadourny (1975) energy + conserving scheme, otherwise the Arakawa & Hsu scheme is used. If the + internal deformation radius is not resolved, the Sadourny scheme should + probably be used. + " + datatype: logical + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": False + BT_STRONG_DRAG: + description: | + "[Boolean] default = False + If true, use a stronger estimate of the retarding effects of strong bottom + drag, by making it implicit with the barotropic time-step instead of implicit + with the baroclinic time-step and dividing by the number of barotropic steps. + " + datatype: logical + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": True + LINEARIZED_BT_CORIOLIS: + description: | + "[Boolean] default = True + If true use the bottom depth instead of the total water column thickness in + the barotropic Coriolis term calculations. + " + datatype: logical + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": False + LATENT_HEAT_FUSION: + description: | + "[J/kg] default = 3.337E+05 + The latent heat of fusion. + " + datatype: real + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": 3.34E+05 + LATENT_HEAT_VAPORIZATION: + description: | + "[J/kg] default = 2.501E+06 + The latent heat of fusion. + " + datatype: real + value: + $MOM6_DOMAIN_TYPE == "REGIONAL": 2.5E+06 CVMix_CONVECTION: BV_SQR_CONV: description: | @@ -3828,6 +4073,7 @@ KPP: datatype: integer value: $OCN_GRID == "tx2_3v2": 3 + $MOM6_DOMAIN_TYPE == "REGIONAL": 3 MATCH_TECHNIQUE: description: | "default = 'SimpleShapes' @@ -3840,6 +4086,7 @@ KPP: datatype: string value: $OCN_GRID == "tx2_3v2": "MatchGradient" + $MOM6_DOMAIN_TYPE == "REGIONAL": "MatchGradient" INTERP_TYPE2: description: | "Type of interpolation to compute diff and visc at OBL_depth @@ -3856,6 +4103,7 @@ KPP: units: Boolean value: $OCN_GRID == "tx2_3v2": False + $MOM6_DOMAIN_TYPE == "REGIONAL": False USE_KPP_LT_K: description: | default = False diff --git a/param_templates/json/MOM_input.json b/param_templates/json/MOM_input.json index 4958db0..2965238 100644 --- a/param_templates/json/MOM_input.json +++ b/param_templates/json/MOM_input.json @@ -58,7 +58,16 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": false + "$OCN_GRID == \"tx2_3v2\"": false, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": false + } + }, + "DIABATIC_FIRST": { + "description": "\"[Boolean] default = False\nIf true, apply diabatic and thermodynamic processes,\nincluding buoyancy forcing and mass gain or loss,\nbefore stepping the dynamics forward.\"\n", + "datatype": "logical", + "units": "Boolean", + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true } }, "HREF_FOR_MLD": { @@ -159,7 +168,8 @@ "value": { "$OCN_GRID == \"tx2_3v2\"": 3992.0, "$OCN_GRID == \"tx0.25v1\"": 3992.0, - "$OCN_GRID == \"MISOMIP\"": 3974.0 + "$OCN_GRID == \"MISOMIP\"": 3974.0, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 3992.0 } }, "USE_PSURF_IN_EOS": { @@ -174,7 +184,8 @@ "units": "Boolean", "value": { "$OCN_GRID == \"tx2_3v2\"": true, - "$OCN_GRID == \"tx0.25v1\"": true + "$OCN_GRID == \"tx0.25v1\"": true, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true } }, "SAVE_INITIAL_CONDS": { @@ -207,7 +218,8 @@ "value": { "$OCN_GRID == \"tx2_3v2\"": -7.75e-08, "$OCN_GRID == \"tx0.25v1\"": -7.75e-08, - "$OCN_GRID == \"MISOMIP\"": -7.53e-08 + "$OCN_GRID == \"MISOMIP\"": -7.53e-08, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": -7.75e-08 } }, "USE_IDEAL_AGE_TRACER": { @@ -380,7 +392,8 @@ "datatype": "string", "value": { "$OCN_GRID == \"tx0.25v1\"": "file", - "$OCN_GRID == \"MISOMIP\"": "linear" + "$OCN_GRID == \"MISOMIP\"": "linear", + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": "ALE" } }, "REMAP_UV_USING_OLD_ALG": { @@ -490,7 +503,10 @@ "REMAPPING_SCHEME": { "description": "\"default = 'PLM'\nThis sets the reconstruction scheme used\nfor vertical remapping for all variables.\nIt can be one of the following schemes:\nPCM (1st-order accurate)\nPLM (2nd-order accurate)\nPPM_H4 (3rd-order accurate)\nPPM_IH4 (3rd-order accurate)\nPQM_IH4IH3 (4th-order accurate)\nPQM_IH6IH5 (5th-order accurate)\"\n", "datatype": "string", - "value": "PPM_CW" + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": "PPM_H4", + "else": "PPM_CW" + } }, "REMAP_VEL_CONSERVE_KE": { "description": "\"[Boolean] default = False\nIf true, a correction is applied to the baroclinic component of velocity after\nremapping so that total KE is conserved. KE may not be conserved when\n(CS%BBL_h_vel_mask > 0.0) .and. (CS%h_vel_mask > 0.0)\"\n", @@ -560,7 +576,8 @@ "units": "Boolean", "value": { "$OCN_GRID == \"tx2_3v2\"": true, - "$OCN_GRID == \"tx0.25v1\"": true + "$OCN_GRID == \"tx0.25v1\"": true, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true } }, "RESOLN_SCALED_KH": { @@ -642,7 +659,8 @@ "units": "Boolean", "value": { "$OCN_GRID == \"tx2_3v2\"": true, - "$OCN_GRID == \"tx0.25v1\"": true + "$OCN_GRID == \"tx0.25v1\"": true, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true } }, "USE_STANLEY_ISO": { @@ -725,7 +743,8 @@ "value": { "$MOM6_VERTICAL_GRID in [\"zstar_65L\", \"zstar_75L\"]": "Z*", "$MOM6_VERTICAL_GRID == \"hycom1\"": "HYCOM1", - "$MOM6_VERTICAL_GRID == \"sigma_shelf_zstar\"": "SIGMA_SHELF_ZSTAR" + "$MOM6_VERTICAL_GRID == \"sigma_shelf_zstar\"": "SIGMA_SHELF_ZSTAR", + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": "Z*" } }, "ALE_COORDINATE_CONFIG": { @@ -860,7 +879,8 @@ "units": "m s-1", "value": { "$OCN_GRID == \"tx0.25v1\"": 0.01, - "$OCN_GRID == \"MISOMIP\"": 0.001 + "$OCN_GRID == \"MISOMIP\"": 0.001, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 0.01 } }, "USE_LEITHY": { @@ -913,6 +933,7 @@ "units": "m", "value": { "$OCN_GRID == \"MISOMIP\"": 20.0, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 0.9, "else": 0.5 } }, @@ -937,7 +958,8 @@ "units": "nondim", "value": { "$OCN_GRID == \"tx2_3v2\"": 1.0, - "$OCN_GRID == \"tx0.25v1\"": 1.25 + "$OCN_GRID == \"tx0.25v1\"": 1.25, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 1.25 } }, "U_TRUNC_FILE": { @@ -1057,7 +1079,16 @@ "units": "Boolean", "value": { "$OCN_GRID == \"tx2_3v2\"": true, - "$OCN_GRID == \"tx0.25v1\"": true + "$OCN_GRID == \"tx0.25v1\"": true, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true + } + }, + "BT_NONLIN_STRESS": { + "description": "\"[Boolean] default = False\nIf true, use the full depth of the ocean at the start of the barotropic step\nwhen calculating the surface stress contribution to the barotropic\nacclerations. Otherwise use the depth based on bathyT.\"\n", + "datatype": "logical", + "units": "Boolean", + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true } }, "BT_THICK_SCHEME": { @@ -1088,6 +1119,7 @@ "value": { "$OCN_GRID == \"tx0.25v1\"": -0.9, "$OCN_GRID == \"MISOMIP\"": -0.9, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": -0.9, "else": -0.95 } }, @@ -1104,7 +1136,8 @@ "datatype": "real", "units": "Pa", "value": { - "$OCN_GRID == \"tx0.25v1\"": 0.0 + "$OCN_GRID == \"tx0.25v1\"": 0.0, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 0.0 } }, "KHTH": { @@ -1137,7 +1170,8 @@ "datatype": "real", "units": "nondimensional", "value": { - "$OCN_GRID == \"tx0.25v1\"": 0.1 + "$OCN_GRID == \"tx0.25v1\"": 0.1, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 0.1 } }, "STOCH_EOS": { @@ -1219,7 +1253,8 @@ "units": "nondim", "value": { "$OCN_GRID == \"tx2_3v2\"": 1.0, - "$OCN_GRID == \"tx0.25v1\"": 1.0 + "$OCN_GRID == \"tx0.25v1\"": 1.0, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 1.0 } }, "MLE_FRONT_LENGTH": { @@ -1228,7 +1263,8 @@ "units": "m", "value": { "$OCN_GRID == \"tx2_3v2\"": 1000.0, - "$OCN_GRID == \"tx0.25v1\"": 500.0 + "$OCN_GRID == \"tx0.25v1\"": 500.0, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 1500.0 } }, "MLE_FRONT_LENGTH_FROM_FILE": { @@ -1245,7 +1281,8 @@ "units": "s", "value": { "$OCN_GRID == \"tx2_3v2\"": 345600.0, - "$OCN_GRID == \"tx0.25v1\"": 2592000.0 + "$OCN_GRID == \"tx0.25v1\"": 2592000.0, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 2592000.0 } }, "USE_STANLEY_ML": { @@ -1261,7 +1298,8 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID == \"tx2_3v2\"": true, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true } }, "BBL_MIXING_AS_MAX": { @@ -1270,7 +1308,8 @@ "units": "Boolean", "value": { "$OCN_GRID == \"tx2_3v2\"": false, - "$OCN_GRID == \"tx0.25v1\"": false + "$OCN_GRID == \"tx0.25v1\"": false, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": false } }, "USE_LOTW_BBL_DIFFUSIVITY": { @@ -1308,6 +1347,7 @@ "$OCN_GRID == \"tx2_3v2\"": 1e-07, "$OCN_GRID == \"tx0.25v1\"": 1.5e-05, "$OCN_GRID == \"MISOMIP\"": 5e-05, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 1e-06, "else": 2e-05 } }, @@ -1333,6 +1373,7 @@ "units": "m2 s-1", "value": { "$OCN_GRID == \"tx2_3v2\"": 1e-07, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 2e-07, "else": 2e-06 } }, @@ -1364,7 +1405,8 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx0.25v1\"": 0.0018 + "$OCN_GRID == \"tx0.25v1\"": 0.0018, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 0.0018 } }, "USE_RIGID_SEA_ICE": { @@ -1372,7 +1414,8 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx0.25v1\"": true + "$OCN_GRID == \"tx0.25v1\"": true, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true } }, "SEA_ICE_RIGID_MASS": { @@ -1380,7 +1423,8 @@ "datatype": "real", "units": "kg m-2", "value": { - "$OCN_GRID == \"tx0.25v1\"": 100.0 + "$OCN_GRID == \"tx0.25v1\"": 100.0, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 100.0 } }, "H2_FILE": { @@ -1395,7 +1439,8 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID == \"tx2_3v2\"": true, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true } }, "USE_CVMix_TIDAL": { @@ -1441,7 +1486,8 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID == \"tx2_3v2\"": true, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true } }, "NU_ZERO": { @@ -1465,7 +1511,8 @@ "datatype": "integer", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 1 + "$OCN_GRID == \"tx2_3v2\"": 1, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 1 } }, "USE_CVMIX_DDIFF": { @@ -1473,7 +1520,8 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID == \"tx2_3v2\"": true, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true } }, "MAX_ENT_IT": { @@ -1508,7 +1556,8 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID == \"tx2_3v2\"": true, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true } }, "MSTAR_MODE": { @@ -1723,7 +1772,8 @@ "datatype": "string", "value": { "$OCN_GRID == \"tx2_3v2\"": "\"PPM:H3\"", - "$OCN_GRID == \"tx0.25v1\"": "\"PPM:H3\"" + "$OCN_GRID == \"tx0.25v1\"": "\"PPM:H3\"", + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": "\"PPM:H3\"" } }, "KHTR_USE_EBT_STRUCT": { @@ -1770,7 +1820,8 @@ "units": "Boolean", "value": { "$OCN_GRID == \"tx2_3v2\"": true, - "$OCN_GRID == \"tx0.25v1\"": true + "$OCN_GRID == \"tx0.25v1\"": true, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true } }, "MAX_TR_DIFFUSION_CFL": { @@ -1894,7 +1945,8 @@ "value": { "$OCN_GRID == \"tx2_3v2\"": 1.0, "$OCN_GRID == \"tx0.25v1\"": 0.25, - "$OCN_GRID == \"MISOMIP\"": 1.0 + "$OCN_GRID == \"MISOMIP\"": 1.0, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 1.0 } }, "ENERGETICS_SFC_PBL": { @@ -2163,7 +2215,8 @@ "units": "nondim", "value": { "$OCN_GRID == \"tx0.25v1\"": 0.06, - "$OCN_GRID == \"MISOMIP\"": 0.06 + "$OCN_GRID == \"MISOMIP\"": 0.06, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 0.015 } }, "USE_JACKSON_PARAM": { @@ -2192,7 +2245,8 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx0.25v1\"": true + "$OCN_GRID == \"tx0.25v1\"": true, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true } }, "BAD_VAL_SSH_MAX": { @@ -2200,7 +2254,8 @@ "datatype": "real", "units": "m", "value": { - "$OCN_GRID == \"tx0.25v1\"": 50.0 + "$OCN_GRID == \"tx0.25v1\"": 50.0, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 50.0 } }, "BAD_VAL_SSS_MAX": { @@ -2216,7 +2271,8 @@ "datatype": "real", "units": "deg C", "value": { - "$OCN_GRID == \"tx0.25v1\"": 65.0 + "$OCN_GRID == \"tx0.25v1\"": 65.0, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 65.0 } }, "BAD_VAL_SST_MIN": { @@ -2225,7 +2281,8 @@ "units": "degC", "value": { "$OCN_GRID == \"tx2_3v2\"": -3.0, - "$OCN_GRID == \"tx0.25v1\"": -3.0 + "$OCN_GRID == \"tx0.25v1\"": -3.0, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": -3.0 } }, "DEFAULT_ANSWER_DATE": { @@ -2265,6 +2322,7 @@ "value": { "$OCN_GRID == \"tx2_3v2\"": true, "$OCN_GRID == \"tx0.25v1\"": true, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true, "else": false } }, @@ -2273,7 +2331,8 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx0.25v1\"": true + "$OCN_GRID == \"tx0.25v1\"": true, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true } }, "FPMIX": { @@ -2303,7 +2362,8 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"MISOMIP\"": false + "$OCN_GRID == \"MISOMIP\"": false, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": false } }, "RHO_0": { @@ -2504,7 +2564,8 @@ "datatype": "real", "units": "m", "value": { - "$OCN_GRID == \"MISOMIP\"": 1e-12 + "$OCN_GRID == \"MISOMIP\"": 1e-12, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 1e-06 } }, "HYCOM1_ONLY_IMPROVES": { @@ -2643,6 +2704,7 @@ "units": "m2 s-1", "value": { "$OCN_GRID == \"tx2_3v2\"": 1e-06, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 1e-06, "else": 0.0001 } }, @@ -2683,7 +2745,8 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"MISOMIP\"": true + "$OCN_GRID == \"MISOMIP\"": true, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true } }, "HARMONIC_BL_SCALE": { @@ -2700,7 +2763,8 @@ "units": "Boolean", "value": { "$OCN_GRID == \"MISOMIP\"": true, - "$OCN_GRID == \"tx0.25v1\"": true + "$OCN_GRID == \"tx0.25v1\"": true, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true } }, "CORRECT_DENSITY": { @@ -2716,7 +2780,8 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"MISOMIP\"": 0.0 + "$OCN_GRID == \"MISOMIP\"": 0.0, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 0.0 } }, "IGNORE_FLUXES_OVER_LAND": { @@ -2898,7 +2963,8 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"MISOMIP\"": false + "$OCN_GRID == \"MISOMIP\"": false, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": false } }, "DATE_STAMPED_STDOUT": { @@ -2926,11 +2992,12 @@ } }, "MLE_USE_PBL_MLD": { - "description": "\"TODO\"\n", + "description": "\"TODO\n\n[Boolean] default = False\nIf true, the MLE parameterization will use the mixed-layer depth provided by\nthe active PBL parameterization. If false, MLE will estimate a MLD based on a\ndensity difference with the surface using the parameter MLE_DENSITY_DIFF.\"\n", "datatype": "logical", "value": { "$OCN_GRID == \"tx0.25v1\"": true, - "$OCN_GRID == \"MISOMIP\"": true + "$OCN_GRID == \"MISOMIP\"": true, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true } }, "EPBL_IS_ADDITIVE": { @@ -2938,7 +3005,8 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx0.25v1\"": false + "$OCN_GRID == \"tx0.25v1\"": false, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": false } }, "GEOTHERMAL_SCALE": { @@ -3099,10 +3167,130 @@ } }, "SKEB_GM_COEF": { - "description": "\"[nondim] default = 0.0\nFraction of GM work that is added to backscatter rate.\"\n", + "description": "\"[Boolean] default = True\n If true, sets the normal gradient of tangential velocity to zero in the\n relative vorticity on open boundaries. This cannot be true if another\n OBC_XXX_VORTICITY option is True.\n\"\n", + "datatype": "logical", + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": false + }, + "OBC_FREESLIP_VORTICITY": null + }, + "OBC_COMPUTED_VORTICITY": { + "description": "\"[Boolean] default = False\n If true, uses the external values of tangential velocity in the relative\n vorticity on open boundaries. This cannot be true if another OBC_XXX_VORTICITY\n option is True.\n\"\n", + "datatype": "logical", + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true + } + }, + "OBC_FREESLIP_STRAIN": { + "description": "\"[Boolean] default = True\n If true, sets the normal gradient of tangential velocity to zero in the strain\n use in the stress tensor on open boundaries. This cannot be true if another\n OBC_XXX_STRAIN option is True.\n\"\n", + "datatype": "logical", + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": false + } + }, + "OBC_COMPUTED_STRAIN": { + "description": "\"[Boolean] default = False\n If true, sets the normal gradient of tangential velocity to zero in the strain\n use in the stress tensor on open boundaries. This cannot be true if another\n OBC_XXX_STRAIN option is True.\n\"\n", + "datatype": "logical", + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true + } + }, + "OBC_ZERO_BIHARMONIC": { + "description": "\"[Boolean] default = False\n If true, zeros the Laplacian of flow on open boundaries in the biharmonic\n viscosity term.\n\"\n", + "datatype": "logical", + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true + } + }, + "OBC_RAMP_TIMESCALE": { + "description": "\"[days] default = 1.0\n If RAMP_OBCS is true, this sets the ramping timescale.\n\"\n", "datatype": "real", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.75 + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 2.0 + } + }, + "OBC_TRACER_RESERVOIR_LENGTH_SCALE_OUT": { + "description": "\"[m] default = 0.0\nAn effective length scale for restoring the tracer concentration at the\nboundaries to externally imposed values when the flow is exiting the domain.\n\"\n", + "datatype": "real", + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 9000.0 + } + }, + "OBC_TRACER_RESERVOIR_LENGTH_SCALE_IN": { + "description": "\"[m] default = 0.0\nAn effective length scale for restoring the tracer concentration at the\nboundaries to values from the interior when the flow is entering the domain.\n\"\n", + "datatype": "real", + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 9000.0 + } + }, + "OBC_TIDE_ADD_EQ_PHASE": { + "description": "\"[Boolean] default = False\n If true, add the equilibrium phase argument to the specified tidal phases.\n\"\n", + "datatype": "logical", + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true + } + }, + "OBC_TIDE_ADD_NODAL": { + "description": "\"[Boolean] default = False\n If true, include 18.6 year nodal modulation in the boundary tidal forcing.\n\"\n", + "datatype": "logical", + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true + } + }, + "DEPRESS_INITIAL_SURFACE": { + "description": "\"[Boolean] default = False\n If true, depress the initial surface to avoid huge tsunamis when a large\n surface pressure is applied.\n\"\n", + "datatype": "logical", + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true + } + }, + "CHANNEL_DRAG_MAX_BBL_THICK": { + "description": "\"[m] default = -1.0\n The maximum bottom boundary layer thickness over which the channel drag is\n exerted, or a negative value for no fixed limit, instead basing the BBL\n thickness on the bottom stress, rotation and stratification. The default is\n proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true.\n\"\n", + "datatype": "real", + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 5.0 + } + }, + "DIRECT_STRESS": { + "description": "\"[Boolean] default = False\nIf true, the wind stress is distributed over the topmost HMIX_STRESS of fluid\n(like in HYCOM), and an added mixed layer viscosity or a physically based\nboundary layer turbulence parameterization is not needed for stability.\n\"\n", + "datatype": "logical", + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true + } + }, + "SADOURNY": { + "description": "\"[Boolean] default = True\n If true, the Coriolis terms are discretized with the Sadourny (1975) energy\n conserving scheme, otherwise the Arakawa & Hsu scheme is used. If the\n internal deformation radius is not resolved, the Sadourny scheme should\n probably be used.\n\"\n", + "datatype": "logical", + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": false + } + }, + "BT_STRONG_DRAG": { + "description": "\"[Boolean] default = False\n If true, use a stronger estimate of the retarding effects of strong bottom\n drag, by making it implicit with the barotropic time-step instead of implicit\n with the baroclinic time-step and dividing by the number of barotropic steps.\n\"\n", + "datatype": "logical", + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": true + } + }, + "LINEARIZED_BT_CORIOLIS": { + "description": "\"[Boolean] default = True\nIf true use the bottom depth instead of the total water column thickness in\nthe barotropic Coriolis term calculations.\n\"\n", + "datatype": "logical", + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": false + } + }, + "LATENT_HEAT_FUSION": { + "description": "\"[J/kg] default = 3.337E+05\n The latent heat of fusion.\n\"\n", + "datatype": "real", + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 334000.0 + } + }, + "LATENT_HEAT_VAPORIZATION": { + "description": "\"[J/kg] default = 2.501E+06\nThe latent heat of fusion.\n\"\n", + "datatype": "real", + "value": { + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 2500000.0 } } }, @@ -3121,14 +3309,16 @@ "description": "\"default = 0\nThe number of times the 1-1-4-1-1 Laplacian filter is applied on\nOBL depth purely for diagnostic purposes.\"\n", "datatype": "integer", "value": { - "$OCN_GRID == \"tx2_3v2\"": 3 + "$OCN_GRID == \"tx2_3v2\"": 3, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 3 } }, "MATCH_TECHNIQUE": { "description": "\"default = 'SimpleShapes'\nCVMix method to set profile function for diffusivity and NLT,\nas well as matching across OBL base. Allowed values are:\nSimpleShapes = sigma*(1-sigma)^2 for both diffusivity and NLT\nMatchGradient = sigma*(1-sigma)^2 for NLT; diffusivity profile from matching\nMatchBoth = match gradient for both diffusivity and NLT\nParabolicNonLocal = sigma*(1-sigma)^2 for diffusivity; (1-sigma)^2 for NLT\"\n", "datatype": "string", "value": { - "$OCN_GRID == \"tx2_3v2\"": "MatchGradient" + "$OCN_GRID == \"tx2_3v2\"": "MatchGradient", + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": "MatchGradient" } }, "INTERP_TYPE2": { @@ -3143,7 +3333,8 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": false + "$OCN_GRID == \"tx2_3v2\"": false, + "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": false } }, "USE_KPP_LT_K": { From bd7a2b1cfad3d9b972210bd4d0ad4ac03620a2f0 Mon Sep 17 00:00:00 2001 From: manishvenu Date: Wed, 25 Mar 2026 14:33:41 -0600 Subject: [PATCH 04/23] Fix formatting --- param_templates/MOM_input.yaml | 2 +- param_templates/json/MOM_input.json | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/param_templates/MOM_input.yaml b/param_templates/MOM_input.yaml index f5cd3fd..af1d316 100644 --- a/param_templates/MOM_input.yaml +++ b/param_templates/MOM_input.yaml @@ -3887,7 +3887,7 @@ Global: datatype: real value: $OCN_GRID == "tx2_3v2": 0.75 - OBC_FREESLIP_VORTICITY: + OBC_FREESLIP_VORTICITY: description: | "[Boolean] default = True If true, sets the normal gradient of tangential velocity to zero in the diff --git a/param_templates/json/MOM_input.json b/param_templates/json/MOM_input.json index 2965238..56d4ff2 100644 --- a/param_templates/json/MOM_input.json +++ b/param_templates/json/MOM_input.json @@ -3167,12 +3167,18 @@ } }, "SKEB_GM_COEF": { + "description": "\"[nondim] default = 0.0\nFraction of GM work that is added to backscatter rate.\"\n", + "datatype": "real", + "value": { + "$OCN_GRID == \"tx2_3v2\"": 0.75 + } + }, + "OBC_FREESLIP_VORTICITY": { "description": "\"[Boolean] default = True\n If true, sets the normal gradient of tangential velocity to zero in the\n relative vorticity on open boundaries. This cannot be true if another\n OBC_XXX_VORTICITY option is True.\n\"\n", "datatype": "logical", "value": { "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": false - }, - "OBC_FREESLIP_VORTICITY": null + } }, "OBC_COMPUTED_VORTICITY": { "description": "\"[Boolean] default = False\n If true, uses the external values of tangential velocity in the relative\n vorticity on open boundaries. This cannot be true if another OBC_XXX_VORTICITY\n option is True.\n\"\n", From 3a86a5006e3b4681a19b7fd053b3f5534ded2f29 Mon Sep 17 00:00:00 2001 From: manishvenu Date: Mon, 30 Mar 2026 13:52:50 -0600 Subject: [PATCH 05/23] Update MOm6 commit & add the input_nl change back --- MOM6 | 2 +- param_templates/input_nml.yaml | 10 ++++++++++ param_templates/json/input_nml.json | 14 ++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/MOM6 b/MOM6 index b15bc97..19ac836 160000 --- a/MOM6 +++ b/MOM6 @@ -1 +1 @@ -Subproject commit b15bc9780bc630236b048fcfd27b5ad177f55abe +Subproject commit 19ac8361018ff198c7f9afeb666130448fd26d80 diff --git a/param_templates/input_nml.yaml b/param_templates/input_nml.yaml index 36442a2..6aadb26 100644 --- a/param_templates/input_nml.yaml +++ b/param_templates/input_nml.yaml @@ -74,4 +74,14 @@ nam_stochy: values: 20 ntrunc: values: 192 + +time_interp_external_nml: + max_fields: + values: + $MARBL_CONFIG != "off" and $MOM6_DOMAIN_TYPE == "REGIONAL": 200 + else: 100 + max_files: + values: + $MARBL_CONFIG != "off" and $MOM6_DOMAIN_TYPE == "REGIONAL": 200 + else: 40 ... diff --git a/param_templates/json/input_nml.json b/param_templates/json/input_nml.json index 08157cd..045055d 100644 --- a/param_templates/json/input_nml.json +++ b/param_templates/json/input_nml.json @@ -94,5 +94,19 @@ "ntrunc": { "values": 192 } + }, + "time_interp_external_nml": { + "max_fields": { + "values": { + "$MARBL_CONFIG != \"off\" and $MOM6_DOMAIN_TYPE == \"REGIONAL\"": 200, + "else": 100 + } + }, + "max_files": { + "values": { + "$MARBL_CONFIG != \"off\" and $MOM6_DOMAIN_TYPE == \"REGIONAL\"": 200, + "else": 40 + } + } } } \ No newline at end of file From e0f871f7ecf498996d55dcd8af4ee5ff4ab24d65 Mon Sep 17 00:00:00 2001 From: manishvenu Date: Thu, 30 Apr 2026 18:46:08 -0600 Subject: [PATCH 06/23] Review COmments + Update MOM6 Commit --- MOM6 | 2 +- cime_config/config_component.xml | 2 +- param_templates/MOM_input.yaml | 4 +--- param_templates/json/MOM_input.json | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/MOM6 b/MOM6 index 19ac836..dbce657 160000 --- a/MOM6 +++ b/MOM6 @@ -1 +1 @@ -Subproject commit 19ac8361018ff198c7f9afeb666130448fd26d80 +Subproject commit dbce6577ee2537049174b024a1ace3669ba637ff diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index d2f6f69..08c3f96 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -210,7 +210,7 @@ REGIONAL,GLOBAL GLOBAL - REGIONAL + REGIONAL case_comp env_run.xml diff --git a/param_templates/MOM_input.yaml b/param_templates/MOM_input.yaml index af1d316..9fd7440 100644 --- a/param_templates/MOM_input.yaml +++ b/param_templates/MOM_input.yaml @@ -3676,9 +3676,7 @@ Global: else: "PPM_CW" MLE_USE_PBL_MLD: description: | - "TODO - - [Boolean] default = False + "[Boolean] default = False If true, the MLE parameterization will use the mixed-layer depth provided by the active PBL parameterization. If false, MLE will estimate a MLD based on a density difference with the surface using the parameter MLE_DENSITY_DIFF." diff --git a/param_templates/json/MOM_input.json b/param_templates/json/MOM_input.json index 56d4ff2..215268b 100644 --- a/param_templates/json/MOM_input.json +++ b/param_templates/json/MOM_input.json @@ -2992,7 +2992,7 @@ } }, "MLE_USE_PBL_MLD": { - "description": "\"TODO\n\n[Boolean] default = False\nIf true, the MLE parameterization will use the mixed-layer depth provided by\nthe active PBL parameterization. If false, MLE will estimate a MLD based on a\ndensity difference with the surface using the parameter MLE_DENSITY_DIFF.\"\n", + "description": "\"[Boolean] default = False\nIf true, the MLE parameterization will use the mixed-layer depth provided by\nthe active PBL parameterization. If false, MLE will estimate a MLD based on a\ndensity difference with the surface using the parameter MLE_DENSITY_DIFF.\"\n", "datatype": "logical", "value": { "$OCN_GRID == \"tx0.25v1\"": true, From 458432b26bdc1db10832106d2d853f1558979fba Mon Sep 17 00:00:00 2001 From: manishvenu Date: Fri, 1 May 2026 09:34:08 -0600 Subject: [PATCH 07/23] Duplicate Param --- param_templates/MOM_input.yaml | 12 +----------- param_templates/json/MOM_input.json | 4 +++- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/param_templates/MOM_input.yaml b/param_templates/MOM_input.yaml index 1e0539b..59397fd 100644 --- a/param_templates/MOM_input.yaml +++ b/param_templates/MOM_input.yaml @@ -1285,6 +1285,7 @@ Global: units: m value: $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 5.0 + $MOM6_DOMAIN_TYPE == "REGIONAL": 5.0 HBBL: description: | "[m] @@ -4057,17 +4058,6 @@ Global: datatype: logical value: $MOM6_DOMAIN_TYPE == "REGIONAL": True - CHANNEL_DRAG_MAX_BBL_THICK: - description: | - "[m] default = -1.0 - The maximum bottom boundary layer thickness over which the channel drag is - exerted, or a negative value for no fixed limit, instead basing the BBL - thickness on the bottom stress, rotation and stratification. The default is - proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. - " - datatype: real - value: - $MOM6_DOMAIN_TYPE == "REGIONAL": 5.0 DIRECT_STRESS: description: | "[Boolean] default = False diff --git a/param_templates/json/MOM_input.json b/param_templates/json/MOM_input.json index 1881edf..9665b4a 100644 --- a/param_templates/json/MOM_input.json +++ b/param_templates/json/MOM_input.json @@ -997,9 +997,11 @@ } }, "CHANNEL_DRAG_MAX_BBL_THICK": { - "description": "\"[m] default = -1.0\n The maximum bottom boundary layer thickness over which the channel drag is\n exerted, or a negative value for no fixed limit, instead basing the BBL\n thickness on the bottom stress, rotation and stratification. The default is\n proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true.\n\"\n", + "description": "\"[m] default = -1.0\nThe maximum bottom boundary layer thickness over which the channel drag is\nexerted, or a negative value for no fixed limit, instead basing the BBL\nthickness on the bottom stress, rotation and stratification.\"\n", "datatype": "real", + "units": "m", "value": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 5.0, "$MOM6_DOMAIN_TYPE == \"REGIONAL\"": 5.0 } }, From 7a5c1a8c140e1d94d8ccc05895f8b7ad04d013ff Mon Sep 17 00:00:00 2001 From: manishvenu Date: Fri, 1 May 2026 09:47:57 -0600 Subject: [PATCH 08/23] PE Layouts --- cime_config/config_pes.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index 8f96cfb..b6a86b8 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -40,7 +40,7 @@ - + Regional modeling configuration with SICE 128 @@ -73,7 +73,7 @@ 0 - + Regional modeling configuration with SICE and MARBL-BIO 128 @@ -106,7 +106,7 @@ 0 - + Regional modeling configuration with CICE 128 @@ -139,7 +139,7 @@ 0 - + Regional modeling configuration with CICE and MARBL-BIO 128 From 28deca3dd61f725a99d8492e3d9f1ca61c88e43c Mon Sep 17 00:00:00 2001 From: manishvenu Date: Fri, 1 May 2026 10:37:30 -0600 Subject: [PATCH 09/23] Update --- cime_config/config_pes.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index b6a86b8..3dad168 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -40,7 +40,7 @@ - + Regional modeling configuration with SICE 128 @@ -106,7 +106,7 @@ 0 - + Regional modeling configuration with CICE 128 From 2373b8495dc5bd8d0c89ac0e32bd8cdb7d85f57b Mon Sep 17 00:00:00 2001 From: manishvenu Date: Tue, 5 May 2026 09:26:36 -0600 Subject: [PATCH 10/23] 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 11/23] 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 12/23] 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 13/23] 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 14/23] 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 15/23] 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 16/23] 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 17/23] 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 18/23] 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 54237199a467775575e445424a81da15d47d11fc Mon Sep 17 00:00:00 2001 From: manishvenu Date: Wed, 6 May 2026 12:56:35 -0600 Subject: [PATCH 19/23] Change the max files/fields --- param_templates/input_nml.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/param_templates/input_nml.yaml b/param_templates/input_nml.yaml index 6aadb26..34b7f1d 100644 --- a/param_templates/input_nml.yaml +++ b/param_templates/input_nml.yaml @@ -78,10 +78,10 @@ nam_stochy: time_interp_external_nml: max_fields: values: - $MARBL_CONFIG != "off" and $MOM6_DOMAIN_TYPE == "REGIONAL": 200 + $MARBL_CONFIG != "off" and $MOM6_DOMAIN_TYPE == "REGIONAL": 300 else: 100 max_files: values: - $MARBL_CONFIG != "off" and $MOM6_DOMAIN_TYPE == "REGIONAL": 200 + $MARBL_CONFIG != "off" and $MOM6_DOMAIN_TYPE == "REGIONAL": 300 else: 40 ... From 53ca8464c63e43a356ebc2835d35c46ce092ab83 Mon Sep 17 00:00:00 2001 From: manishvenu Date: Thu, 7 May 2026 10:56:02 -0600 Subject: [PATCH 20/23] 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 21/23] 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 22/23] 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 23/23] 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}" } },