Feature/cice6

src/incmake/component_CICE6.mk

@@ -23,7 +23,7 @@ CPPCICE =
 CICE_ALL_OPTS=\
   COMP_SRCDIR=$(CICE_SRCDIR) \
   COMP_BINDIR=$(CICE_BINDIR) \
-  SITE="$(MACHINE_ID)" \
+  MACHINE_ID="$(MACHINE_ID)" \
   SYSTEM_USERDIR="$(CICE_UFSDIR)" \
   BINDIR="$(CICE_BINDIR)" \
   SRCDIR="$(CICE_SRCDIR)" \

src/incmake/component_MOM6.mk

@@ -3,10 +3,10 @@ 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_SRCDIR?=$(ROOTDIR)/MOM6-interface
+MOM6_BINDIR?=$(ROOTDIR)/MOM6-interface/MOM6_INSTALL
+#MOM6_SRCDIR?=$(ROOTDIR)/MOM6
+#MOM6_BINDIR?=$(ROOTDIR)/MOM6/MOM6_INSTALL
 
 # Make sure the expected directories exist and are non-empty:
 $(call require_dir,$(MOM6_SRCDIR),MOM6 source directory)