ufs-community · DeniseWorthen · Nov 20, 2019 · Nov 22, 2019 · Nov 22, 2019 · Nov 23, 2019
diff --git a/compsets/fv3.input b/compsets/fv3.input
@@ -201,7 +201,10 @@ fv3_defaults = {
     MAKE_NH='.T.'
     MOUNTAIN='.F.'
     SATMEDMF='.F.'
+    ISATMEDMF='0'
     HYBEDMF='.T.'
+    IMFSHALCNV='2'
+    IMFDEEPCNV='2'
     LHEATSTRG='.F.'
     LGFDLMPRAD='.F.'
     EFFR_IN='.F.'

diff --git a/conf/configure.fv3.wcoss_phase2 b/conf/configure.fv3.wcoss_phase2
@@ -43,7 +43,7 @@ CFLAGS := $(INCLUDE)
 FFLAGS := $(INCLUDE) -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -nowarn -sox -align array64byte
 
 CPPDEFS += -Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO -Duse_LARGEFILE -DUSE_GFSL63 -DGFS_PHYS -Duse_WRTCOMP
-CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML
+CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML -DNO_INLINE_POST
 
 ifeq ($(HYDRO),Y)
 CPPDEFS +=

diff --git a/conf/configure.fv3_coupled.wcoss_phase2 b/conf/configure.fv3_coupled.wcoss_phase2
@@ -43,7 +43,7 @@ CFLAGS := $(INCLUDE)
 FFLAGS := $(INCLUDE) -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -nowarn -sox -align array64byte
 
 CPPDEFS += -Duse_libMPI -Duse_netCDF -DSPMD -DUSE_LOG_DIAG_FIELD_INFO -Duse_LARGEFILE -DUSE_GFSL63 -DGFS_PHYS -Duse_WRTCOMP
-CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML
+CPPDEFS += -DNEW_TAUCTMAX -DINTERNAL_FILE_NML -DNO_INLINE_POST
 
 ifeq ($(HYDRO),Y)
 CPPDEFS +=

diff --git a/log/report-hera.intel-log/build_fv3_mom6_cice.exe.log b/log/report-hera.intel-log/build_fv3_mom6_cice.exe.log
diff --git a/log/report-hera.intel-log/rtreport.txt b/log/report-hera.intel-log/rtreport.txt
@@ -1,20 +1,16 @@
 Run rocotostat...
 Generate report...
-WORKFLOW STARTED AT Tue Jan 21 18:44:16 2020 (+1579632256)
+WORKFLOW STARTED AT Wed Jan 22 17:03:36 2020 (+1579712616)
 Repository information:
 
 
 REPO TOP:
-develop                478b092 [origin/develop] Debug mode capablility (#15)
-Fetch URL: https://github.com/MinsukJi-NOAA/ufs-s2s-model
- M CICE_SRC
- M MOM6
- M NEMS
- M log/report-hera.intel-log/build_fv3_mom6_cice.exe.log
+develop                6a9bf46 [origin/develop] Merge pull request #7 from ufs-community/develop
+Fetch URL: git@github.com:DeniseWorthen/ufs-s2s-model.git
  M log/report-hera.intel-log/rtreport.txt
 
 Entering 'CICE_SRC'
-develop aafac32 [origin/develop] Code changes to support automatic debug compilation (#10)
+(HEAD detached at aafac32) aafac32 Code changes to support automatic debug compilation (#10)
 Fetch URL: https://github.com/NOAA-EMC/CICE5.git
 
 Entering 'FMS'
@@ -26,11 +22,11 @@ Entering 'FV3'
 Fetch URL: https://github.com/NOAA-EMC/fv3atm
 
 Entering 'MOM6'
-develop 575f570 [origin/develop] Code change to compile.sh enables the following: DEBUG flag is passed down as an environment variable. Subsequently, DEBUG or REPRO is automatically selected.
+(HEAD detached at 575f570) 575f570 Code change to compile.sh enables the following: DEBUG flag is passed down as an environment variable. Subsequently, DEBUG or REPRO is automatically selected.
 Fetch URL: https://github.com/NOAA-EMC/MOM6-interface
 
 Entering 'NEMS'
-develop daae388 [origin/develop] Code changes to support DEBUG compilation based on appBuilder specification (#23)
+(HEAD detached at daae388) daae388 Code changes to support DEBUG compilation based on appBuilder specification (#23)
 Fetch URL: https://github.com/NOAA-EMC/NEMS.git
 
 Entering 'stochastic_physics'
@@ -41,8 +37,8 @@ Fetch URL: https://github.com/noaa-psd/stochastic_physics
 BUILD fv3_mom6_cice.exe: SUCCEEDED
 
 TEST #1: PASS
-  Test cpld_fv3_384_mom6_cice_2d_atm_flux starting at Tue Jan 21 18:46:35 UTC 2020 (Fully coupled FV3-MOM6-CICE system - 2d_warm)
-  Tue Jan 21 18:46:35 UTC 2020
+  Test cpld_fv3_384_mom6_cice_2d_atm_flux starting at Wed Jan 22 14:40:06 UTC 2020 (Fully coupled FV3-MOM6-CICE system - 2d_warm)
+  Wed Jan 22 14:40:06 UTC 2020
   phyf048.tile1.nc: bit-for-bit identical
   phyf048.tile2.nc: bit-for-bit identical
   phyf048.tile3.nc: bit-for-bit identical
@@ -115,14 +111,14 @@ TEST #1: PASS
   mediator_FBHyd_h_restart.nc: bit-for-bit identical
   mediator_FBAtmOcn_o_restart.nc: bit-for-bit identical
   Executable did not change during test suite:
-    File: /scratch1/NCEPDEV/stmp2/Minsuk.Ji/scrub/rtgen.107464/exec/fv3_mom6_cice.exe
-    Expected md5sum: 0aa9572b3f8f814cd247c50e7ba125bd
-    Actual md5sum: 0aa9572b3f8f814cd247c50e7ba125bd
-  TEST PASSED AT Tue Jan 21 19:31:26 UTC 2020
+    File: /scratch1/NCEPDEV/stmp2/Denise.Worthen/RTs/rtgen.419391/exec/fv3_mom6_cice.exe
+    Expected md5sum: 97e0e42914b41daf7f00e04a1b90a323
+    Actual md5sum: 97e0e42914b41daf7f00e04a1b90a323
+  TEST PASSED AT Wed Jan 22 15:25:31 UTC 2020
 
 TEST #2: PASS
-  Test cpld_fv3_384_mom6_cice_cold_atm_flux starting at Tue Jan 21 18:46:45 UTC 2020 (Fully coupled FV3-MOM6-CICE system - cold 384)
-  Tue Jan 21 18:46:45 UTC 2020
+  Test cpld_fv3_384_mom6_cice_cold_atm_flux starting at Wed Jan 22 14:40:12 UTC 2020 (Fully coupled FV3-MOM6-CICE system - cold 384)
+  Wed Jan 22 14:40:12 UTC 2020
   phyf001.tile1.nc: bit-for-bit identical
   phyf001.tile2.nc: bit-for-bit identical
   phyf001.tile3.nc: bit-for-bit identical
@@ -178,14 +174,14 @@ TEST #2: PASS
   mediator_FBOcn_o_restart.nc: bit-for-bit identical
   mediator_scalars_restart.txt: bit-for-bit identical
   Executable did not change during test suite:
-    File: /scratch1/NCEPDEV/stmp2/Minsuk.Ji/scrub/rtgen.107464/exec/fv3_mom6_cice.exe
-    Expected md5sum: 0aa9572b3f8f814cd247c50e7ba125bd
-    Actual md5sum: 0aa9572b3f8f814cd247c50e7ba125bd
-  TEST PASSED AT Tue Jan 21 18:51:59 UTC 2020
+    File: /scratch1/NCEPDEV/stmp2/Denise.Worthen/RTs/rtgen.419391/exec/fv3_mom6_cice.exe
+    Expected md5sum: 97e0e42914b41daf7f00e04a1b90a323
+    Actual md5sum: 97e0e42914b41daf7f00e04a1b90a323
+  TEST PASSED AT Wed Jan 22 14:45:22 UTC 2020
 
 TEST #3: PASS
-  Test cpld_fv3_mom6_cice_cold_atm_flux starting at Tue Jan 21 18:47:44 UTC 2020 (Fully coupled FV3-MOM6-CICE system - cold start)
-  Tue Jan 21 18:47:44 UTC 2020
+  Test cpld_fv3_mom6_cice_cold_atm_flux starting at Wed Jan 22 14:40:23 UTC 2020 (Fully coupled FV3-MOM6-CICE system - cold start)
+  Wed Jan 22 14:40:23 UTC 2020
   phyf001.tile1.nc: bit-for-bit identical
   phyf001.tile2.nc: bit-for-bit identical
   phyf001.tile3.nc: bit-for-bit identical
@@ -241,14 +237,14 @@ TEST #3: PASS
   mediator_FBOcn_o_restart.nc: bit-for-bit identical
   mediator_scalars_restart.txt: bit-for-bit identical
   Executable did not change during test suite:
-    File: /scratch1/NCEPDEV/stmp2/Minsuk.Ji/scrub/rtgen.107464/exec/fv3_mom6_cice.exe
-    Expected md5sum: 0aa9572b3f8f814cd247c50e7ba125bd
-    Actual md5sum: 0aa9572b3f8f814cd247c50e7ba125bd
-  TEST PASSED AT Tue Jan 21 18:50:23 UTC 2020
+    File: /scratch1/NCEPDEV/stmp2/Denise.Worthen/RTs/rtgen.419391/exec/fv3_mom6_cice.exe
+    Expected md5sum: 97e0e42914b41daf7f00e04a1b90a323
+    Actual md5sum: 97e0e42914b41daf7f00e04a1b90a323
+  TEST PASSED AT Wed Jan 22 14:42:58 UTC 2020
 
 TEST #4: PASS
-  Test cpld_fv3_mom6_cice_2d_atm_flux starting at Tue Jan 21 18:47:40 UTC 2020 (Fully coupled FV3-MOM6-CICE system - 2d_warm)
-  Tue Jan 21 18:47:40 UTC 2020
+  Test cpld_fv3_mom6_cice_2d_atm_flux starting at Wed Jan 22 14:41:56 UTC 2020 (Fully coupled FV3-MOM6-CICE system - 2d_warm)
+  Wed Jan 22 14:41:56 UTC 2020
   phyf048.tile1.nc: bit-for-bit identical
   phyf048.tile2.nc: bit-for-bit identical
   phyf048.tile3.nc: bit-for-bit identical
@@ -321,11 +317,11 @@ TEST #4: PASS
   mediator_FBHyd_h_restart.nc: bit-for-bit identical
   mediator_FBAtmOcn_o_restart.nc: bit-for-bit identical
   Executable did not change during test suite:
-    File: /scratch1/NCEPDEV/stmp2/Minsuk.Ji/scrub/rtgen.107464/exec/fv3_mom6_cice.exe
-    Expected md5sum: 0aa9572b3f8f814cd247c50e7ba125bd
-    Actual md5sum: 0aa9572b3f8f814cd247c50e7ba125bd
-  TEST PASSED AT Tue Jan 21 19:14:38 UTC 2020
-WORKFLOW REPORT AT Tue Jan 21 19:32:58 2020 (+1579635178)
+    File: /scratch1/NCEPDEV/stmp2/Denise.Worthen/RTs/rtgen.419391/exec/fv3_mom6_cice.exe
+    Expected md5sum: 97e0e42914b41daf7f00e04a1b90a323
+    Actual md5sum: 97e0e42914b41daf7f00e04a1b90a323
+  TEST PASSED AT Wed Jan 22 15:08:37 UTC 2020
+WORKFLOW REPORT AT Wed Jan 22 17:03:40 2020 (+1579712620)
 Tests: 0 failed, 4 passed out of 4
 Builds: 0 failed, 1 passed out of 1
 REGRESSION TEST WAS SUCCESSFUL
diff --git a/modulefiles/cheyenne.intel/fv3 b/modulefiles/cheyenne.intel/fv3
@@ -37,3 +37,11 @@ module load NCEPlibs/9.9.9
 ## SIONlib library
 ##
 module load SIONlib/1.7.4
+
+##
+## set cmake compilers
+##
+setenv CMAKE_C_COMPILER mpicc
+setenv CMAKE_CXX_COMPILER mpicxx
+setenv CMAKE_Fortran_COMPILER mpif90
+setenv CMAKE_Platform cheyenne.intel
diff --git a/modulefiles/gaea.intel/fv3 b/modulefiles/gaea.intel/fv3
@@ -20,7 +20,7 @@ module rm intel
 module load intel/18.0.3.222
 module load cray-netcdf
 
-module use -a /lustre/f2/pdata/esrl/gsd/gmtb/NEMSfv3gfs/modules/modulefiles/intel-18.0.3.222
+module use -a /lustre/f2/pdata/esrl/gsd/ufs/modules/modulefiles/intel-18.0.3.222
 
 ##
 ## Libxml2 - compiled manually because of issues with linking the code
@@ -39,3 +39,11 @@ module load esmf/8.0.0
 
 # Needed at runtime:
 module load alps
+
+##
+## load cmake
+##
+setenv CMAKE_C_COMPILER cc
+setenv CMAKE_CXX_COMPILER CC
+setenv CMAKE_Fortran_COMPILER ftn
+setenv CMAKE_Platform gaea.intel
diff --git a/modulefiles/gaea.intel/fv3_coupled b/modulefiles/gaea.intel/fv3_coupled
@@ -20,7 +20,7 @@ module rm intel
 module load intel/18.0.3.222
 module load cray-netcdf
 
-module use -a /lustre/f2/pdata/esrl/gsd/gmtb/NEMSfv3gfs/modules/modulefiles/intel-18.0.3.222
+module use -a /lustre/f2/pdata/esrl/gsd/ufs/modules/modulefiles/intel-18.0.3.222
 
 ##
 ## Libxml2 - compiled manually because of issues with linking the code

diff --git a/modulefiles/hera.intel/fv3 b/modulefiles/hera.intel/fv3
@@ -36,18 +36,27 @@ module load sp/2.0.3
 module load w3emc/2.3.1
 module load w3nco/2.0.7
 module load g2/3.1.1
-module load g2tmpl/1.5.1
+module load g2tmpl/1.6.0
 module load crtm/2.2.6
 module load jasper/1.900.1
 module load png/1.2.44
 module load z/1.2.11
-
 ## load modules for nceppost grib
-module load post/8.0.0
+module load post/8.0.1
 
 ##
 ## load ESMF library for above compiler / MPI combination
 ## use pre-compiled EMSF library for above compiler / MPI combination
 ##
 module use -a /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles
 module load esmf/8.0.0
+
+##
+## load cmake
+##
+module use /contrib/modulefiles
+module load cmake/3.9.0
+setenv CMAKE_C_COMPILER mpiicc
+setenv CMAKE_CXX_COMPILER mpiicpc
+setenv CMAKE_Fortran_COMPILER mpiifort
+setenv CMAKE_Platform hera.intel
diff --git a/modulefiles/hera.intel/fv3_coupled b/modulefiles/hera.intel/fv3_coupled
@@ -36,14 +36,14 @@ module load sp/2.0.3
 module load w3emc/2.3.1
 module load w3nco/2.0.7
 module load g2/3.1.1
-module load g2tmpl/1.5.1
+module load g2tmpl/1.6.0
 module load crtm/2.2.6
 module load jasper/1.900.1
 module load png/1.2.44
 module load z/1.2.11
 
 ## load modules for nceppost grib
-module load post/8.0.0
+module load post/8.0.1
 
 ##
 ## load ESMF library for above compiler / MPI combination

diff --git a/modulefiles/jet.intel/fv3 b/modulefiles/jet.intel/fv3
@@ -31,3 +31,11 @@ module load  NCEPlibs/9.9.9
 ### use pre-compiled EMSF library for above compiler / MPI combination
 ##
 module load esmf/8.0.0
+
+##
+## load cmake
+##
+setenv CMAKE_C_COMPILER mpiicc
+setenv CMAKE_CXX_COMPILER mpiicpc
+setenv CMAKE_Fortran_COMPILER mpiifort
+setenv CMAKE_Platform jet
diff --git a/modulefiles/wcoss_cray/fv3 b/modulefiles/wcoss_cray/fv3
@@ -35,7 +35,7 @@ module load crtm-intel/2.2.6
 
 module use /gpfs/hps/usrx/local/nceplibs/NCEPLIBS/modulefiles
 module load g2/3.1.1
-module load g2tmpl/1.5.1
+module load g2tmpl/1.6.0
 ##
 ## load ncelibs libraries
 ##
@@ -47,7 +47,7 @@ module load w3emc/2.3.1
 module load nemsio/2.2.4
 
 #post lib
-module load post/8.0.0
+module load post/8.0.1
 
 ## WCOSS Cray execution prereqs:
 module load rca
@@ -61,3 +61,12 @@ module use /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
 module load esmf/8.0.0
 
 module swap pmi pmi/5.0.11
+
+##
+## load cmake
+##
+module load cmake/3.6.2
+setenv CMAKE_C_COMPILER cc
+setenv CMAKE_CXX_COMPILER CC
+setenv CMAKE_Fortran_COMPILER ftn
+setenv CMAKE_Platform wcoss_cray
diff --git a/modulefiles/wcoss_cray/fv3_coupled b/modulefiles/wcoss_cray/fv3_coupled
@@ -35,7 +35,7 @@ module load crtm-intel/2.2.6
 
 module use /gpfs/hps/usrx/local/nceplibs/NCEPLIBS/modulefiles
 module load g2/3.1.1
-module load g2tmpl/1.5.1
+module load g2tmpl/1.6.0
 ##
 ## load ncelibs libraries
 ##
@@ -47,7 +47,7 @@ module load w3emc/2.3.1
 module load nemsio/2.2.4
 
 #post lib
-module load post/8.0.0
+module load post/8.0.1
 
 ## WCOSS Cray execution prereqs:
 module load rca

diff --git a/modulefiles/wcoss_dell_p3/fv3 b/modulefiles/wcoss_dell_p3/fv3
@@ -32,7 +32,7 @@ module load w3nco/2.0.7
 module load w3emc/2.3.1
 module load nemsio/2.2.4
 module load g2/3.1.1
-module load g2tmpl/1.5.1
+module load g2tmpl/1.6.0
 module load crtm/2.2.6
 
 # WW3 grib encoding
@@ -41,7 +41,16 @@ module load libpng/1.2.59
 module load zlib/1.2.11
 
 # load post lib
-module load post/8.0.0
+module load post/8.0.1
 
 module use /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/soft/modulefiles
 module load esmf/8.0.0
+
+##
+## load cmake
+##
+module load cmake/3.10.0
+setenv CMAKE_C_COMPILER mpiicc
+setenv CMAKE_CXX_COMPILER mpiicpc
+setenv CMAKE_Fortran_COMPILER mpiifort
+setenv CMAKE_Platform wcoss_dell_p3
diff --git a/modulefiles/wcoss_dell_p3/fv3_coupled b/modulefiles/wcoss_dell_p3/fv3_coupled
@@ -32,7 +32,7 @@ module load w3nco/2.0.7
 module load w3emc/2.3.1
 module load nemsio/2.2.4
 module load g2/3.1.1
-module load g2tmpl/1.5.1
+module load g2tmpl/1.6.0
 module load crtm/2.2.6
 
 # WW3 grib encoding
@@ -41,7 +41,7 @@ module load libpng/1.2.59
 module load zlib/1.2.11
 
 # load post lib
-module load post/8.0.0
+module load post/8.0.1
 
 module use /gpfs/dell2/emc/modeling/noscrub/emc.nemspara/soft/modulefiles
 module load esmf/8.0.0
diff --git a/modulefiles/wcoss_phase2/fv3 b/modulefiles/wcoss_phase2/fv3
@@ -46,10 +46,6 @@ module load sp/2.0.3
 module load w3nco/2.0.7
 module load w3emc/2.3.1
 module load nemsio/2.2.4
-module load g2tmpl/1.5.1
-
-#post lib
-module load post/8.0.0
 
 #ESMF lib
 module use /nems/noscrub/emc.nemspara/soft/modulefiles

diff --git a/modulefiles/wcoss_phase2/fv3_coupled b/modulefiles/wcoss_phase2/fv3_coupled
@@ -46,10 +46,6 @@ module load sp/2.0.3
 module load w3nco/2.0.7
 module load w3emc/2.3.1
 module load nemsio/2.2.4
-module load g2tmpl/1.5.1
-
-#post lib
-module load post/8.0.0
 
 #ESMF lib
 module use /nems/noscrub/emc.nemspara/soft/modulefiles

diff --git a/parm/ccpp_control.nml.IN b/parm/ccpp_control.nml.IN
@@ -159,7 +159,7 @@
        cnvcld         = .true.
        imfshalcnv     = 2
        imfdeepcnv     = 2
-       isatmedmf      = 0
+       isatmedmf      = @[ISATMEDMF]
        cdmbgwd        = 3.5,0.25
        prslrd0        = 0.
        ivegsrc        = 1

diff --git a/parm/ccpp_gfdlmp.nml.IN b/parm/ccpp_gfdlmp.nml.IN
@@ -178,6 +178,8 @@
        oz_phys_2015   = @[OZ_PHYS_NEW]
        h2o_phys       = @[H2O_PHYS]
        nstf_name      = @[NSTF_NAME]
+       cplflx         = @[CPLFLX]
+       cplwav         = @[CPLWAV]
        xkzminv        = 0.3
        xkzm_m         = 1.0
        xkzm_h         = 1.0