From 3fde542ec80b203c3b85e148d5aeb98e767e3e07 Mon Sep 17 00:00:00 2001 From: Gangsheng Wang Date: Tue, 18 Jul 2017 13:09:16 -0400 Subject: [PATCH 1/5] configure machines/compilers for ALM-PFLOTRAN coupling --- config/acme/machines/config_compilers.xml | 12 ++++++++++++ config/acme/machines/config_machines.xml | 10 ++++++++++ 2 files changed, 22 insertions(+) diff --git a/config/acme/machines/config_compilers.xml b/config/acme/machines/config_compilers.xml index 7abe7270977..1e7362e9c8d 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 + From 1d9a3106abe3cbaede747006b54129cd27865726 Mon Sep 17 00:00:00 2001 From: Gangsheng Wang Date: Tue, 18 Jul 2017 13:12:22 -0400 Subject: [PATCH 2/5] Makefile: update "PETSC_LIB"-"variables" dir for petsc-git-version 1a9d3c3 --- config/acme/machines/Makefile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/config/acme/machines/Makefile b/config/acme/machines/Makefile index 75b11dd70f4..76692158fc1 100644 --- a/config/acme/machines/Makefile +++ b/config/acme/machines/Makefile @@ -251,8 +251,13 @@ 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 + # (UPDATED: 2017-May-19) + # include $(PETSC_PATH)/conf/variables + # 1) petsc-git-version: 1a9d3c3c50abf60098813fdf7291fe3540415115 + # 2) in this petsc package, "PETSC_LIB" contains "-L$LIB_PETSC" + include $(PETSC_PATH)/lib/petsc/conf/variables + endif # Set Trilinos info if it is being used @@ -542,7 +547,10 @@ endif # Add PETSc libraries ifeq ($(strip $(USE_PETSC)), TRUE) - SLIBS += -L${LIB_PETSC} ${PETSC_LIB} + # SLIBS += -L${LIB_PETSC} ${PETSC_LIB} + # 1) petsc-git-version: 1a9d3c3c50abf60098813fdf7291fe3540415115 + # 2) in this petsc package, "PETSC_LIB" contains "-L$LIB_PETSC" + SLIBS += ${PETSC_LIB} endif # Add trilinos libraries; too be safe, we include all libraries included in the trilinos build, @@ -877,7 +885,7 @@ cleanrof: $(RM) -fr $(EXEROOT)/rof/obj cleanlnd: - $(RM) -f $(LIBROOT)/liblnd.a + $(RM) -f $(LIBROOT)/$(LNDLIB) $(RM) -fr $(EXEROOT)/lnd/obj cleancsmshare: From 9442a48b58848d070a90c2685364d7376057f787 Mon Sep 17 00:00:00 2001 From: Gangsheng Wang Date: Thu, 20 Jul 2017 11:44:23 -0400 Subject: [PATCH 3/5] config_machines: delete space in PFLOTRAN configuration for mach 'cades' --- config/acme/machines/config_machines.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/acme/machines/config_machines.xml b/config/acme/machines/config_machines.xml index 25ae6cf896a..c7ac0f53924 100644 --- a/config/acme/machines/config_machines.xml +++ b/config/acme/machines/config_machines.xml @@ -1717,12 +1717,12 @@ - /software/user_tools/current/cades-ccsi/petsc4pf/openmpi-1.10-gcc-5.3 + /software/user_tools/current/cades-ccsi/petsc4pf/openmpi-1.10-gcc-5.3 - FALSE - FALSE + FALSE + FALSE - /lustre/or-hydra/cades-ccsi/$USER/models/pflotran-interface/src/clm-pflotran + /lustre/or-hydra/cades-ccsi/$USER/models/pflotran-interface/src/clm-pflotran From 5c624d6a70c6f6756d5198856e5293342440fb42 Mon Sep 17 00:00:00 2001 From: Gangsheng Wang Date: Tue, 25 Jul 2017 11:45:55 -0400 Subject: [PATCH 4/5] Makefile: delete comments. Update 'PETSC_LIB' dir for petsc-git-version 1a9d3c3. In this version, "PETSC_LIB" contains "-L$LIB_PETSC" --- config/acme/machines/Makefile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/config/acme/machines/Makefile b/config/acme/machines/Makefile index 76692158fc1..ed0eb60e47a 100644 --- a/config/acme/machines/Makefile +++ b/config/acme/machines/Makefile @@ -252,10 +252,6 @@ ifeq ($(strip $(USE_PETSC)), TRUE) endif # Get the "PETSC_LIB" list an env var - # (UPDATED: 2017-May-19) - # include $(PETSC_PATH)/conf/variables - # 1) petsc-git-version: 1a9d3c3c50abf60098813fdf7291fe3540415115 - # 2) in this petsc package, "PETSC_LIB" contains "-L$LIB_PETSC" include $(PETSC_PATH)/lib/petsc/conf/variables endif @@ -547,9 +543,6 @@ endif # Add PETSc libraries ifeq ($(strip $(USE_PETSC)), TRUE) - # SLIBS += -L${LIB_PETSC} ${PETSC_LIB} - # 1) petsc-git-version: 1a9d3c3c50abf60098813fdf7291fe3540415115 - # 2) in this petsc package, "PETSC_LIB" contains "-L$LIB_PETSC" SLIBS += ${PETSC_LIB} endif From 612d0577b50ec626e8f9acfced4b071a434565e7 Mon Sep 17 00:00:00 2001 From: Junqi Yin Date: Fri, 28 Jul 2017 10:00:54 -0400 Subject: [PATCH 5/5] Add a new test for ALM-PFLOTRAN's bgc interface [BFB] --- .../acme/testmods_dirs/allactive/clm/bgcinterface/user_nl_clm | 2 ++ scripts/lib/update_acme_tests.py | 1 + 2 files changed, 3 insertions(+) create mode 100644 config/acme/testmods_dirs/allactive/clm/bgcinterface/user_nl_clm 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 082af66a0fa..1c62d194ff5 100644 --- a/scripts/lib/update_acme_tests.py +++ b/scripts/lib/update_acme_tests.py @@ -72,6 +72,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") ),