Merge branch 'develop' into feature/hconfig-extras

Author: theurich

.github/workflows/test-build-spack.yml

@@ -28,7 +28,7 @@ on:
 
 jobs:
   set-matrix:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     outputs:
       matrix: ${{ steps.list_comp_pkgs.outputs.matrix }}
@@ -66,7 +66,7 @@ jobs:
   build:
     needs: set-matrix
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     strategy:
       matrix: ${{ fromJson(needs.set-matrix.outputs.matrix) }}

.zenodo.json

@@ -0,0 +1,7 @@
+{
+    "creators": [
+        {
+            "name": "ESMF Core Team"
+        }
+    ]
+}

README.md

@@ -4,6 +4,8 @@
 
 # Earth System Modeling Framework (ESMF)
 
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.11205526.svg)](https://doi.org/10.5281/zenodo.11205526)
+
 >Copyright (c) 2002-2024 University Corporation for Atmospheric Research, Massachusetts Institute of Technology, Geophysical Fluid Dynamics Laboratory, University of Michigan, National Centers for Environmental Prediction, Los Alamos National Laboratory, Argonne National Laboratory, NASA Goddard Space Flight Center. All rights reserved.
 
 Hello and welcome to ESMF.

build/common.mk

@@ -1699,12 +1699,6 @@ export ESMF_PIO = $(ESMF_PIODEFAULT)
 endif
 
 ifeq ($(ESMF_PIO),internal)
-ifeq ($(ESMF_COMM),mpiuni)
-#TODO: This turns PIO off if it was set to internal from a default setting.
-#TODO: We need to do this while our internal PIO does not support mpiuni mode,
-#TODO: but want to allow external PIO or explicit ESMF_PIO setting for developm. #TODO: Eventually this should become unnecessary.
-ESMF_PIO = OFF
-endif
 ifndef ESMF_NETCDF
 # PIO, starting with version 2, depends on NetCDF. Defaulting to internal needs
 # be turned off if there is no NetCDF available. Externally set PIO will be let
@@ -1811,6 +1805,42 @@ ESMF_F90LINKRPATHSTHIRD   += $(ESMF_F90RPATHPREFIX)$(ESMF_BABELTRACE_LIBPATH)
 endif
 endif
 
+#-------------------------------------------------------------------------------
+# NUMA
+#-------------------------------------------------------------------------------
+ifeq ($(ESMF_NUMA),OFF)
+ESMF_NUMA=
+endif
+
+ifeq ($(ESMF_NUMA),ON)
+ESMF_NUMA = standard
+endif
+ifeq ($(ESMF_NUMA),standard)
+ifneq ($(origin ESMF_NUMA_LIBS), environment)
+ESMF_NUMA_LIBS = -lnuma
+endif
+endif
+
+ifdef ESMF_NUMA
+ESMF_CPPFLAGS                += -DESMF_NUMA=1
+ifdef ESMF_NUMA_INCLUDE
+ESMF_CXXCOMPILEPATHSTHIRD    += -I$(ESMF_NUMA_INCLUDE)
+ESMF_F90COMPILEPATHSTHIRD    += -I$(ESMF_NUMA_INCLUDE)
+endif
+ifdef ESMF_NUMA_LIBS
+ESMF_CXXLINKLIBS          += $(ESMF_NUMA_LIBS)
+ESMF_CXXLINKRPATHSTHIRD   += $(addprefix $(ESMF_CXXRPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_NUMA_LIBS))))
+ESMF_F90LINKLIBS          += $(ESMF_NUMA_LIBS)
+ESMF_F90LINKRPATHSTHIRD   += $(addprefix $(ESMF_F90RPATHPREFIX),$(subst -L,,$(filter -L%,$(ESMF_NUMA_LIBS))))
+endif
+ifdef ESMF_NUMA_LIBPATH
+ESMF_CXXLINKPATHSTHIRD    += -L$(ESMF_NUMA_LIBPATH)
+ESMF_F90LINKPATHSTHIRD    += -L$(ESMF_NUMA_LIBPATH)
+ESMF_CXXLINKRPATHSTHIRD   += $(ESMF_CXXRPATHPREFIX)$(ESMF_NUMA_LIBPATH)
+ESMF_F90LINKRPATHSTHIRD   += $(ESMF_F90RPATHPREFIX)$(ESMF_NUMA_LIBPATH)
+endif
+endif
+
 #-------------------------------------------------------------------------------
 # NVML
 #-------------------------------------------------------------------------------
@@ -2354,7 +2384,7 @@ endif
 lib: info
 	@$(MAKE) build_libs
 	@$(MAKE) build_tracelibs
-	@$(MAKE) info_mk
+	@$(MAKE) info_mk ESMF_CCOMPILEPATHS="$(ESMF_CCOMPILEPATHS) -I$(ESMF_CONFDIR)"
 	@echo "ESMF library built successfully on "`date`
 	@echo "To verify, build and run the unit and system tests with: $(MAKE) check"
 	@echo " or the more extensive: $(MAKE) all_tests"

makefile

@@ -304,6 +304,18 @@ endif
 	    echo "ESMF_BABELTRACE_LIBPATH: $(ESMF_BABELTRACE_LIBPATH)" ; \
 	  fi; \
 	 fi
+	-@if [ -n "$(ESMF_NUMA)" ] ; then \
+	  echo "ESMF_NUMA:               $(ESMF_NUMA)" ; \
+	  if [ -n "$(ESMF_NUMA_INCLUDE)" ] ; then \
+	    echo "ESMF_NUMA_INCLUDE:       $(ESMF_NUMA_INCLUDE)" ; \
+	  fi; \
+	  if [ -n "$(ESMF_NUMA_LIBS)" ] ; then \
+	    echo "ESMF_NUMA_LIBS:          $(ESMF_NUMA_LIBS)" ; \
+	  fi; \
+	  if [ -n "$(ESMF_NUMA_LIBPATH)" ] ; then \
+	    echo "ESMF_NUMA_LIBPATH:       $(ESMF_NUMA_LIBPATH)" ; \
+	  fi; \
+	 fi
 	-@if [ -n "$(ESMF_NVML)" ] ; then \
 	  echo "ESMF_NVML:               $(ESMF_NVML)" ; \
 	  if [ -n "$(ESMF_NVML_INCLUDE)" ] ; then \
@@ -709,6 +721,18 @@ endif
 	    echo "# ESMF_BABELTRACE_LIBPATH:$(ESMF_BABELTRACE_LIBPATH)" >> $(MKINFO) ; \
 	  fi; \
 	 fi
+	-@if [ -n "$(ESMF_NUMA)" ] ; then \
+	  echo "# ESMF_NUMA:              $(ESMF_NUMA)" >> $(MKINFO) ; \
+	  if [ -n "$(ESMF_NUMA_INCLUDE)" ] ; then \
+	    echo "# ESMF_NUMA_INCLUDE:      $(ESMF_NUMA_INCLUDE)" >> $(MKINFO) ; \
+	  fi; \
+	  if [ -n "$(ESMF_NUMA_LIBS)" ] ; then \
+	    echo "# ESMF_NUMA_LIBS:         $(ESMF_NUMA_LIBS)" >> $(MKINFO) ; \
+	  fi; \
+	  if [ -n "$(ESMF_NUMA_LIBPATH)" ] ; then \
+	    echo "# ESMF_NUMA_LIBPATH:      $(ESMF_NUMA_LIBPATH)" >> $(MKINFO) ; \
+	  fi; \
+	 fi
 	-@if [ -n "$(ESMF_NVML)" ] ; then \
 	  echo "# ESMF_NVML:              $(ESMF_NVML)" >> $(MKINFO) ; \
 	  if [ -n "$(ESMF_NVML_INCLUDE)" ] ; then \