JessicaMeixner-NOAA · JessicaMeixner-NOAA · Feb 3, 2020 · Jan 21, 2020 · Jan 24, 2020 · Jan 28, 2020
diff --git a/CICE_SRC b/CICE_SRC
diff --git a/FV3 b/FV3
diff --git a/MOM6 b/MOM6
diff --git a/NEMS b/NEMS
diff --git a/compsets/all.input b/compsets/all.input
@@ -9,6 +9,9 @@ run cpld_fv3_384_mom6_cice_cold_atm_flux @ fv3, coupledapp, cold384
 run cpld_fv3_mom6_cice_2d_atm_flux @ fv3, coupledapp, warm
 run cpld_fv3_384_mom6_cice_2d_atm_flux @ fv3, coupledapp, warm384
 
+run cpld_fv3_mom6_cice_2d_2threads @ fv3, coupledapp, warm
+run cpld_fv3_mom6_cice_2d_decomp @ fv3, coupledapp, warm
+
 ########################################################################
 #Run the Benchmark-like inputs for a single date 
 #These can be run separately from the baseline test cases 

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/compsets/fv3mom6cice5.input b/compsets/fv3mom6cice5.input
@@ -203,6 +203,28 @@ test cpld_fv3_mom6_cice_2d_atm_flux: fv3_mom6_cice.exe {
 
 } 
 ######################################################################## 
+# warm 2d c96 2 threads
+
+test cpld_fv3_mom6_cice_2d_2threads: fv3_mom6_cice.exe { 
+    use cpld_fv3_mom6_cice_2d_atm_flux 
+    use plat%default_cpl_threaded_resources
+    TEST_DESCR="Fully coupled FV3-MOM6-CICE system - 2 threads"
+    CNTL_NAME="RT-Baselines_2d_warm@[ATMRES]"
+    spawn execute {
+        {"@[build%target]", ranks="@[TASKS]", threads="@[THRD]" }
+    }
+} 
+######################################################################## 
+# warm 2d c96 decomp
+
+test cpld_fv3_mom6_cice_2d_decomp: fv3_mom6_cice.exe { 
+    use cpld_fv3_mom6_cice_2d_atm_flux 
+    TEST_DESCR="Fully coupled FV3-MOM6-CICE system - decomp"
+    CNTL_NAME="RT-Baselines_2d_warm@[ATMRES]"
+    INPES='6'
+    JNPES='4'
+} 
+######################################################################## 
 # cold c384
 
 test cpld_fv3_384_mom6_cice_cold_atm_flux: fv3_mom6_cice.exe { 

diff --git a/compsets/hera.input b/compsets/hera.input
@@ -26,8 +26,8 @@ platform hera.intel {
     # INPUTS is the input directory, which should contain fix and parm
     # files, plus any restarts or other inputs.
 
-    BASELINE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/master-20191125"
-    BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/master-20191125"
+    BASELINE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/master-20200128"
+    BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/master-20200128"
     INPUTS="@[BASELINE]"
 
     default_resources={
@@ -61,19 +61,29 @@ platform hera.intel {
         WRTTASK_PER_GROUP=12
     }
     default_cpl={
-        #TASKS=320
-        TASKS=320
+        TASKS=318
         TPN=40
         INPES=3
         JNPES=8
         THRD=1
-        WRTTASK_PER_GROUP=8
+        WRTTASK_PER_GROUP=6
         med_petlist_bounds="0 143"
-        atm_petlist_bounds="0 151"
-        #ocn_petlist_bounds="150 271"
-        #ice_petlist_bounds="272 319"
-        ocn_petlist_bounds="152 271"
-        ice_petlist_bounds="272 319"
+        atm_petlist_bounds="0 149"
+        ocn_petlist_bounds="150 269"
+        ice_petlist_bounds="270 317"
+    }
+
+    default_cpl_threaded_resources={
+        TASKS=246
+        TPN=40
+        INPES=3
+        JNPES=4
+        THRD=2
+        WRTTASK_PER_GROUP=6
+        med_petlist_bounds="0 77"
+        atm_petlist_bounds="0 77"
+        ocn_petlist_bounds="78 197"
+        ice_petlist_bounds="198 245"
     }
 
     default_cpl_benchmark={
@@ -83,7 +93,7 @@ platform hera.intel {
         JNPES=8
         THRD=1
         WRTTASK_PER_GROUP=24
-        med_petlist_bounds="0 279"
+        med_petlist_bounds="0 287"
         atm_petlist_bounds="0 311"
         ocn_petlist_bounds="312 431"
         ice_petlist_bounds="432 479"

diff --git a/compsets/wcoss.input b/compsets/wcoss.input
@@ -26,8 +26,8 @@ platform wcoss.phase2 {
     LONG_TEST_QUEUE='&LONGQ;'
     BUILD_QUEUE='&BUILDQ;'
     MACHINE_ID='wcoss.phase2'
-    BASELINE="/nems/noscrub/emc.nemspara/RT/FV3-MOM6-CICE5/master-20191125"
-    BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/FV3-MOM6-CICE5/master-20191125"
+    BASELINE="/nems/noscrub/emc.nemspara/RT/FV3-MOM6-CICE5/master-20200128"
+    BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/FV3-MOM6-CICE5/master-20200128"
 
     default_resources={
         #TPN=8
@@ -253,8 +253,8 @@ platform wcoss_dell_p3 {
     LONG_TEST_QUEUE='&LONGQ;'
     BUILD_QUEUE='&BUILDQ;'
 
-    BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/FV3-MOM6-CICE5/master-20191025"
-    BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/FV3-MOM6-CICE5/master-20191025"
+    BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/FV3-MOM6-CICE5/master-20200128"
+    BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/FV3-MOM6-CICE5/master-20200128"
 
     default_resources={
         TASKS=156
@@ -374,8 +374,8 @@ platform wcoss.cray {
     BUILD_WALLTIME="3600"
     DEFAULT_TEST_WALLTIME=1800
 
-    BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/FV3-MOM6-CICE5/master-20191025"
-    BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/FV3-MOM6-CICE5/master-20191025"
+    BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/FV3-MOM6-CICE5/master-20200128"
+    BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/FV3-MOM6-CICE5/master-20200128"
 
     execution_time_modules=[[[
       module load alps

diff --git a/conf/configure.fv3.cheyenne.intel b/conf/configure.fv3.cheyenne.intel
@@ -130,7 +130,7 @@ endif
 
 FFLAGS_OPT = -O2 -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3
 FFLAGS_REPRO = -O2 -debug minimal -fp-model consistent -qoverride-limits -g -traceback
-FFLAGS_DEBUG = -g -O0 -check all -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv
+FFLAGS_DEBUG = -g -O0 -check all -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv 
 
 TRANSCENDENTALS := -fast-transcendentals
 FFLAGS_OPENMP = -qopenmp

diff --git a/conf/configure.fv3.hera.intel b/conf/configure.fv3.hera.intel
@@ -108,7 +108,7 @@ endif
 
 FFLAGS_OPT = -O2 -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3
 FFLAGS_REPRO = -O2 -debug minimal -fp-model consistent -qoverride-limits -g -traceback
-FFLAGS_DEBUG = -g -O0 -check all -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv
+FFLAGS_DEBUG = -g -O0 -check all -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv 
 
 TRANSCENDENTALS := -fast-transcendentals
 FFLAGS_OPENMP = -qopenmp

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.cheyenne.intel b/conf/configure.fv3_coupled.cheyenne.intel
@@ -130,7 +130,7 @@ endif
 
 FFLAGS_OPT = -O2 -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3
 FFLAGS_REPRO = -O2 -debug minimal -fp-model consistent -qoverride-limits -g -traceback
-FFLAGS_DEBUG = -g -O0 -check all -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv
+FFLAGS_DEBUG = -g -O0 -check all -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv -link_mpi=dbg
 
 TRANSCENDENTALS := -fast-transcendentals
 FFLAGS_OPENMP = -qopenmp

diff --git a/conf/configure.fv3_coupled.hera.intel b/conf/configure.fv3_coupled.hera.intel
@@ -108,7 +108,7 @@ endif
 
 FFLAGS_OPT = -O2 -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3
 FFLAGS_REPRO = -O2 -debug minimal -fp-model consistent -qoverride-limits -g -traceback
-FFLAGS_DEBUG = -g -O0 -check all -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv
+FFLAGS_DEBUG = -g -O0 -check all -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -traceback -ftrapuv -link_mpi=dbg
 
 TRANSCENDENTALS := -fast-transcendentals
 FFLAGS_OPENMP = -qopenmp

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/coupledFV3_MOM6_CICE_debug.appBuilder b/coupledFV3_MOM6_CICE_debug.appBuilder
@@ -0,0 +1,5 @@
+# Coupled FV3-MOM6-CICE
+#
+## NEMS Application Builder file
+
+COMPONENTS=( FMS FV3%DEBUG=Y MOM6%DEBUG=Y CICE%DEBUG=Y )
+3 −3		lanl_cice/bld/Macros.Linux.NEMS.cheyenne
+3 −5		lanl_cice/bld/Macros.Linux.NEMS.hera
+12 −0		lanl_cice/comp_ice.backend
+1 −0		.gitignore
+2 −0		.gitmodules
+130 −0		CMakeLists.txt
+1 −1		atmos_cubed_sphere
+29 −7		atmos_model.F90
+28 −15		ccpp/CMakeLists.txt
+1 −1		ccpp/build_ccpp.sh
+20 −1		ccpp/config/ccpp_prebuild_config.py
+27 −0		ccpp/driver/CMakeLists.txt
+1 −1		ccpp/framework
+1 −1		ccpp/physics
+1 −1		ccpp/suites/suite_FV3_CPT_v0.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017.xml
+88 −0		ccpp/suites/suite_FV3_GFS_2017_coupled.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_csawmg.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_csawmgshoc.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_gfdlmp.xml
+1 −2		ccpp/suites/suite_FV3_GFS_2017_gfdlmp_noahmp.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional_c768.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_h2ophys.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_myj.xml
+1 −0		ccpp/suites/suite_FV3_GFS_2017_ntiedtke.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_ozphys_2015.xml
+93 −0		ccpp/suites/suite_FV3_GFS_2017_sas.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_satmedmf.xml
+89 −0		ccpp/suites/suite_FV3_GFS_2017_satmedmfq.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_shinhong.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_stretched.xml
+1 −1		ccpp/suites/suite_FV3_GFS_2017_ysu.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v15.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v15_gf.xml
+1 −0		ccpp/suites/suite_FV3_GFS_v15_gf_thompson.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v15_mynn.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v15_thompson.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v15_thompson_mynn.xml
+94 −0		ccpp/suites/suite_FV3_GFS_v15p2.xml
+1 −1		ccpp/suites/suite_FV3_GFS_v15plus.xml
+94 −0		ccpp/suites/suite_FV3_GFS_v16beta.xml
+83 −0		ccpp/suites/suite_FV3_GSD_SAR.xml
+1 −0		ccpp/suites/suite_FV3_GSD_noah.xml
+1 −0		ccpp/suites/suite_FV3_GSD_v0.xml
+2 −2		ccpp/suites/suite_FV3_GSD_v0_drag_suite.xml
+87 −0		ccpp/suites/suite_FV3_HAFS_ferhires_update_moist.xml
+12 −0		cpl/CMakeLists.txt
+12 −6		fv3_cap.F90
+228 −0		gfsphysics/CMakeLists.txt
+13 −0		gfsphysics/GFS_layer/GFS_diagnostics.F90
+62 −10		gfsphysics/GFS_layer/GFS_driver.F90
+385 −113		gfsphysics/GFS_layer/GFS_physics_driver.F90
+55 −14		gfsphysics/GFS_layer/GFS_radiation_driver.F90
+5 −5		gfsphysics/GFS_layer/GFS_restart.F90
+252 −71		gfsphysics/GFS_layer/GFS_typedefs.F90
+290 −89		gfsphysics/GFS_layer/GFS_typedefs.meta
+1 −1		gfsphysics/physics/gfdl_cloud_microphys.F90
+0 −0		gfsphysics/physics/module_sf_noahmp_glacier.f90
+0 −0		gfsphysics/physics/module_sf_noahmplsm.f90
+0 −0		gfsphysics/physics/module_wrf_utl.f90
+5 −1		gfsphysics/physics/moninedmf_hafs.f
+0 −0		gfsphysics/physics/noahmp_tables.f90
+14 −14		gfsphysics/physics/samfdeepcnv.f
+7 −4		gfsphysics/physics/satmedmfvdifq.f
+0 −0		gfsphysics/physics/sfc_noahmp_drv.f
+1 −0		gfsphysics/physics/sflx.f
+6 −4		gfsphysics/physics/ugwp_driver_v0.f
+33 −0		io/CMakeLists.txt
+47 −14		io/FV3GFS_io.F90
+1 −1		io/module_write_nemsio.F90
+61 −54		io/module_write_netcdf.F90
+42 −22		io/module_wrt_grid_comp.F90
+77 −16		io/post_gfs.F90
+26 −0		ipd/CMakeLists.txt
+4 −4		makefile
+74 −35		module_fcst_grid_comp.F90
+4 −3		module_fv3_config.F90
+107 −0		namphysics/CMakeLists.txt
+56 −0		stochastic_physics/CMakeLists.txt
+1 −1		src/incmake/component_CICE.mk
+1 −1		src/incmake/component_MOM6.mk
+16 −16		src/module_MEDIATOR.F90