Skip to content

cice6 compile (#71) #34

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

Merged
DeniseWorthen merged 1 commit into from
Jul 27, 2020
Merged

cice6 compile (#71) #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/incmake/component_CICE6.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ cice6_mk=$(CICE_BINDIR)/cice6.mk
all_component_mk_files+=$(cice6_mk)

# Location of source code and installation
CICE_SRCDIR?=$(ROOTDIR)/CICE6
CICE_UFSDIR?=$(ROOTDIR)/CICE6/forapps/ufs
CICE_BINDIR?=$(ROOTDIR)/CICE6_INSTALL
CICE_SRCDIR?=$(ROOTDIR)/CICE-interface/CICE
CICE_UFSDIR?=$(ROOTDIR)/CICE-interface/CICE/configuration/scripts/forapps/ufs
CICE_BINDIR?=$(ROOTDIR)/CICE-interface/CICE_INSTALL

# NEMS_GRID was found in CICE and defaults to a low-res GSM grid
# This is obsolete and perhaps should be removed.
Expand Down Expand Up @@ -49,6 +49,7 @@ 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) ; \
Expand Down
4 changes: 2 additions & 2 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,8 @@ mom6_mk = $(MOM6_BINDIR)/mom6.mk
all_component_mk_files+=$(mom6_mk)

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

# Make sure the expected directories exist and are non-empty:
$(call require_dir,$(MOM6_SRCDIR),MOM6 source directory)
Expand Down