Merge branch 'rljacob/driver-moab/add-mb-intf' into next (PR #5979)

Second merge to next to fix some Mosart tests that failed
E3SM-Project · Dec 20, 2023 · d6d9aee · d6d9aee
2 parents eade35a + 2772250
commit d6d9aee
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/components/mosart/cime_config/testdefs/testmods_dirs/mosart/mos_usrdat/user_nl_mosart b/components/mosart/cime_config/testdefs/testmods_dirs/mosart/mos_usrdat/user_nl_mosart
@@ -1,2 +1,3 @@
 frivinp_rtm = '$DIN_LOC_ROOT/rof/mosart/MOSART_global_half_20180721a.nc'
+frivinp_mesh = '$DIN_LOC_ROOT/share/meshes/rof/SCRIPgrid_0.5x0.5_nomask_c110308.nc'
 
diff --git a/components/mosart/cime_config/testdefs/testmods_dirs/mosart/sediment/shell_commands b/components/mosart/cime_config/testdefs/testmods_dirs/mosart/sediment/shell_commands
@@ -6,9 +6,9 @@ input_data_dir=`./xmlquery DIN_LOC_ROOT --value`
 ./xmlchange DLND_MODE=CLMNLDAS
 ./xmlchange DLND_CPLHIST_CASE=NLDAS
 
-./xmlchange -file env_run.xml -id DLND_CPLHIST_YR_END -val 1979
-./xmlchange -file env_run.xml -id DLND_CPLHIST_YR_START -val 1979
-./xmlchange -file env_run.xml -id DLND_CPLHIST_YR_ALIGN -val 1
+./xmlchange DLND_CPLHIST_YR_END=1979
+./xmlchange DLND_CPLHIST_YR_START=1979
+./xmlchange DLND_CPLHIST_YR_ALIGN=1
 
 cat >> user_dlnd.streams.txt.clm.nldas << EOF
 <?xml version="1.0"?>
@@ -48,4 +48,4 @@ cat >> user_dlnd.streams.txt.clm.nldas << EOF
    </offset>
 </fieldInfo>
 </file>
-EOF
+EOF
diff --git a/components/mosart/cime_config/testdefs/testmods_dirs/mosart/sediment/user_nl_mosart b/components/mosart/cime_config/testdefs/testmods_dirs/mosart/sediment/user_nl_mosart
@@ -1,5 +1,6 @@
 frivinp_rtm = '$DIN_LOC_ROOT/rof/mosart/MOSART_NLDAS_8th_20160426_20210609d_rslp.nc'
+frivinp_mesh = '$DIN_LOC_ROOT/share/meshes/rof/MOSART_global_8th.scrip.20180211c.nc'
 sediflag = .true.
 parafile = '$DIN_LOC_ROOT/rof/mosart/US_reservoir_8th_NLDAS3_updated.nc'
 routingmethod = 2
-dlevelh2r = 100
+dlevelh2r = 100
diff --git a/components/mosart/cime_config/testdefs/testmods_dirs/mosart/unstructure/user_nl_mosart b/components/mosart/cime_config/testdefs/testmods_dirs/mosart/unstructure/user_nl_mosart
@@ -1,3 +1,4 @@
 frivinp_rtm = '$DIN_LOC_ROOT/rof/mosart/MOSART_Global_half_unstructured_c200728.nc'
+frivinp_mesh = 'UNDEFINED'
 inundflag = .true.
 opt_elevprof = 1
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,3 @@
		frivinp_rtm = '$DIN_LOC_ROOT/rof/mosart/MOSART_global_half_20180721a.nc'
		frivinp_mesh = '$DIN_LOC_ROOT/share/meshes/rof/SCRIPgrid_0.5x0.5_nomask_c110308.nc'