Skip to content

Commit

Permalink
Merge pull request #86 from JeffBeck-NOAA/community_develop
Browse files Browse the repository at this point in the history
Move staging of FV3 module files from stage_static to the run script
  • Loading branch information
JeffBeck-NOAA authored Sep 6, 2019
2 parents 8ec766c + ff33701 commit 7d4500d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
3 changes: 3 additions & 0 deletions scripts/exregional_run_fv3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,9 @@ else
FV3SAR_EXEC="$NEMSfv3gfs_DIR/tests/fv3_32bit.exe"
fi

cp_vrfy $NEMSfv3gfs_DIR/NEMS/src/conf/module-setup.sh.inc $EXPTDIR/module-setup.sh
cp_vrfy $NEMSfv3gfs_DIR/NEMS/src/conf/modules.nems $EXPTDIR/modules.fv3

if [ -f $FV3SAR_EXEC ]; then
print_info_msg_verbose "\
Copying the FV3SAR executable to the run directory..."
Expand Down
7 changes: 5 additions & 2 deletions ush/stage_static.sh
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,9 @@ system/software for handling modules..."
# CCPP-enabled versions of the FV3SAR code use different versions of
# intel and impi, so module-setup.sh must account for this.
#
cp_vrfy $NEMSfv3gfs_DIR/NEMS/src/conf/module-setup.sh.inc $EXPTDIR/module-setup.sh

#JB
# cp_vrfy $NEMSfv3gfs_DIR/NEMS/src/conf/module-setup.sh.inc $EXPTDIR/module-setup.sh
#
# Append the command that adds the path to the CCPP libraries (via the
# shell variable LD_LIBRARY_PATH) to the Lmod initialization script in
Expand Down Expand Up @@ -291,7 +293,8 @@ if [ "$CCPP" = "true" ]; then
Copying to the experiment directory the modulefile required for running
the CCPP-enabled version of the FV3SAR under NEMS..."

cp_vrfy $NEMSfv3gfs_DIR/NEMS/src/conf/modules.nems $EXPTDIR/modules.fv3
#JB
# cp_vrfy $NEMSfv3gfs_DIR/NEMS/src/conf/modules.nems $EXPTDIR/modules.fv3

if [ "$CCPP_phys_suite" = "GFS" ]; then

Expand Down

0 comments on commit 7d4500d

Please sign in to comment.