Skip to content

Commit

Permalink
Additional commits based on code review, will be merged into original…
Browse files Browse the repository at this point in the history 
… comit b06b41d and reworded once PR is approved
  • Loading branch information
@climbfuji
climbfuji committed Oct 21, 2019
1 parent b06b41d commit 2e00b1a
Show file tree
Hide file tree
Showing 17 changed files with 127,089 additions and 13,072 deletions.
10 changes: 6 additions & 4 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
url = https://github.com/climbfuji/fv3atm
branch = update_fv3atm_with_changes_from_gmtb_develop_as_of_20191016
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
branch = develop
[submodule "ccpp/framework"]
path = ccpp/framework
url = https://github.com/NCAR/ccpp-framework
url = https://github.com/climbfuji/ccpp-framework
branch = update_master_from_gmtb_develop_20191016
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
url = https://github.com/climbfuji/ccpp-physics
branch = update_master_from_gmtb_develop_20191016
[submodule "FMS"]
path = FMS
url = https://github.com/NOAA-EMC/FMS
Expand Down
2 changes: 1 addition & 1 deletion FMS
Submodule FMS updated 1 files
+1 −1 mpp/include/mpp_io_write.inc
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 3 files
+2 −2 .gitmodules
+1 −1 gfsphysics/physics/GFS_debug.F90
+4 −6 io/FV3GFS_io.F90
3 changes: 2 additions & 1 deletion ccpp/build_ccpp.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ set -eu
VALID_MACHINES=( wcoss_cray wcoss_dell_p3 gaea.intel jet.intel \
hera.intel \
cheyenne.intel cheyenne.intel-impi cheyenne.gnu cheyenne.pgi endeavor.intel \
stampede.intel supermuc_phase2.intel macosx.gnu linux.gnu )
stampede.intel supermuc_phase2.intel macosx.gnu \
linux.intel linux.gnu linux.pgi )

###################################################################################################

Expand Down
2 changes: 1 addition & 1 deletion ccpp/framework
Submodule framework updated 3 files
+4 −3 scripts/ccpp_prebuild.py
+2 −2 scripts/common.py
+4 −3 scripts/metadata2html.py
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 2 files
+8 −16 physics/sfc_drv_ruc.F90
+5 −32 physics/sfc_drv_ruc.meta
8 changes: 7 additions & 1 deletion ccpp/set_compilers.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,18 @@ case "$MACHINE_ID" in
macosx.gnu)
# set in generic modulefile
;;
linux.intel)
# set in generic modulefile
;;
linux.gnu)
# set in generic modulefile
;;
linux.pgi)
# set in generic modulefile
;;
*)
echo "ERROR: MACHINE_ID ${MACHINE_ID} not configured in set_compilers.sh"
exit 1
esac

echo "Compilers set for ${MACHINE_ID}."
echo "Compilers set for ${MACHINE_ID}."
4 changes: 2 additions & 2 deletions compsets/gaea.input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ gaea.common= {
MACHINE_ID='gaea.intel'
HOMEnems=PWD_UP5
HOMErt=OUTPUT_PATH
BASELINE="/lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/trunk-20190613"
BASELINE_TEMPLATE="/lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/trunk-20190613"
BASELINE="/lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/trunk-20191021"
BASELINE_TEMPLATE="/lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs/trunk-20191021"
INPUTS="@[BASELINE]"

SHORT_TEST_QUEUE='&SHORTQ;'
Expand Down
4 changes: 2 additions & 2 deletions compsets/hera.input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/NEMSfv3gfs/trunk-20190925"
BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/trunk-20190925"
BASELINE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/trunk-20191021"
BASELINE_TEMPLATE="/scratch1/NCEPDEV/nems/emc.nemspara/RT/NEMSfv3gfs/trunk-20191021"
INPUTS="@[BASELINE]"

default_resources={
Expand Down
16 changes: 8 additions & 8 deletions compsets/wcoss.input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ platform wcoss.phase2 {
LONG_TEST_QUEUE='&LONGQ;'
BUILD_QUEUE='&BUILDQ;'
MACHINE_ID='wcoss.phase2'
BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190925"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190925"
BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191021"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191021"

default_resources={
TASKS=156
Expand Down Expand Up @@ -121,8 +121,8 @@ platform wcoss.phase1 {
cores_per_node=16
cpus_per_core=2
MACHINE_ID='wcoss.phase1'
BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190925"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190925"
BASELINE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191021"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191021"

# WCOSS Phase 2 has been slow of late.
DEFAULT_TEST_WALLTIME=2700
Expand Down Expand Up @@ -206,8 +206,8 @@ platform wcoss_dell_p3 {
LONG_TEST_QUEUE='&LONGQ;'
BUILD_QUEUE='&BUILDQ;'

BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190925"
BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190925"
BASELINE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191021"
BASELINE_TEMPLATE="/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191021"

default_resources={
TASKS=156
Expand Down Expand Up @@ -304,8 +304,8 @@ platform wcoss.cray {
BUILD_WALLTIME="3600"
DEFAULT_TEST_WALLTIME=1800

BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190925"
BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20190925"
BASELINE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191021"
BASELINE_TEMPLATE="/gpfs/hps3/emc/nems/noscrub/emc.nemspara/RT/NEMSfv3gfs/trunk-20191021"

execution_time_modules=[[[
module load alps
Expand Down
38,532 changes: 35,032 additions & 3,500 deletions tests/Compile_cheyenne.gnu.log
View file

Large diffs are not rendered by default.

89,144 changes: 85,526 additions & 3,618 deletions tests/Compile_cheyenne.intel.log
View file

Large diffs are not rendered by default.

4,704 changes: 0 additions & 4,704 deletions tests/Compile_cheyenne.pgi.log
View file

This file was deleted.

Loading

0 comments on commit 2e00b1a

Please sign in to comment.