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

Wcoss2 #1

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Wcoss2 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
794cd59
Updated conf/configure.fv3_coupled.wcoss_phase2 and
binli2337 Apr 28, 2020
fbf0231
Updated .gitmoduels.
binli2337 Apr 29, 2020
2d8fef4
Updated FV3 and esmf version in modulefiles/wcoss_phase2/fv3_coupled.
binli2337 May 1, 2020
249852d
Updated modulefiles/wcoss_phase2/fv3_coupled.
binli2337 May 1, 2020
1da3e64
Revised compsets/wcoss.input.
binli2337 May 4, 2020
74287b0
Updated FV3 and modulefiles/wcoss_phase2/fv3_coupled.
binli2337 May 9, 2020
eaee9f1
Change WW3 branch to wcoss2 branch.
binli2337 May 10, 2020
3d53e71
Revise modulefiles/wcoss_phase2/fv3_coupled to load module g2.
binli2337 May 10, 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
8 changes: 4 additions & 4 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
url = https://github.com/binli2337/fv3atm
branch = wcoss2
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS.git
Expand All @@ -22,5 +22,5 @@
url = https://github.com/NOAA-EMC/MOM6-interface
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3.git
branch = develop
url = https://github.com/binli2337/WW3.git
branch = wcoss2
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 5 files
+2 −2 .gitmodules
+1 −1 ccpp/CMakeLists.txt
+1 −1 ccpp/build_ccpp.sh
+1 −1 ccpp/framework
+7 −0 ccpp/set_compilers.sh
2 changes: 1 addition & 1 deletion WW3
Open in desktop
Submodule WW3 updated 3 files
+1 −1 model/bin/cmplr.env
+1 −1 model/bin/comp.wcoss_phase2
+1 −1 model/bin/link.wcoss_phase2
19 changes: 17 additions & 2 deletions compsets/wcoss.input
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ platform wcoss.phase2 {
LONG_TEST_QUEUE='&LONGQ;'
BUILD_QUEUE='&BUILDQ;'
MACHINE_ID='wcoss.phase2'
BASELINE="/nems/noscrub/emc.nemspara/RT/FV3-MOM6-CICE5/master-20200228"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/FV3-MOM6-CICE5/master-20200228"
#BASELINE="/nems/noscrub/emc.nemspara/RT/FV3-MOM6-CICE5/master-20200228"
#BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/FV3-MOM6-CICE5/master-20200228"
BASELINE="/nems/noscrub/emc.nemspara/RT/FV3-MOM6-CICE5/update-20200504"
BASELINE_TEMPLATE="/nems/noscrub/emc.nemspara/RT/FV3-MOM6-CICE5/update-20200504"

default_resources={
#TPN=8
Expand Down Expand Up @@ -96,6 +98,19 @@ platform wcoss.phase2 {
ocn_petlist_bounds="312 551"
ice_petlist_bounds="552 599"
}
default_cpl_wwav={
TASKS=520
TPN=40
INPES=6
JNPES=8
THRD=1
WRTTASK_PER_GROUP=24
med_petlist_bounds="0 287"
atm_petlist_bounds="0 311"
ocn_petlist_bounds="312 431"
ice_petlist_bounds="432 479"
wav_petlist_bounds="480 519"
}

embed bash detect [[[
# This function is used at PARSE TIME to detect whether we are
Expand Down
7 changes: 7 additions & 0 deletions conf/configure.fv3_coupled.wcoss_phase2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,13 @@ FFLAGS += $(FFLAGS_VERBOSE)
LDFLAGS += $(LDFLAGS_VERBOSE)
endif

ifeq ($(CCPP),Y)
CPPDEFS += -DCCPP
CFLAGS += -I$(PATH_CCPP)/include
FFLAGS += -I$(PATH_CCPP)/include
LDFLAGS += -L$(PATH_CCPP)/lib -lccppphys -lccpp $(NCEPLIBS) -lxml2
endif

ifneq ($(findstring NetCDF/4,$(LOADEDMODULES)),)
LIBS += -lnetcdff -lhdf5 $(Z_LIB)
else
Expand Down
37 changes: 13 additions & 24 deletions modulefiles/wcoss_phase2/fv3_coupled
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,42 +11,31 @@ module-whatis "loads NEMS FV3 prerequisites on Gyre and Tide"
# NOTE: the "module purge" and loading of the module command are
# handled by the module-setup.sh (or .csh) script.

module use /usrx/local/dev/modulefiles
module load cmake/3.6.2

module use /usrx/local/dev/modulefiles/

##
## load programming environment
## this typically includes compiler, MPI and job scheduler
##
module load ics/16.0.3
module load ibmpe
module use /usrx/local/modulefiles
module load ips/18.0.1.163
module load NetCDF
module load lsf
module load python/2.7.14

# Build scripts want static linking, but the /usr version of libz is
# only dynamic. We'll use the nwprod version instead.
module load z

# Execution requirements
module load lsf

# WW3 grib
module use -a /nwprod2/lib/modulefiles
module load jasper/v1.900.1
module load png/v1.2.44
module load z/v1.2.6
module load crtm/v2.2.4

module use -a /nceplibs/NCEPLIBS/modulefiles
module load g2/3.1.1
##
### load nceplibs libraries
###
module use -a /usrx/local/nceplibs/NCEPLIBS/modulefiles
module load bacio/2.0.3
module load ip/3.0.2
module load sp/2.0.3
module load w3nco/2.0.7
module load w3emc/2.3.1
module load w3emc/2.4.0
module load nemsio/2.2.4
module load g2tmpl/1.6.0
module load crtm/2.3.0
module load g2/3.1.1

#ESMF lib
module use /nems/noscrub/emc.nemspara/soft/modulefiles
module load esmf/8.0.0
module load esmf/8.0.0_intel18