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

Sm jul272020 #79

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

Sm jul272020 #79

Show file tree
Hide file tree
Changes from 52 commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
f75f80b
creating my NEMS branch in github
SMoorthi-emc Aug 29, 2019
9b5aaf9
after merging with master
SMoorthi-emc Sep 18, 2019
b830e7c
adding restart_dir to the mediator
SMoorthi-emc Sep 19, 2019
6d51164
some comments in compile
SMoorthi-emc Sep 20, 2019
cd06d2b
adding new script to compile
SMoorthi-emc Sep 23, 2019
68e00e3
updating mediator to include rain and snow separately for ocn
SMoorthi-emc Sep 25, 2019
bfd50b1
compile script change
SMoorthi-emc Oct 3, 2019
c60efbb
experiment with mediator restart
SMoorthi-emc Oct 16, 2019
aa40867
after pulling NEMS develop
SMoorthi-emc Oct 24, 2019
a62a575
update to add wave model z0
SMoorthi-emc Nov 1, 2019
ffe7fe8
Merge branch 'develop' of https://github.com/NOAA-EMC/NEMS into SM_No…
SMoorthi-emc Nov 4, 2019
049200b
after merging with NEMS/develop
SMoorthi-emc Nov 4, 2019
86ff2d9
after merging with NEMS develop
SMoorthi-emc Nov 6, 2019
5742a22
adding a new compile script
SMoorthi-emc Jan 16, 2020
bc3799d
updated NEMS mediator
SMoorthi-emc Jan 28, 2020
55d888f
a bug fix in land_mask setting
SMoorthi-emc Feb 4, 2020
babb96d
updating after merging with fractional grid version of mediator
SMoorthi-emc Feb 11, 2020
75b7824
saving some older versions of the mediator
SMoorthi-emc Feb 24, 2020
5827a6e
some mediator cleanups
SMoorthi-emc Feb 25, 2020
8fd2813
creating a new branch
SMoorthi-emc Feb 28, 2020
4493cab
after merging with NEMS/develop branch on feb 28 and updating
SMoorthi-emc Feb 28, 2020
45c8b46
after updating to NOAA-EMC-develop
SMoorthi-emc Mar 3, 2020
0e29a06
using NCP and updated mediator
SMoorthi-emc Mar 21, 2020
971a415
updating main and nems_gridcomp
SMoorthi-emc Mar 22, 2020
38cc08b
adding distclean fix in components_MOM6 and minor cleanup in mediator
SMoorthi-emc Apr 22, 2020
bb9d0bf
Merge remote-tracking branch 'upstream/develop' into develop
SMoorthi-emc Apr 22, 2020
6c05ca7
after merging with NEMS/develop on apr22
SMoorthi-emc Apr 23, 2020
00037ea
Merge remote-tracking branch 'upstream/develop' into develop
SMoorthi-emc Apr 23, 2020
a07fb0a
updated NEMS, but reversed component_CCPP.mk
SMoorthi-emc Apr 23, 2020
1c54e60
small change in component_MOM6.mk
SMoorthi-emc Apr 24, 2020
9100d16
keeping up with NEMS update on apr24
SMoorthi-emc Apr 24, 2020
88f2819
branch doesn't work
SMoorthi-emc Apr 24, 2020
d637578
after merging with NEMS/develop on Apr 28
SMoorthi-emc Apr 28, 2020
0008672
one line change in module_Mediator
SMoorthi-emc May 2, 2020
185dedb
Merge remote-tracking branch 'origin/SM_Apr242020' into SM_Apr282020
SMoorthi-emc May 3, 2020
35ea327
after merging with NEMS develop after static option in ccpp removed
SMoorthi-emc May 4, 2020
24d99b3
updating module_EARTH_GRID_COMP.F90
SMoorthi-emc May 4, 2020
5e82ae6
updated the NEMS mediator not to zero out the accumulator in prep_ocn…
SMoorthi-emc May 6, 2020
605ce53
updating to nems update
SMoorthi-emc May 13, 2020
39fcf70
updating module_EARTH_GRID_COMP.F90
SMoorthi-emc May 24, 2020
1ec2906
after merging with NEMS-develop
SMoorthi-emc May 27, 2020
d7b386c
some cleanup
SMoorthi-emc May 28, 2020
9bc32ba
some minor updates
SMoorthi-emc Jun 2, 2020
15a8158
Merge remote-tracking branch 'upstream/develop' into SM_Jun042020
SMoorthi-emc Jun 4, 2020
68b5023
a cosmetic change
SMoorthi-emc Jun 11, 2020
043f8f9
nems mediator update - include alternate version
SMoorthi-emc Jun 12, 2020
99a4262
adding protection on atmwgt
SMoorthi-emc Jun 29, 2020
ea43fae
fix module_EARTH_GRID_COMP
SMoorthi-emc Jul 24, 2020
94bd0ba
new branch
SMoorthi-emc Jul 30, 2020
a421753
Merge remote-tracking branch 'upstream/develop' into SM_Jul272020
SMoorthi-emc Jul 30, 2020
5044169
modifying component_CICE and component_CICE6 by replacing SITE by MAC…
SMoorthi-emc Aug 18, 2020
4c6933c
removing extra mediator files
SMoorthi-emc Aug 25, 2020
2adeb72
removing old compile scripts
SMoorthi-emc Aug 28, 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
11 changes: 11 additions & 0 deletions compile_cpld.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
make app=coupledFV3_MOM6_CICE distclean
make app=coupledFV3_MOM6_CICE -j 8 build

#
##############################################################
# This builds the coupled model - app version
# Not a 32-bit build, may need to change later for bit-reproducibility checks
#./NEMS/NEMSAppBuilder rebuild app=coupledFV3_MOM6_CICE
#cd ./NEMS/exe
#mv NEMS.x nems_fv3_mom6_cice5.x
##############################################################
11 changes: 11 additions & 0 deletions compile_cpld_ww3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
make app=coupledFV3_MOM6_CICE_WW3 distclean
make app=coupledFV3_MOM6_CICE_WW3 -j 8 build

#
##############################################################
# This builds the coupled model - app version
# Not a 32-bit build, may need to change later for bit-reproducibility checks
#./NEMS/NEMSAppBuilder rebuild app=coupledFV3_MOM6_CICE
#cd ./NEMS/exe
#mv NEMS.x nems_fv3_mom6_cice5.x
##############################################################
11 changes: 11 additions & 0 deletions compile_cpld_ww3_ccpp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
make app=coupledFV3_MOM6_CICE_WW3_CCPP distclean
make app=coupledFV3_MOM6_CICE_WW3_CCPP -j 8 build

#
##############################################################
# This builds the coupled model - app version
# Not a 32-bit build, may need to change later for bit-reproducibility checks
#./NEMS/NEMSAppBuilder rebuild app=coupledFV3_MOM6_CICE
#cd ./NEMS/exe
#mv NEMS.x nems_fv3_mom6_cice5.x
##############################################################
257 changes: 125 additions & 132 deletions src/MAIN_NEMS.F90
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/incmake/component_CCPP.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ endif

# Process make options for CCPP build
ifneq (,$(findstring SUITES=,$(FV3_MAKEOPT)))
# Extract name of suite definition files using sed:
# Extract names of suite definition files using sed:
# - remove everything leading up to the names of the suite definition files
# - remove everything following the names of the suite definition files
SUITES = $(shell echo $(FV3_MAKEOPT) | sed 's/.* SUITES=//' | sed 's/ .*//')
Expand Down
22 changes: 12 additions & 10 deletions src/incmake/component_CICE.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,30 @@ CICE_CAPDIR?=$(ROOTDIR)/CICE_CAP

# NEMS_GRID was found in CICE and defaults to a low-res GSM grid
# This is obsolete and perhaps should be removed.
NEMS_GRID?=T126_mx5
#NEMS_GRID?=T126_mx5
NEMS_GRID?=mx025

# Make sure the expected directories exist and are non-empty:
$(call require_dir,$(CICE_SRCDIR),CICE source directory)
$(call require_dir,$(ROOTDIR)/CICE_CAP,CICE cap directory)

ifneq (,$(findstring CMEPS,$(COMPONENTS)))
CPPCMEPS = -DCMEPS
CPPCMEPS = -DCMEPS
else
CPPCMEPS =
CPPCMEPS =
endif

CICE_ALL_OPTS=\
COMP_SRCDIR=$(CICE_SRCDIR) \
COMP_BINDIR=$(CICE_BINDIR) \
SITE="NEMS.$(MACHINE_ID)" \
CICE_ALL_OPTS= \
COMP_SRCDIR=$(CICE_SRCDIR) \
COMP_BINDIR=$(CICE_BINDIR) \
MACHINE_ID="NEMS.$(MACHINE_ID)" \
SYSTEM_USERDIR="$(CICE_SRCDIR)" \
SRCDIR="$(CICE_SRCDIR)" \
EXEDIR="$(CICE_SRCDIR)" \
CPPCMEPS="$(CPPCMEPS)" \
SRCDIR="$(CICE_SRCDIR)" \
EXEDIR="$(CICE_SRCDIR)" \
CPPCMEPS="$(CPPCMEPS)" \
NEMS_GRID="$(NEMS_GRID)"


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

# Rules for building this component:
Expand Down
21 changes: 10 additions & 11 deletions src/incmake/component_CICE6.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ $(call require_dir,$(CICE_SRCDIR),CICE source directory)
CPPCICE =
#endif

CICE_ALL_OPTS=\
COMP_SRCDIR=$(CICE_SRCDIR) \
COMP_BINDIR=$(CICE_BINDIR) \
SITE="$(MACHINE_ID)" \
CICE6_ALL_OPTS= \
COMP_SRCDIR=$(CICE_SRCDIR) \
COMP_BINDIR=$(CICE_BINDIR) \
MACHINE_ID="$(MACHINE_ID)" \
SYSTEM_USERDIR="$(CICE_UFSDIR)" \
BINDIR="$(CICE_BINDIR)" \
SRCDIR="$(CICE_SRCDIR)" \
EXEDIR="$(CICE_UFSDIR)" \
CPPCICE="$(CPPCICE)" \
BINDIR="$(CICE_BINDIR)" \
SRCDIR="$(CICE_SRCDIR)" \
EXEDIR="$(CICE_UFSDIR)" \
CPPCICE="$(CPPCICE)" \
NEMS_GRID="$(NEMS_GRID)"

########################################################################
Expand All @@ -37,7 +37,7 @@ CICE_ALL_OPTS=\
$(cice6_mk): configure
$(MODULE_LOGIC) ; \
set -eu ; \
export $(CICE_ALL_OPTS) $(CICE_MAKEOPT) ; \
export $(CICE6_ALL_OPTS) $(CICE6_MAKEOPT) ; \
cd $(CICE_UFSDIR) ; \
./comp_ice.backend.libcice
test -f $(cice6_mk)
Expand All @@ -49,10 +49,9 @@ build_CICE6: $(cice6_mk)
# Rules for cleaning the SRCDIR and BINDIR:

clean_CICE6_SRC: configure
cp -n $(MODULE_DIR)/$(CHOSEN_MODULE) $(CONFDIR)/modules.nems ; \
$(MODULE_LOGIC) ; \
set -eu ; \
export $(CICE_ALL_OPTS) $(CICE_MAKEOPT) ; \
export $(CICE6_ALL_OPTS) $(CICE6_MAKEOPT) ; \
cd $(CICE_UFSDIR) ; \
./comp_ice.backend.clean

Expand Down
6 changes: 4 additions & 2 deletions src/incmake/component_FV3.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
fv3_mk=$(FV3_BINDIR)/fv3.mk
all_component_mk_files+=$(fv3_mk)

NCP="/bin/cp"

# Location of source code and installation
FV3_SRCDIR?=$(ROOTDIR)/FV3
FV3_BINDIR?=$(ROOTDIR)/FV3/FV3_INSTALL
Expand Down Expand Up @@ -33,9 +35,9 @@ FV3_FULL_OPTS=\
build_FV3: $(fv3_mk)

$(fv3_mk): $(fms_mk) configure
cp -fp $(NEMSDIR)/src/conf/configure.nems \
$(NCP) -fp $(NEMSDIR)/src/conf/configure.nems \
"$(FV3_SRCDIR)"/conf/configure.fv3
cp -fp $(NEMSDIR)/src/conf/modules.nems \
$(NCP) -fp $(NEMSDIR)/src/conf/modules.nems \
"$(FV3_SRCDIR)"/conf/modules.fv3
$(info Compiling $(FV3_MAKEOPT) into $(FV3_BINDIR) on $(MACHINE_ID))
+$(MODULE_LOGIC) ; cd $(FV3_SRCDIR) ; \
Expand Down
9 changes: 5 additions & 4 deletions src/incmake/component_MOM6.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ mom6_mk = $(MOM6_BINDIR)/mom6.mk
all_component_mk_files+=$(mom6_mk)

# Location of source code and installation
MOM6_SRCDIR?=$(ROOTDIR)/MOM6-interface
MOM6_BINDIR?=$(ROOTDIR)/MOM6-interface/MOM6_INSTALL
MOM6_SRCDIR?=$(ROOTDIR)/MOM6
MOM6_BINDIR?=$(ROOTDIR)/MOM6/MOM6_INSTALL
#MOM6_BINDIR?=$(ROOTDIR)/MOM6_INSTALL

# Make sure the expected directories exist and are non-empty:
$(call require_dir,$(MOM6_SRCDIR),MOM6 source directory)
Expand All @@ -13,9 +14,9 @@ $(call require_dir,$(MOM6_SRCDIR),MOM6 source directory)
build_MOM6: $(mom6_mk)

ifneq (,$(findstring CMEPS,$(COMPONENTS)))
CPPCMEPS = -DCMEPS
CPPCMEPS = -DCMEPS
else
CPPCMEPS =
CPPCMEPS =
endif

MOM6_ALL_OPTS=\
Expand Down
10 changes: 5 additions & 5 deletions src/incmake/configure_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

NCP="/bin/cp"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this? Is cp not working?

$(CONFDIR)/test-results.mk:
+$(MAKE) -f $(NEMSDIR)/src/incmake/tests.mk \
MODULE_LOGIC="$(MODULE_LOGIC)" \
Expand All @@ -10,18 +10,18 @@ $(CONFDIR)/test-results.mk:
# Copy the configure.nems, externals.nems, and ESMFVersionDefine.h

$(CONFDIR)/configure.nems: $(CONFIGURE_NEMS_FILE)
cp $(CONFIGURE_NEMS_FILE) $@
$(NCP) $(CONFIGURE_NEMS_FILE) $@

ifneq ($(EXTERNALS_NEMS_FILE),)
$(CONFDIR)/externals.nems: $(EXTERNALS_NEMS_FILE)
cp $(EXTERNALS_NEMS_FILE) $@
$(NCP) $(EXTERNALS_NEMS_FILE) $@
else
$(CONFDIR)/externals.nems:
cat /dev/null > $@
endif

$(NEMSDIR)/src/ESMFVersionDefine.h:
cp $(ESMF_VERSION_DEFINE) $@
$(NCP) $(ESMF_VERSION_DEFINE) $@

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

Expand All @@ -31,7 +31,7 @@ $(NEMSDIR)/src/ESMFVersionDefine.h:

ifneq ($(CHOSEN_MODULE),)
$(CONFDIR)/modules.nems: $(MODULE_DIR)/$(CHOSEN_MODULE)
cp $(MODULE_DIR)/$(CHOSEN_MODULE) $@
$(NCP) $(MODULE_DIR)/$(CHOSEN_MODULE) $@
else
$(CONFDIR)/modules.nems:
cat /dev/null > $@
Expand Down
Loading