Update WW3 with fb_coupling_fields; add cice fix for zlvs (#573)

* updates for WW3 UKMO fb_coupling_fields which adds two additional coupling fields and requires the ww3_multi.inp files to change * add restart time for wave model to be FHMAX * Update CICE for zlvs
ufs-community · Jun 11, 2021 · 00d570e · 00d570e
1 parent ab3f8f8
commit 00d570e
Show file tree

Hide file tree

Showing 21 changed files with 2,378 additions and 2,326 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -37,6 +37,7 @@ How were these changes tested? What compilers / HPCs was it tested with? Are the
 - [ ] jet.intel
 - [ ] wcoss_cray
 - [ ] wcoss_dell_p3
+- [ ] CI
 
 ## Dependencies
 

diff --git a/CICE-interface/CICE b/CICE-interface/CICE
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -154,9 +154,7 @@ endif()
 ###############################################################################
 if(WW3)
   if(CMAKE_Platform)
-    if(${CMAKE_Platform} STREQUAL "wcoss2")
-      set(WW3_COMP "wcoss_cray")
-    elseif(${CMAKE_Platform} MATCHES "linux*" OR ${CMAKE_Platform} MATCHES "macosx*")
+    if(${CMAKE_Platform} MATCHES "linux*" OR ${CMAKE_Platform} MATCHES "macosx*")
       if (CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
         set(WW3_COMP "gnu")
       elseif (CMAKE_Fortran_COMPILER_ID MATCHES "Intel")

diff --git a/WW3 b/WW3
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -602,7 +602,7 @@ export WINDLINE='$'
 export CURRLINE='$'
 export NFGRIDS=0
 export NMGRIDS=1
-export ww3gline="'glo_30m'  'no' 'no' 'CPL:native' 'no' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export ww3gline="'glo_30m'  'no' 'no' 'CPL:native' 'no' 'no' 'no' 'no' 'no' 'no'   1  1  0.00 1.00  F"
 
 # Regional
 export WRITE_RESTART_WITH_BCS=.false.
@@ -741,7 +741,7 @@ export KTHERM=1
 export TFREEZE_OPTION='linear_salt'
 
 #wave
-export ww3gline="'glo_1deg'  'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export ww3gline="'glo_1deg'  'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 'no' 'no'   1  1  0.00 1.00  F"
 export WW3OUTPUTTYPE=' 1'
 
 # checkpoint restarts

diff --git a/tests/rt.conf b/tests/rt.conf
@@ -185,6 +185,5 @@ RUN     | datm_cdeps_debug_cfsr
 # ATM-WAV tests                                                                                                                                                                   #
 ###################################################################################################################################################################################
 
-# WW3 not working on Cheyenne in the past, need to check if it works now
 COMPILE | APP=ATMW SUITES=FV3_GFS_v16                                                                                           | - wcoss_cray  | fv3 |
 RUN     | control_atmwav                                                                                                        | - wcoss_cray  | fv3 |
diff --git a/tests/rt.sh b/tests/rt.sh
@@ -413,7 +413,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
   TEST_35D=true
 fi
 
-BL_DATE=20210609
+BL_DATE=20210610
 if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]]; then
   RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 else

diff --git a/tests/tests/cpld_bmark_wave_v16 b/tests/tests/cpld_bmark_wave_v16
@@ -153,7 +153,8 @@ export MOM6_REPRO_LA='True'
 
 export RUNID="cpcice"
 
-export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export WW3RSTDTHR=${FHMAX}
 
 export INPUT_NML=input.benchmark_v16.nml.IN
 

diff --git a/tests/tests/cpld_bmark_wave_v16_35d b/tests/tests/cpld_bmark_wave_v16_35d
@@ -144,7 +144,8 @@ export MOM6_REPRO_LA='True'
 
 export RUNID="cpcice"
 
-export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 'no' 'no'  1  1  0.00 1.00  F"
+export WW3RSTDTHR=${FHMAX}
 
 export INPUT_NML=input.benchmark_v16.nml.IN
 

diff --git a/tests/tests/cpld_bmark_wave_v16_noahmp b/tests/tests/cpld_bmark_wave_v16_noahmp
@@ -153,7 +153,8 @@ export MOM6_REPRO_LA='True'
 
 export RUNID="cpcice"
 
-export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 'no' 'no'  1  1  0.00 1.00  F"
+export WW3RSTDTHR=${FHMAX}
 
 export INPUT_NML=input.benchmark_v16.nml.IN
 

diff --git a/tests/tests/cpld_bmark_wave_v16_noahmp_35d b/tests/tests/cpld_bmark_wave_v16_noahmp_35d
@@ -145,7 +145,8 @@ export MOM6_REPRO_LA='True'
 
 export RUNID="cpcice"
 
-export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 'no' 'no'  1  1  0.00 1.00  F"
+export WW3RSTDTHR=${FHMAX}
 
 export INPUT_NML=input.benchmark_v16.nml.IN
 

diff --git a/tests/tests/cpld_bmark_wave_v16_noahmp_nsst b/tests/tests/cpld_bmark_wave_v16_noahmp_nsst
@@ -154,7 +154,8 @@ export MOM6_REPRO_LA='True'
 
 export RUNID="cpcice"
 
-export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export ww3gline="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 'no' 'no'   1  1  0.00 1.00  F"
+export WW3RSTDTHR=${FHMAX}
 
 export INPUT_NML=input.benchmark_v16.nml.IN