Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove IPD (step 1) #331

Merged
merged 18 commits into from
Dec 29, 2020
Merged

Remove IPD (step 1) #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3d7e07b
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Dec 15, 2020
ed5869b
Make CCPP=Y the default in tests/compile.sh; remove CCPP=Y from tests…
climbfuji Dec 15, 2020
0b2bab5
Bugfix in compile.sh: CCPP_SUITES argument not extracted correctly if…
climbfuji Dec 15, 2020
01758ac
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Dec 15, 2020
999036b
Update submodule pointer for fv3atm
climbfuji Dec 16, 2020
79fd1f7
Bugfix in tests/rt.sh: CCPP=Y is no longer part of MAKEOPT
climbfuji Dec 16, 2020
6c3e5fa
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Dec 18, 2020
ba6e1fd
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Dec 28, 2020
f696c87
Update submodule pointer for MOM6 to point to current head of dev/emc…
climbfuji Dec 28, 2020
6733f63
Update submodule pointer for fv3atm; skip-ci
climbfuji Dec 28, 2020
1bed095
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Dec 28, 2020
ad32c94
Fix unit tests
climbfuji Dec 28, 2020
674b865
Unit test logs for hera.intel (update) and hera.gnu (new)
climbfuji Dec 28, 2020
89bb44a
Copy modulefiles/wcoss_cray/fv3 to modulefiles/wcoss_cray/fv3_debug
climbfuji Dec 28, 2020
f594dff
Regression test logs for cheyenne.gnu, cheyenne.intel, gaea.intel, he…
climbfuji Dec 29, 2020
8503101
Increase wallclock time for fv3_ccpp_regional_quilt and fv3_ccpp_regi…
climbfuji Dec 29, 2020
4b9e8a0
Regression test logs for jet.intel and wcoss_cray; skip-ci
climbfuji Dec 29, 2020
68805a8
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Dec 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 147 files
2 changes: 1 addition & 1 deletion MOM6-interface/MOM6
Open in desktop
Submodule MOM6 updated 19 files
+13 −19 config_src/mct_driver/mom_ocean_model_mct.F90
+25 −27 config_src/mct_driver/mom_surface_forcing_mct.F90
+25 −25 config_src/mct_driver/ocn_comp_mct.F90
+2 −2 config_src/nuopc_driver/mom_cap.F90
+18 −19 src/ALE/MOM_remapping.F90
+1 −1 src/core/MOM.F90
+35 −1 src/diagnostics/MOM_diagnostics.F90
+13 −13 src/diagnostics/MOM_sum_output.F90
+1 −1 src/framework/MOM_diag_vkernels.F90
+8 −9 src/framework/MOM_document.F90
+2 −3 src/framework/MOM_file_parser.F90
+4 −0 src/framework/MOM_io.F90
+1 −1 src/framework/MOM_random.F90
+8 −9 src/framework/MOM_string_functions.F90
+3 −3 src/initialization/MOM_grid_initialize.F90
+6 −6 src/initialization/MOM_shared_initialization.F90
+584 −759 src/tracer/MOM_lateral_boundary_diffusion.F90
+8 −11 src/tracer/MOM_neutral_diffusion.F90
+5 −4 src/tracer/MOM_tracer_hor_diff.F90
77 changes: 77 additions & 0 deletions modulefiles/wcoss_cray/fv3_debug
View file
Open in desktop
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
View file
Open in desktop
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