Skip to content

Commit 0780855

Browse files
Natalie PerlinNatalie Perlin
Natalie Perlin
authored and
Natalie Perlin
committed
HSD test cases: HSD_INPUT_DATA variable added
1 parent ceadc2a commit 0780855

File tree

4 files changed

+21
-5
lines changed

4 files changed

+21
-5
lines changed

‎tests-dev/baseline_setup.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ hera:
1111
INPUTDATA_ROOT: /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/input-data-20240501
1212
INPUTDATA_ROOT_WW3: /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/input-data-20240501/WW3_input_data_20240214
1313
INPUTDATA_ROOT_BMIC: /scratch2/NAGAPE/epic/UFS-WM_RT/NEMSfv3gfs/BM_IC-20220207
14+
HSD_INPUT_DATA: /scratch1/NCEPDEV/nems/role.epic/HSD_INPUT_DATA
1415
orion:
1516
QUEUE: batch
1617
COMPILE_QUEUE: batch
@@ -24,6 +25,7 @@ orion:
2425
INPUTDATA_ROOT: /work/noaa/epic/UFS-WM_RT/NEMSfv3gfs/input-data-20240501
2526
INPUTDATA_ROOT_WW3: /work/noaa/epic/UFS-WM_RT/NEMSfv3gfs/input-data-20240501/WW3_input_data_20240214
2627
INPUTDATA_ROOT_BMIC: /work/noaa/epic/UFS-WM_RT/NEMSfv3gfs/BM_IC-20220207
28+
HSD_INPUT_DATA: /work/noaa/epic/role-epic/contrib/HSD_INPUT_DATA
2729
hercules:
2830
QUEUE: batch
2931
COMPILE_QUEUE: batch
@@ -37,6 +39,7 @@ hercules:
3739
INPUTDATA_ROOT: /work/noaa/epic/hercules/UFS-WM_RT/NEMSfv3gfs/input-data-20240501
3840
INPUTDATA_ROOT_WW3: /work/noaa/epic/hercules/UFS-WM_RT/NEMSfv3gfs/input-data-20240501/WW3_input_data_20240214
3941
INPUTDATA_ROOT_BMIC: /work/noaa/epic/hercules/UFS-WM_RT/NEMSfv3gfs/BM_IC-20220207
42+
HSD_INPUT_DATA: /work/noaa/epic/role-epic/contrib/HSD_INPUT_DATA
4043
gaea:
4144
QUEUE: normal
4245
COMPILE_QUEUE: normal
@@ -50,6 +53,7 @@ gaea:
5053
INPUTDATA_ROOT: /gpfs/f5/epic/world-shared/UFS-WM_RT/NEMSfv3gfs/input-data-20240501
5154
INPUTDATA_ROOT_WW3: /gpfs/f5/epic/world-shared/UFS-WM_RT/NEMSfv3gfs/input-data-20240501/WW3_input_data_20240214
5255
INPUTDATA_ROOT_BMIC: /gpfs/f5/epic/world-shared/UFS-WM_RT/NEMSfv3gfs/BM_IC-20220207
56+
HSD_INPUT_DATA: /glade/work/epicufsrt/contrib/HSD_INPUT_DATA
5357
jet:
5458
QUEUE: batch
5559
COMPILE_QUEUE: batch
@@ -63,6 +67,7 @@ jet:
6367
INPUTDATA_ROOT: /lfs5/HFIP/hfv3gfs/role.epic/RT/NEMSfv3gfs/input-data-20240501
6468
INPUTDATA_ROOT_WW3: /lfs5/HFIP/hfv3gfs/role.epic/RT/NEMSfv3gfs/input-data-20240501/WW3_input_data_20240214
6569
INPUTDATA_ROOT_BMIC: /lfs5/HFIP/hfv3gfs/role.epic/RT/NEMSfv3gfs/BM_IC-20220207
70+
HSD_INPUT_DATA: /mnt/lfs5/HFIP/hfv3gfs/role.epic/HSD_INPUT_DATA
6671
derecho:
6772
QUEUE: main
6873
COMPILE_QUEUE: main
@@ -76,6 +81,7 @@ derecho:
7681
INPUTDATA_ROOT: /glade/derecho/scratch/epicufsrt/ufs-weather-model/RT/NEMSfv3gfs/input-data-20240501
7782
INPUTDATA_ROOT_WW3: /glade/derecho/scratch/epicufsrt/ufs-weather-model/RT/NEMSfv3gfs/input-data-20240501/WW3_input_data_20240214
7883
INPUTDATA_ROOT_BMIC: /glade/derecho/scratch/epicufsrt/ufs-weather-model/RT/NEMSfv3gfs/BM_IC-20220207
84+
HSD_INPUT_DATA: /glade/work/epicufsrt/contrib/HSD_INPUT_DATA
7985
noaacloud:
8086
QUEUE: batch
8187
COMPILE_QUEUE: batch
@@ -89,6 +95,7 @@ noaacloud:
8995
INPUTDATA_ROOT: /contrib/ufs-weather-model/RT/NEMSfv3gfs/input-data-20240501
9096
INPUTDATA_ROOT_WW3: /contrib/ufs-weather-model/RT/NEMSfv3gfs/input-data-20240501/WW3_input_data_20240214
9197
INPUTDATA_ROOT_BMIC: /contrib/ufs-weather-model/RT/NEMSfv3gfs/BM_IC-20220207
98+
HSD_INPUT_DATA: /contrib/EPIC/HSD_INPUT_DATA
9299
s4:
93100
QUEUE: s4
94101
COMPILE_QUEUE: s4
@@ -102,3 +109,4 @@ s4:
102109
INPUTDATA_ROOT: /data/prod/emc.nemspara/RT/NEMSfv3gfs/input-data-20240501
103110
INPUTDATA_ROOT_WW3: /data/prod/emc.nemspara/RT/NEMSfv3gfs/input-data-20240501/WW3_input_data_20240214
104111
INPUTDATA_ROOT_BMIC: /data/prod/emc.nemspara/RT/NEMSfv3gfs/BM_IC-20220207
112+
HSD_INPUT_DATA:

‎tests-dev/create_xml.py‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import yaml
55
from ufs_test_utils import get_testcase, write_logfile, rrmdir, machine_check_off
66

7-
def rocoto_create_entries(RTPWD,MACHINE_ID,INPUTDATA_ROOT,INPUTDATA_ROOT_WW3,INPUTDATA_ROOT_BMIC,RUNDIR_ROOT,NEW_BASELINE,ROCOTO_XML):
7+
def rocoto_create_entries(RTPWD,MACHINE_ID,INPUTDATA_ROOT,INPUTDATA_ROOT_WW3,INPUTDATA_ROOT_BMIC,HSD_INPUT_DATA,RUNDIR_ROOT,NEW_BASELINE,ROCOTO_XML):
88
"""Generate header information for Rocoto xml file
99
1010
Args:
@@ -13,6 +13,7 @@ def rocoto_create_entries(RTPWD,MACHINE_ID,INPUTDATA_ROOT,INPUTDATA_ROOT_WW3,INP
1313
INPUTDATA_ROOT (str): Input data directory
1414
INPUTDATA_ROOT_WW3 (str): WW3 input data directory
1515
INPUTDATA_ROOT_BMIC (str): BMIC input data directory
16+
HSD_INPUT_DATA (str): HSD tests input data directory
1617
RUNDIR_ROOT (str): Test run directory
1718
NEW_BASELINE (str): Directory for newly generated baselines
1819
ROCOTO_XML (str): Rocoto .xml filename to write to
@@ -31,6 +32,7 @@ def rocoto_create_entries(RTPWD,MACHINE_ID,INPUTDATA_ROOT,INPUTDATA_ROOT_WW3,INP
3132
<!ENTITY INPUTDATA_ROOT "{INPUTDATA_ROOT}">
3233
<!ENTITY INPUTDATA_ROOT_WW3 "{INPUTDATA_ROOT_WW3}">
3334
<!ENTITY INPUTDATA_ROOT_BMIC "{INPUTDATA_ROOT_BMIC}">
35+
<!ENTITY HSD_INPUT_DATA "{HSD_INPUT_DATA}">
3436
<!ENTITY RUNDIR_ROOT "{RUNDIR_ROOT}">
3537
<!ENTITY NEW_BASELINE "{NEW_BASELINE}">
3638
]>
@@ -166,6 +168,7 @@ def write_runtest_env():
166168
INPUTDATA_ROOT = str(os.getenv('INPUTDATA_ROOT'))
167169
INPUTDATA_ROOT_WW3 = str(os.getenv('INPUTDATA_ROOT_WW3'))
168170
INPUTDATA_ROOT_BMIC= str(os.getenv('INPUTDATA_ROOT_BMIC'))
171+
HSD_INPUT_DATA= str(os.getenv('HSD_INPUT_DATA'))
169172
PATHRT = str(os.getenv('PATHRT'))
170173
PATHTR, tail = os.path.split(PATHRT)
171174
NEW_BASELINE = str(os.getenv('NEW_BASELINE'))
@@ -194,6 +197,7 @@ def write_runtest_env():
194197
export INPUTDATA_ROOT={INPUTDATA_ROOT}
195198
export INPUTDATA_ROOT_WW3={INPUTDATA_ROOT_WW3}
196199
export INPUTDATA_ROOT_BMIC={INPUTDATA_ROOT_BMIC}
200+
export HSD_INPUT_DATA={HSD_INPUT_DATA}
197201
export PATHRT={PATHRT}
198202
export PATHTR={PATHTR}
199203
export NEW_BASELINE={NEW_BASELINE}
@@ -343,6 +347,7 @@ def xml_loop():
343347
INPUTDATA_ROOT= str(base['INPUTDATA_ROOT'])
344348
INPUTDATA_ROOT_WW3 = str(base['INPUTDATA_ROOT_WW3'])
345349
INPUTDATA_ROOT_BMIC= str(base['INPUTDATA_ROOT_BMIC'])
350+
HSD_INPUT_DATA= str(base['HSD_INPUT_DATA'])
346351

347352
path = STMP+'/'+USER
348353
os.makedirs(path, exist_ok=True)
@@ -387,6 +392,7 @@ def xml_loop():
387392
os.environ["INPUTDATA_ROOT"] = INPUTDATA_ROOT
388393
os.environ["INPUTDATA_ROOT_WW3"] = INPUTDATA_ROOT_WW3
389394
os.environ["INPUTDATA_ROOT_BMIC"]= INPUTDATA_ROOT_BMIC
395+
os.environ["HSD_INPUT_DATA"]= HSD_INPUT_DATA
390396
os.environ["PARTITION"] = PARTITION
391397
os.environ["SCHEDULER"] = SCHEDULER
392398
os.environ["RTPWD"] = RTPWD
@@ -395,7 +401,7 @@ def xml_loop():
395401
JOB_NR = 0
396402
ROCOTO = True
397403
ROCOTO_XML = os.getenv('ROCOTO_XML')
398-
rocoto_create_entries(RTPWD,MACHINE_ID,INPUTDATA_ROOT,INPUTDATA_ROOT_WW3,INPUTDATA_ROOT_BMIC,RUNDIR_ROOT,NEW_BASELINE,ROCOTO_XML)
404+
rocoto_create_entries(RTPWD,MACHINE_ID,INPUTDATA_ROOT,INPUTDATA_ROOT_WW3,INPUTDATA_ROOT_BMIC,HSD_INPUT_DATA,RUNDIR_ROOT,NEW_BASELINE,ROCOTO_XML)
399405
UFS_TEST_YAML = str(os.getenv('UFS_TEST_YAML'))
400406
with open(UFS_TEST_YAML, 'r') as f:
401407
rt_yaml = yaml.load(f, Loader=yaml.FullLoader)

‎tests-dev/test_cases/exp_conf/2020_CAPE.IN‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if [ $WARM_START = .false. ]; then
2424
elif [ "$V2_SFC_FILE" = "true" ]; then
2525
cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/.
2626
elif [ "$HSD_CASE" = "true" ]; then
27-
cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/.
27+
cp -r @[HSD_INPUT_DATA]/${inputdir}/INPUT_L127_v2_sfc/* ./INPUT/.
2828
else
2929
cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_L127_gfsv17/* ./INPUT/.
3030
fi

‎tests-dev/test_cases/exp_conf/baroclinic_wave.IN‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ elif [ $NPX = 769 ]; then
1212
fi
1313

1414
echo "inputdir=$inputdir,NPX=$NPX,NESTED=$NESTED"
15-
16-
cp @[INPUTDATA_ROOT]/${inputdir}/global_hyblev.l128.txt .
15+
HSD_CASE=${HSD_CASE:-false}
16+
if [ "$HSD_CASE" = "true" ]; then
17+
cp @[HSD_INPUT_DATA]/global_hyblev.l128.txt .
18+
fi
1719

1820
OPNREQ_TEST=${OPNREQ_TEST:-false}
1921
V2_SFC_FILE=${V2_SFC_FILE:-false}

0 commit comments

Comments
 (0)