Skip to content

Commit

Permalink
Remove IPD (step 1) (#331)
Browse files Browse the repository at this point in the history
Make CCPP=Y the default in tests/compile.sh. Remove CCPP=Y from tests/rt*.conf and adjust formatting.
Update submodule pointer for MOM6 to include PR #341 ("Update MOM6 to GFDL's 20201218 commit")
Add modulefiles/wcoss_cray/fv3_debug (identical to modulefiles/wcoss_cray/fv3)
Fix broken utest (see #348)
  • Loading branch information
climbfuji authored Dec 29, 2020
1 parent fba47b7 commit cfe6ed2
Show file tree
Hide file tree
Showing 25 changed files with 1,593 additions and 1,055 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 147 files
77 changes: 77 additions & 0 deletions modulefiles/wcoss_cray/fv3_debug
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
#%Module######################################################################
##
## NEMS FV3 Prerequisites: Surge and Luna (WCOSS Cray)

proc ModulesHelp {} {
puts stderr "\tcit - loads modules required for building and running FV3 under NEMS on the Cray side of WCOSS"
}

module-whatis "loads NEMS FV3 prerequisites on Surge and Luna"

# NOTE: the "module purge" and loading of the module command are
# handled by the module-setup.sh (or .csh) script.

##
## load programming environment
## this typically includes compiler, MPI and job scheduler
##
module load PrgEnv-intel
module rm intel
module load intel/18.1.163
module rm NetCDF-intel-sandybridge/4.2
module load xt-lsfhpc/9.1.3
module load craype-haswell
module load python/3.6.3
module load cmake/3.16.2
module load gcc/5.3.0
#
module use /usrx/local/dev/modulefiles
module load NetCDF-intel-sandybridge/4.7.4
module load HDF5-parallel-intel-sandybridge/1.10.6

## WCOSS cray for WW3
module load jasper-gnu-sandybridge/1.900.1
module load png-intel-sandybridge/1.2.49
module load zlib-intel-sandybridge/1.2.7
setenv PNG_ROOT /usrx/local/prod//png/1.2.49/intel/sandybridge

##
## NCEP libraries
##
module use /usrx/local/nceplibs/NCEPLIBS/cmake/install/NCEPLIBS-v1.3.0/modules
module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.1
module load g2tmpl/1.9.1
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1

module load gfsio/1.4.1
module load sfcio/1.4.1
module load sigio/2.3.2

module load upp/10.0.0

## WCOSS Cray execution prereqs:
module load rca
module load alps
module load xpmem
module load gni-headers
module load udreg
module load ugni

module use /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
module load esmf/8.1.0bs27

module swap pmi pmi/5.0.11

##
## load cmake
##
setenv CMAKE_C_COMPILER cc
setenv CMAKE_CXX_COMPILER CC
setenv CMAKE_Fortran_COMPILER ftn
setenv CMAKE_Platform wcoss_cray
50 changes: 25 additions & 25 deletions tests/RegressionTests_cheyenne.gnu.log
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Wed Dec 23 13:51:50 MST 2020
Mon Dec 28 14:14:55 MST 2020
Start Regression test


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/fv3_gfdlmp_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_gfdlmp_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_gfdlmp_prod
Checking test 001 fv3_ccpp_gfdlmp results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -51,7 +51,7 @@ Test 001 fv3_ccpp_gfdlmp PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/fv3_gfs_v15p2_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_gfs_v15p2_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/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
Expand Down Expand Up @@ -119,7 +119,7 @@ Test 002 fv3_ccpp_gfs_v15p2 PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/fv3_gfs_v16beta_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_gfs_v16beta_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/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
Expand Down Expand Up @@ -199,7 +199,7 @@ Test 003 fv3_ccpp_gfs_v16beta PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/fv3_gfs_v16beta_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_gfs_v16beta_restart_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_gfs_v16beta_restart_prod
Checking test 004 fv3_ccpp_gfs_v16beta_restart results ....
Comparing phyf048.tile1.nc .........OK
Comparing phyf048.tile2.nc .........OK
Expand Down Expand Up @@ -249,7 +249,7 @@ Test 004 fv3_ccpp_gfs_v16beta_restart PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/fv3_gfs_v16beta_stochy_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_gfs_v16beta_stochy_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_gfs_v16beta_stochy_prod
Checking test 005 fv3_ccpp_gfs_v16beta_stochy results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -317,7 +317,7 @@ Test 005 fv3_ccpp_gfs_v16beta_stochy PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/fv3_gfs_v16beta_flake_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_gfs_v16beta_flake_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_gfs_v16beta_flake_prod
Checking test 006 fv3_ccpp_gfs_v16beta_flake results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -385,7 +385,7 @@ Test 006 fv3_ccpp_gfs_v16beta_flake PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/fv3_gfs_v15p2_RRTMGP_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_gfs_v15p2_RRTMGP_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_gfs_v15p2_RRTMGP_prod
Checking test 007 fv3_ccpp_gfs_v15p2_RRTMGP results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -453,7 +453,7 @@ Test 007 fv3_ccpp_gfs_v15p2_RRTMGP PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/fv3_gfs_v16beta_RRTMGP_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_gfs_v16beta_RRTMGP_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_gfs_v16beta_RRTMGP_prod
Checking test 008 fv3_ccpp_gfs_v16beta_RRTMGP results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -521,7 +521,7 @@ Test 008 fv3_ccpp_gfs_v16beta_RRTMGP PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/fv3_gsd_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_gsd_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_gsd_prod
Checking test 009 fv3_ccpp_gsd results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -613,7 +613,7 @@ Test 009 fv3_ccpp_gsd PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/fv3_thompson_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_thompson_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_thompson_prod
Checking test 010 fv3_ccpp_thompson results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -681,7 +681,7 @@ Test 010 fv3_ccpp_thompson PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/fv3_thompson_no_aero_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_thompson_no_aero_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_thompson_no_aero_prod
Checking test 011 fv3_ccpp_thompson_no_aero results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -749,7 +749,7 @@ Test 011 fv3_ccpp_thompson_no_aero PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/fv3_rrfs_v1beta_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_rrfs_v1beta_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_rrfs_v1beta_prod
Checking test 012 fv3_ccpp_rrfs_v1beta results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -817,7 +817,7 @@ Test 012 fv3_ccpp_rrfs_v1beta PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/HAFS_v0_HWRF_thompson_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_HAFS_v0_hwrf_thompson_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_HAFS_v0_hwrf_thompson_prod
Checking test 013 fv3_ccpp_HAFS_v0_hwrf_thompson results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -885,7 +885,7 @@ Test 013 fv3_ccpp_HAFS_v0_hwrf_thompson PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/ESG_HAFS_v0_HWRF_thompson_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_prod
Checking test 014 fv3_ccpp_esg_HAFS_v0_hwrf_thompson results ....
Comparing atmos_4xdaily.nc .........OK
Comparing phyf000.nc .........OK
Expand All @@ -903,7 +903,7 @@ Test 014 fv3_ccpp_esg_HAFS_v0_hwrf_thompson PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/fv3_control_debug_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_control_debug_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_control_debug_prod
Checking test 015 fv3_ccpp_control_debug results ....
Comparing phyf000.tile1.nc .........OK
Comparing phyf000.tile2.nc .........OK
Expand Down Expand Up @@ -933,7 +933,7 @@ Test 015 fv3_ccpp_control_debug PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/fv3_gfs_v15p2_debug_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_gfs_v15p2_debug_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_gfs_v15p2_debug_prod
Checking test 016 fv3_ccpp_gfs_v15p2_debug results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -1001,7 +1001,7 @@ Test 016 fv3_ccpp_gfs_v15p2_debug PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/fv3_gfs_v16beta_debug_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_gfs_v16beta_debug_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_gfs_v16beta_debug_prod
Checking test 017 fv3_ccpp_gfs_v16beta_debug results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -1069,7 +1069,7 @@ Test 017 fv3_ccpp_gfs_v16beta_debug PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/fv3_gfs_v15p2_RRTMGP_debug_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_gfs_v15p2_RRTMGP_debug_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_gfs_v15p2_RRTMGP_debug_prod
Checking test 018 fv3_ccpp_gfs_v15p2_RRTMGP_debug results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -1137,7 +1137,7 @@ Test 018 fv3_ccpp_gfs_v15p2_RRTMGP_debug PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/fv3_gfs_v16beta_RRTMGP_debug_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_gfs_v16beta_RRTMGP_debug_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_gfs_v16beta_RRTMGP_debug_prod
Checking test 019 fv3_ccpp_gfs_v16beta_RRTMGP_debug results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -1205,7 +1205,7 @@ Test 019 fv3_ccpp_gfs_v16beta_RRTMGP_debug PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/fv3_multigases_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_multigases_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_multigases_prod
Checking test 020 fv3_ccpp_multigases results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -1279,7 +1279,7 @@ Test 020 fv3_ccpp_multigases PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/HAFS_v0_HWRF_thompson_debug_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_HAFS_v0_hwrf_thompson_debug_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_HAFS_v0_hwrf_thompson_debug_prod
Checking test 021 fv3_ccpp_HAFS_v0_hwrf_thompson_debug results ....
Comparing atmos_4xdaily.tile1.nc .........OK
Comparing atmos_4xdaily.tile2.nc .........OK
Expand Down Expand Up @@ -1347,7 +1347,7 @@ Test 021 fv3_ccpp_HAFS_v0_hwrf_thompson_debug PASS


baseline dir = /glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs/develop-20201223/GNU/ESG_HAFS_v0_HWRF_thompson_debug_ccpp
working dir = /glade/scratch/worthen/FV3_RT/rt_36233/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug_prod
working dir = /glade/scratch/heinzell/FV3_RT/rt_34034/fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug_prod
Checking test 022 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug results ....
Comparing atmos_4xdaily.nc .........OK
Comparing phyf000.nc .........OK
Expand All @@ -1365,5 +1365,5 @@ Test 022 fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug PASS


REGRESSION TEST WAS SUCCESSFUL
Wed Dec 23 14:09:19 MST 2020
Elapsed time: 00h:17m:29s. Have a nice day!
Mon Dec 28 14:37:08 MST 2020
Elapsed time: 00h:22m:14s. Have a nice day!
Loading

0 comments on commit cfe6ed2

Please sign in to comment.