From 3f3c8d0a9f46b10002553c46eab9fe0163c12c2b Mon Sep 17 00:00:00 2001 From: Denise Worthen Date: Mon, 27 Jul 2020 08:38:50 -0400 Subject: [PATCH] cice6 compile (#71) * update cice6 component mk * update path for forapps/ufs * update paths to MOM6 and CICE interfaces (#33) Co-authored-by: Rahul Mahajan --- src/incmake/component_CICE6.mk | 7 ++++--- src/incmake/component_MOM6.mk | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/incmake/component_CICE6.mk b/src/incmake/component_CICE6.mk index 7bf26c86..7e1b1d36 100644 --- a/src/incmake/component_CICE6.mk +++ b/src/incmake/component_CICE6.mk @@ -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. @@ -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) ; \ diff --git a/src/incmake/component_MOM6.mk b/src/incmake/component_MOM6.mk index 0b03dee4..cf733335 100644 --- a/src/incmake/component_MOM6.mk +++ b/src/incmake/component_MOM6.mk @@ -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)