From 220daa720d50992c8513d142108ece73315f6c0f Mon Sep 17 00:00:00 2001 From: MinsukJi-NOAA Date: Fri, 7 Aug 2020 12:12:44 -0500 Subject: [PATCH 1/2] fix rt.sh for 35 day tests --- tests/rt.sh | 16 +++++++++++++--- .../tests/cpld_fv3_ccpp_384_mom6_cice_cmeps_35d | 4 ++-- .../tests/cpld_fv3_ccpp_384_mom6_cice_cmeps_cold | 2 +- .../cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d | 4 ++-- .../cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_cold | 2 +- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/tests/rt.sh b/tests/rt.sh index 63dc2c39..b6ca3473 100755 --- a/tests/rt.sh +++ b/tests/rt.sh @@ -63,15 +63,25 @@ rt_35d() { cp tests/$TEST_NAME $new_test_name if [[ $TEST_NAME =~ cold$ ]]; then + sed -i -e "s/\(export LIST_FILES\)/\1=\"ufs.s2s.cold.cpl.r.${sy}-${sm}-01-03600.nc\"/" $new_test_name sed -i -e "s/\(export SYEAR\)/\1=\"$sy\"/" $new_test_name sed -i -e "s/\(export SMONTH\)/\1=\"$sm\"/" $new_test_name - sed -i -e "s/\(export CNTL_DIR\)/\1='RT-Baselines_cold_bmwav_cmeps_${sy}'/" $new_test_name - sed -i -e "s/\(export CNTLMED_DIR\)/\1='MEDIATOR_bmwav_cmeps_${DATE_35D}'/" $new_test_name + if [[ $TEST_NAME =~ ww3 ]]; then + sed -i -e "s/\(export CNTL_DIR\)/\1='RT-Baselines_cold_bmwav_cmeps_${DATE_35D}'/" $new_test_name + sed -i -e "s/\(export CNTLMED_DIR\)/\1='MEDIATOR_bmwav_cmeps_${DATE_35D}'/" $new_test_name + else + sed -i -e "s/\(export CNTL_DIR\)/\1='RT-Baselines_cold_bm_cmeps_${DATE_35D}'/" $new_test_name + sed -i -e "s/\(export CNTLMED_DIR\)/\1='MEDIATOR_bm_cmeps_${DATE_35D}'/" $new_test_name + fi elif [[ $TEST_NAME =~ 35d$ ]]; then sed -i -e "s/\(export SYEAR\)/\1=\"$sy\"/" $new_test_name sed -i -e "s/\(export SMONTH\)/\1=\"$sm\"/" $new_test_name - sed -i -e "s/\(export MED_restart_data\)/\1='MEDIATOR_bmwav_cmeps_${DATE_35D}'/" $new_test_name DEP_RUN=${DEP_RUN}_${DATE_35D} + if [[ $TEST_NAME =~ ww3 ]]; then + sed -i -e "s/\(export MED_restart_data\)/\1='MEDIATOR_bmwav_cmeps_${DATE_35D}'/" $new_test_name + else + sed -i -e "s/\(export MED_restart_data\)/\1='MEDIATOR_bm_cmeps_${DATE_35D}'/" $new_test_name + fi fi TEST_NAME=${new_test_name#tests/} diff --git a/tests/tests/cpld_fv3_ccpp_384_mom6_cice_cmeps_35d b/tests/tests/cpld_fv3_ccpp_384_mom6_cice_cmeps_35d index 40e8eee8..bc2a19f0 100644 --- a/tests/tests/cpld_fv3_ccpp_384_mom6_cice_cmeps_35d +++ b/tests/tests/cpld_fv3_ccpp_384_mom6_cice_cmeps_35d @@ -12,8 +12,8 @@ export SMONTH export SDAY="01" export SHOUR="00" -export DAYS="35" -export FHMAX="840" +export DAYS="2" +export FHMAX="48" export FDIAG="6" export WLCLK=480 diff --git a/tests/tests/cpld_fv3_ccpp_384_mom6_cice_cmeps_cold b/tests/tests/cpld_fv3_ccpp_384_mom6_cice_cmeps_cold index 4baf42d8..a86319a1 100644 --- a/tests/tests/cpld_fv3_ccpp_384_mom6_cice_cmeps_cold +++ b/tests/tests/cpld_fv3_ccpp_384_mom6_cice_cmeps_cold @@ -7,7 +7,7 @@ export TEST_DESCR="Coupled FV3-CCPP-MOM6-CICE-CMEPS system - cold 384" export CNTL_DIR export CNTLMED_DIR -export LIST_FILES="" +export LIST_FILES export_fv3 export_cpl diff --git a/tests/tests/cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d b/tests/tests/cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d index 6883f9cf..ef7436cc 100644 --- a/tests/tests/cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d +++ b/tests/tests/cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d @@ -12,8 +12,8 @@ export SMONTH export SDAY="01" export SHOUR="00" -export DAYS="35" -export FHMAX="840" +export DAYS="2" +export FHMAX="48" export FDIAG="6" export WLCLK=480 diff --git a/tests/tests/cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_cold b/tests/tests/cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_cold index 4a85167e..5d9246ed 100644 --- a/tests/tests/cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_cold +++ b/tests/tests/cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_cold @@ -7,7 +7,7 @@ export TEST_DESCR="Coupled FV3-CCPP-MOM6-CICE-CMEPS--WW3 system - cold 384" export CNTL_DIR export CNTLMED_DIR -export LIST_FILES="" +export LIST_FILES export_fv3 export_cpl From c1bf29ac97fabdba73e42b861d5b775b9deecc7d Mon Sep 17 00:00:00 2001 From: MinsukJi-NOAA Date: Fri, 7 Aug 2020 13:29:08 -0500 Subject: [PATCH 2/2] change 2 days back to 35 days --- tests/tests/cpld_fv3_ccpp_384_mom6_cice_cmeps_35d | 4 ++-- tests/tests/cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/tests/cpld_fv3_ccpp_384_mom6_cice_cmeps_35d b/tests/tests/cpld_fv3_ccpp_384_mom6_cice_cmeps_35d index bc2a19f0..40e8eee8 100644 --- a/tests/tests/cpld_fv3_ccpp_384_mom6_cice_cmeps_35d +++ b/tests/tests/cpld_fv3_ccpp_384_mom6_cice_cmeps_35d @@ -12,8 +12,8 @@ export SMONTH export SDAY="01" export SHOUR="00" -export DAYS="2" -export FHMAX="48" +export DAYS="35" +export FHMAX="840" export FDIAG="6" export WLCLK=480 diff --git a/tests/tests/cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d b/tests/tests/cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d index ef7436cc..6883f9cf 100644 --- a/tests/tests/cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d +++ b/tests/tests/cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d @@ -12,8 +12,8 @@ export SMONTH export SDAY="01" export SHOUR="00" -export DAYS="2" -export FHMAX="48" +export DAYS="35" +export FHMAX="840" export FDIAG="6" export WLCLK=480