Merge branch 'origin/mahf708/eam/sathis' into next (PR #6641)

rljacob · rljacob · commit 8af7fb8e04d9 · 2024-09-25T21:00:32.000-05:00
Ressurecting a long-forgotten capability to output variable along ship/flight tracks, and adding a test to (weakly try to) ensure it doesn't break again. Fixes #6543 [BFB]
diff --git a/cime_config/tests.py b/cime_config/tests.py
@@ -207,6 +207,7 @@
             "REP_Ln5.ne4pg2_oQU480.F2010",
             "SMS_Ld3.ne4pg2_oQU480.F2010.eam-thetahy_sl_pg2_mass",
             "ERP_Ld3.ne4pg2_ne4pg2.FIDEAL.allactive-pioroot1",
+            "ERS_Ld5.ne4pg2_oQU480.F2010.eam-sathist_F2010",
             )
         },
 
diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/sathist_F2010/readme b/components/eam/cime_config/testdefs/testmods_dirs/eam/sathist_F2010/readme
@@ -0,0 +1 @@
+test for sat hist capability components/eam/src/control/sat_hist.F90
diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/sathist_F2010/shell_commands b/components/eam/cime_config/testdefs/testmods_dirs/eam/sathist_F2010/shell_commands
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+./xmlchange RUN_STARTDATE=2015-01-01
diff --git a/components/eam/cime_config/testdefs/testmods_dirs/eam/sathist_F2010/user_nl_eam b/components/eam/cime_config/testdefs/testmods_dirs/eam/sathist_F2010/user_nl_eam
@@ -0,0 +1,7 @@
+&satellite_options_nl
+ sathist_mfilt          = 10000,
+ sathist_track_infile   = '$DIN_LOC_ROOT/atm/waccm/sat/sathist_master_19700410-20150419_c20150616.nc'
+ sathist_hfilename_spec = '%c.eam.h9.sathist.%y-%m-%d-%s.nc'
+ sathist_nclosest       = 1
+ sathist_ntimestep      = 1
+ sathist_fincl          = 'T', 'PS'
diff --git a/components/eam/src/control/sat_hist.F90 b/components/eam/src/control/sat_hist.F90

Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,7 @@`
`207`	`207`	`"REP_Ln5.ne4pg2_oQU480.F2010",`
`208`	`208`	`"SMS_Ld3.ne4pg2_oQU480.F2010.eam-thetahy_sl_pg2_mass",`
`209`	`209`	`"ERP_Ld3.ne4pg2_ne4pg2.FIDEAL.allactive-pioroot1",`
	`210`	`+ "ERS_Ld5.ne4pg2_oQU480.F2010.eam-sathist_F2010",`
`210`	`211`	`)`
`211`	`212`	`},`
`212`	`213`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+test for sat hist capability components/eam/src/control/sat_hist.F90`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/bin/bash`
	`2`	`+`
	`3`	`+./xmlchange RUN_STARTDATE=2015-01-01`