diff --git a/config/acme/machines/Makefile b/config/acme/machines/Makefile
index e5e7608facf..701cd2add73 100644
--- a/config/acme/machines/Makefile
+++ b/config/acme/machines/Makefile
@@ -251,8 +251,9 @@ ifeq ($(strip $(USE_PETSC)), TRUE)
$(error PETSC_PATH must be defined when USE_PETSC is TRUE)
endif
- # Get the "PETSC_LIB" list an env var
- include $(PETSC_PATH)/conf/variables
+ # Get the "PETSC_LIB" list an env var
+ include $(PETSC_PATH)/lib/petsc/conf/variables
+
endif
# Set Trilinos info if it is being used
@@ -564,7 +565,7 @@ endif
# Add PETSc libraries
ifeq ($(strip $(USE_PETSC)), TRUE)
- SLIBS += -L${LIB_PETSC} ${PETSC_LIB}
+ SLIBS += ${PETSC_LIB}
endif
# Add trilinos libraries; too be safe, we include all libraries included in the trilinos build,
@@ -904,7 +905,7 @@ cleanrof:
$(RM) -fr $(EXEROOT)/rof/obj
cleanlnd:
- $(RM) -f $(LIBROOT)/liblnd.a
+ $(RM) -f $(LIBROOT)/$(LNDLIB)
$(RM) -fr $(EXEROOT)/lnd/obj
cleancsmshare:
diff --git a/config/acme/machines/config_compilers.xml b/config/acme/machines/config_compilers.xml
index 05d7cc5c753..91039fc856f 100644
--- a/config/acme/machines/config_compilers.xml
+++ b/config/acme/machines/config_compilers.xml
@@ -82,6 +82,18 @@ for mct, etc.
-D_USE_FLOW_CONTROL
+
+
+
+
+ -I$(CLM_PFLOTRAN_SOURCE_DIR)
+ -DCLM_PFLOTRAN
+ -DCOLUMN_MODE
+ -L$(CLM_PFLOTRAN_SOURCE_DIR) -lpflotran $(PETSC_LIB)
+
+
+
+
+
+ /software/user_tools/current/cades-ccsi/petsc4pf/openmpi-1.10-gcc-5.3
+
+ FALSE
+ FALSE
+
+ /lustre/or-hydra/cades-ccsi/$USER/models/pflotran-interface/src/clm-pflotran
+
diff --git a/config/acme/testmods_dirs/allactive/clm/bgcinterface/user_nl_clm b/config/acme/testmods_dirs/allactive/clm/bgcinterface/user_nl_clm
new file mode 100644
index 00000000000..2b5ce849209
--- /dev/null
+++ b/config/acme/testmods_dirs/allactive/clm/bgcinterface/user_nl_clm
@@ -0,0 +1,2 @@
+use_clm_interface = .true.
+use_clm_bgc = .true.
diff --git a/scripts/lib/update_acme_tests.py b/scripts/lib/update_acme_tests.py
index 0207dfd1e38..de1e98a3b1f 100644
--- a/scripts/lib/update_acme_tests.py
+++ b/scripts/lib/update_acme_tests.py
@@ -73,6 +73,7 @@
("SMS_Ld4.f45_f45.ICLM45ED","clm-fates"),
("ERS.f19_g16.I1850CLM45","clm-betr"),
("ERS.f19_g16.I1850CLM45","clm-vst"),
+ ("ERS.f09_g16.I1850CLM45CN","clm-bgcinterface"),
"ERS.ne11_oQU240.I20TRCLM45",
"ERS.f09_g16.IMCLM45BC")
),