Merge branch 'develop' into release/MAPL-v3

CMakeLists.txt

@@ -9,6 +9,13 @@ ecbuild_add_executable (
 # To fix this, we explicitly set the linker language to Fortran.
 set_target_properties (GEOSgcm.x PROPERTIES LINKER_LANGUAGE Fortran)
 
+# Using JeMalloc will be optional, default OFF
+option (USE_JEMALLOC "Use JeMalloc" OFF)
+if (USE_JEMALLOC)
+  find_package (JeMalloc REQUIRED)
+  target_link_libraries (GEOSgcm.x JeMalloc::JeMalloc)
+endif ()
+
 ecbuild_add_executable (
   TARGET idfupd.x
   SOURCES idfupd.F90

scm_run.j

@@ -32,4 +32,6 @@ cd $EXPDIR
 
 $GEOSBIN/construct_extdata_yaml_list.py GEOS_ChemGridComp.rc
 
+echo "file_weights: true" >> extdata.yaml
+
 $RUN_CMD 1 ./GEOSgcm.x --logging_config 'logging.yaml'

scm_setup

@@ -233,9 +233,13 @@ then
       SED="$(command -v sed) "
       ISED="$SED -i.macbak "
    fi
+   PRELOAD_COMMAND='DYLD_INSERT_LIBRARIES'
+   LD_LIBRARY_PATH_CMD='DYLD_LIBRARY_PATH'
 else
    SED="$(command -v sed) "
    ISED="$SED -i "
+   PRELOAD_COMMAND='LD_PRELOAD'
+   LD_LIBRARY_PATH_CMD='LD_LIBRARY_PATH'
 fi
 
 case $selected_case in
@@ -513,6 +517,8 @@ s?@BATCH_TASKS?$BATCH_TASKS?g
 s?@BATCH_TIME?$BATCH_TIME?g
 s?@BATCH_GROUP?$BATCH_GROUP?g
 s?@BATCH_JOBNAME?$BATCH_JOBNAME?g
+s?@PRELOAD_COMMAND?$PRELOAD_COMMAND?g
+s?@LD_LIBRARY_PATH_CMD?$LD_LIBRARY_PATH_CMD?g
 EOF
 
 $ISED -f $expdir/sedfile $expdir/scm_run.j