Merge branch 'master' into pw/feature/hydrogen_det_ind

NOT YET TESTED
Resolve all conflicts
Rebuild package data
Use master version of util/testing-framework

cvs/objects/build/linux/config.system

@@ -1,18 +1,23 @@
 ## environment for PIC systems
 ## Note you will hava to execute 'module load java' before JAVA_HOME will be set.
+ifeq (deception,$(findstring deception,$(HOSTNAME)))
+GCAMLIB_HOME    = /rcfs/projects/GCAM/GCAM-libraries
+IS_PIC          = 1
+endif
 ifeq (constance,$(findstring constance,$(HOSTNAME)))
 GCAMLIB_HOME    = /pic/projects/GCAM/GCAM-libraries
+IS_PIC          = 1
+endif
+ifeq ($(IS_PIC),1)
 BOOST_INCLUDE   = $(GCAMLIB_HOME)/include
 BOOST_LIB	    = $(GCAMLIB_HOME)/lib/boost
 BOOSTROOT	    = $(GCAMLIB_HOME)/src/boost
 EIGEN_INCLUDE   = $(GCAMLIB_HOME)/include
 TBB_INCLUDE     = $(GCAMLIB_HOME)/include/oneapi
 TBB_LIB	        = $(GCAMLIB_HOME)/lib
-XERCES_INCLUDE  = $(GCAMLIB_HOME)/include
-XERCES_LIB      = $(GCAMLIB_HOME)/lib
 JAVA_INCLUDE    = ${JAVA_HOME}/include
 JAVA_LIB        = ${JAVA_HOME}/jre/lib/amd64/server
-JARS_LIB       = $(GCAMLIB_HOME)/lib/basex-8.6.7/BaseX.jar:$(GCAMLIB_HOME)/lib/jars/*
+JARS_LIB        = $(GCAMLIB_HOME)/lib/jars/*
 ## `module load mkl/15.0.1` will get you the following variables:
 ifdef MLIB_CFLAGS
 MKL_CFLAGS      = $(MLIB_CFLAGS) -fopenmp

cvs/objects/build/linux/configure.gcam

@@ -108,27 +108,23 @@ endif
 ### locations of library include files
 # BOOST_INCLUDE should be set in the user environment on Evergreen by running 'tap boost'.
 BOOSTINC	      = $(BOOST_INCLUDE)
-# Eventually we should be able to get Xerces installed and available by a tap command, 
-# but until then it will have to be set manually
-XERCESINC	      = $(XERCES_INCLUDE)
 
 #
 ### locations of libraries
-LIBDIR		= -L/usr/local/lib -L$(XERCES_LIB) -L$(BUILDPATH) $(JAVALIB) $(TBB_LIBRARY)
+LIBDIR		= -L/usr/local/lib -L$(BUILDPATH) $(JAVALIB) $(TBB_LIBRARY)
 
 ### The rest should be mostly compiler independent
 ## Note $(PROF) will be set as needed if we are building the gcam-prof target
 CPPFLAGS	= $(INCLUDE) $(ARCH_FLAGS) $(JARSLIB) -DGCAM_PARALLEL_ENABLED=$(USE_GCAM_PARALLEL) -DUSE_HECTOR=$(USE_HECTOR) $(MKL_CFLAGS)
 CXXFLAGS        = $(CXXOPTIM) $(CXXBASEOPTS) $(PROF) -MMD -std=c++14 -Wno-deprecated
 FCFLAGS         = $(FCOPTIM) $(FCBASEOPTS) $(PROF)
 LD              = $(CXX) $(PROF)
-LDFLAGS         = $(CXXFLAGS) -Wl,-rpath,$(XERCES_LIB) $(JAVA_RPATH) $(TBB_RPATH) $(MKL_LDFLAGS)
+LDFLAGS         = $(CXXFLAGS) $(JAVA_RPATH) $(TBB_RPATH) $(MKL_LDFLAGS)
 AR              = ar ru
 #MAKE            = make -i -r
 RANLIB          = ranlib
-LIB             = ${ENVLIBS} $(LIBDIR) -lxerces-c $(JAVALINK) $(HECTOR_LIB) $(TBB_LIB_IMPORT) -lm
+LIB             = ${ENVLIBS} $(LIBDIR) $(JAVALINK) $(HECTOR_LIB) $(TBB_LIB_IMPORT) -lm
 INCLUDE         = -I$(BOOSTINC) $(JAVAINC) $(TBB_INC) $(HECTOR_INCLUDE) -I$(EIGEN_INCLUDE) \
-		 -I$(XERCESINC) \
 		 -I${PATHOFFSET} \
 		 -I${HOME}/include