Update develop from gsd/develop 2020/06/30 (#156)

- updates to GSL regression tests, add three tests to `rt.conf`, remove unnecessary regression test configuration files for GSL physics - turn on AVX2 flags for wcoss_dell_p3
ufs-community · Jul 2, 2020 · b0ee9ff · b0ee9ff
1 parent dba56e5
commit b0ee9ff
Show file tree

Hide file tree

Showing 26 changed files with 2,752 additions and 2,055 deletions.
diff --git a/FV3 b/FV3
diff --git a/cmake/configure_wcoss_dell_p3.cmake b/cmake/configure_wcoss_dell_p3.cmake
@@ -15,7 +15,7 @@ option(REPRO "Enable REPRO mode" OFF)
 option(VERBOSE "Enable VERBOSE mode" OFF)
 option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
 option(OPENMP "Enable OpenMP threading" ON)
-option(AVX2 "Enable AVX2 instruction set" OFF)
+option(AVX2 "Enable AVX2 instruction set" ON)
 option(QUAD_PRECISION "Enable QUAD_PRECISION (for certain grid metric terms in dycore)" ON)
 
 option(INLINE_POST "Enable inline post" ON)

diff --git a/conf/configure.fv3.wcoss_dell_p3 b/conf/configure.fv3.wcoss_dell_p3
@@ -13,10 +13,12 @@ LD = mpiifort
 #########
 # flags #
 #########
+# default is 64-bit OpenMP non-hydrostatic build using AVX2
 DEBUG =
 REPRO =
 VERBOSE =
 OPENMP = Y
+AVX2 = Y
 HYDRO = N
 CCPP = N
 QUAD_PRECISION = Y
@@ -68,8 +70,13 @@ ifeq ($(REPRO),Y)
 FFLAGS += -qno-opt-dynamic-align
 CFLAGS += -qno-opt-dynamic-align
 else
-FFLAGS += -xHOST -qno-opt-dynamic-align
-CFLAGS += -xHOST -qno-opt-dynamic-align
+ifeq ($(AVX2),Y)
+FFLAGS += -xCORE-AVX2 -qno-opt-dynamic-align
+CFLAGS += -xCORE-AVX2 -qno-opt-dynamic-align
+else
+FFLAGS += -qno-opt-dynamic-align
+CFLAGS += -qno-opt-dynamic-align
+endif
 endif
 
 ifeq ($(MULTI_GASES),Y)

diff --git a/parm/ccpp_gsd.nml.IN b/parm/ccpp_gsd.nml.IN
@@ -17,6 +17,7 @@
 
 &diag_manager_nml
  prepend_date = .F.
+ max_output_fields = @[MAX_OUTPUT_FIELDS]
 /
 
 &fms_io_nml
@@ -117,7 +118,8 @@
 &gfs_physics_nml
  fhzero = 6.
  h2o_phys = .true.
- ldiag3d = .false.
+ ldiag3d = @[LDIAG3D]
+ qdiag3d = @[QDIAG3D]
  fhcyc = @[FHCYC]
  nst_anl = .true.
  use_ufo = .true.
@@ -148,7 +150,8 @@
  satmedmf = .false.
  lheatstrg = @[LHEATSTRG]
  do_mynnedmf = @[DO_MYNNEDMF]
- do_mynnsfclay = .false.
+ do_mynnsfclay = @[DO_MYNNSFCLAY]
+ effr_in = .true.
  random_clds = .false.
  trans_trac = .true.
  cnvcld = .true.

diff --git a/parm/ccpp_gsd_sar.nml.IN b/parm/ccpp_gsd_sar.nml.IN
@@ -172,6 +172,7 @@
  lheatstrg = .F.
  do_mynnedmf = .T.
  do_mynnsfclay = .false.
+ effr_in = .true.
  random_clds = .false.
  trans_trac = .true.
  cnvcld = .false.

diff --git a/parm/ccpp_gsd_sar_25km.nml.IN b/parm/ccpp_gsd_sar_25km.nml.IN
@@ -173,6 +173,7 @@
  lheatstrg = .F.
  do_mynnedmf = .true.
  do_mynnsfclay = .false.
+ effr_in = .true.
  random_clds = .false.
  trans_trac = .true.
  cnvcld = .false.

diff --git a/tests/Compile_hera.gnu.log b/tests/Compile_hera.gnu.log
diff --git a/tests/Compile_hera.intel.log b/tests/Compile_hera.intel.log
diff --git a/tests/Compile_orion.intel.log b/tests/Compile_orion.intel.log
diff --git a/tests/Compile_wcoss_cray.log b/tests/Compile_wcoss_cray.log
diff --git a/tests/Compile_wcoss_dell_p3.log b/tests/Compile_wcoss_dell_p3.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
@@ -1,9 +1,9 @@
-Fri Jun 26 14:05:55 UTC 2020
+Wed Jul 1 19:38:58 UTC 2020
 Start Regression test
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_gfdlmp_ccpp
-working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_gfdlmp_prod
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_gfdlmp_ccpp
+working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_gfdlmp_prod
 Checking test 001 fv3_ccpp_gfdlmp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -50,8 +50,8 @@ Checking test 001 fv3_ccpp_gfdlmp results ....
 Test 001 fv3_ccpp_gfdlmp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_gfs_v15p2_ccpp
-working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_gfs_v15p2_prod
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_gfs_v15p2_ccpp
+working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_gfs_v15p2_prod
 Checking test 002 fv3_ccpp_gfs_v15p2 results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -118,8 +118,8 @@ Checking test 002 fv3_ccpp_gfs_v15p2 results ....
 Test 002 fv3_ccpp_gfs_v15p2 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_gfs_v16beta_ccpp
-working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_gfs_v16beta_prod
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_gfs_v16beta_ccpp
+working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_gfs_v16beta_prod
 Checking test 003 fv3_ccpp_gfs_v16beta results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -186,8 +186,8 @@ Checking test 003 fv3_ccpp_gfs_v16beta results ....
 Test 003 fv3_ccpp_gfs_v16beta PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_rrtmgp_ccpp
-working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_rrtmgp_prod
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_rrtmgp_ccpp
+working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_rrtmgp_prod
 Checking test 004 fv3_ccpp_rrtmgp results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -254,8 +254,8 @@ Checking test 004 fv3_ccpp_rrtmgp results ....
 Test 004 fv3_ccpp_rrtmgp PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_gsd_ccpp
-working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_gsd_prod
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_gsd_ccpp
+working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_gsd_prod
 Checking test 005 fv3_ccpp_gsd results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -346,8 +346,8 @@ Checking test 005 fv3_ccpp_gsd results ....
 Test 005 fv3_ccpp_gsd PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_thompson_ccpp
-working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_thompson_prod
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_thompson_ccpp
+working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_thompson_prod
 Checking test 006 fv3_ccpp_thompson results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -414,8 +414,8 @@ Checking test 006 fv3_ccpp_thompson results ....
 Test 006 fv3_ccpp_thompson PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_thompson_no_aero_ccpp
-working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_thompson_no_aero_prod
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_thompson_no_aero_ccpp
+working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_thompson_no_aero_prod
 Checking test 007 fv3_ccpp_thompson_no_aero results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -482,14 +482,14 @@ Checking test 007 fv3_ccpp_thompson_no_aero results ....
 Test 007 fv3_ccpp_thompson_no_aero PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_control_ccpp
-working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_control_debug_prod
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_control_ccpp
+working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_control_debug_prod
 Checking test 008 fv3_ccpp_control_debug results ....
 Test 008 fv3_ccpp_control_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_gfs_v15p2_debug_ccpp
-working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_gfs_v15p2_debug_prod
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_gfs_v15p2_debug_ccpp
+working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_gfs_v15p2_debug_prod
 Checking test 009 fv3_ccpp_gfs_v15p2_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -556,8 +556,8 @@ Checking test 009 fv3_ccpp_gfs_v15p2_debug results ....
 Test 009 fv3_ccpp_gfs_v15p2_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_gfs_v16beta_debug_ccpp
-working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_gfs_v16beta_debug_prod
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_gfs_v16beta_debug_ccpp
+working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_gfs_v16beta_debug_prod
 Checking test 010 fv3_ccpp_gfs_v16beta_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -624,8 +624,8 @@ Checking test 010 fv3_ccpp_gfs_v16beta_debug results ....
 Test 010 fv3_ccpp_gfs_v16beta_debug PASS
 
 
-baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200611/GNU/fv3_rrtmgp_debug_ccpp
-working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_247707/fv3_ccpp_rrtmgp_debug_prod
+baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/develop-20200701/GNU/fv3_rrtmgp_debug_ccpp
+working dir = /scratch1/NCEPDEV/stmp2/Dom.Heinzeller/FV3_RT/rt_6839/fv3_ccpp_rrtmgp_debug_prod
 Checking test 011 fv3_ccpp_rrtmgp_debug results ....
  Comparing atmos_4xdaily.tile1.nc .........OK
  Comparing atmos_4xdaily.tile2.nc .........OK
@@ -693,5 +693,5 @@ Test 011 fv3_ccpp_rrtmgp_debug PASS
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Fri Jun 26 14:35:45 UTC 2020
-Elapsed time: 00h:29m:51s. Have a nice day!
+Wed Jul 1 20:19:53 UTC 2020
+Elapsed time: 00h:40m:55s. Have a nice day!