From c7c89db0ed0a06b4d8df19fc68442ec86e380cf5 Mon Sep 17 00:00:00 2001 From: marcelopaivaramos Date: Wed, 1 Jul 2026 14:49:26 +0000 Subject: [PATCH 1/4] Fix Makefiles for NVHPC compilation support. Update the Makefiles to ensure successful compilation of the MONAN model with NVIDIA NVHPC (25.11) and Cray NVHPC (PrgEnv-nvidia/8.6.0). --- Makefile | 30 +++++++++++++++++++ .../physics/physics_noahmp/src/Makefile | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3b5948dc1..7152def09 100644 --- a/Makefile +++ b/Makefile @@ -801,6 +801,36 @@ cray-xd2000: "OPENACC = $(OPENACC)" \ "CPPFLAGS = $(MODEL_FORMULATION) -D_MPI" ) +nvhpc-xd2000: # BUILDTARGET NVIDIA HPC SDK + ( $(MAKE) all \ + "FC_PARALLEL = ftn" \ + "CC_PARALLEL = cc" \ + "CXX_PARALLEL = CC" \ + "FC_SERIAL = ftn" \ + "CC_SERIAL = cc" \ + "CXX_SERIAL = CC" \ + "FFLAGS_PROMOTION = -r8" \ + "FFLAGS_OPT = -gopt -O4 -byteswapio -Mfree" \ + "CFLAGS_OPT = -gopt -O3" \ + "CXXFLAGS_OPT = -gopt -O3" \ + "LDFLAGS_OPT = -gopt -O3" \ + "FFLAGS_DEBUG = -O0 -g -Mbounds -Mchkptr -byteswapio -Mfree -Ktrap=divz,fp,inv,ovf -traceback" \ + "CFLAGS_DEBUG = -O0 -g -traceback" \ + "CXXFLAGS_DEBUG = -O0 -g -traceback" \ + "LDFLAGS_DEBUG = -O0 -g -Mbounds -Mchkptr -Ktrap=divz,fp,inv,ovf -traceback" \ + "FFLAGS_OMP = -mp" \ + "CFLAGS_OMP = -mp" \ + "FFLAGS_ACC = -Mnofma -acc -gpu=cc70,cc80 -Minfo=accel" \ + "CFLAGS_ACC =" \ + "PICFLAG = -fpic" \ + "BUILD_TARGET = $(@)" \ + "CORE = $(CORE)" \ + "DEBUG = $(DEBUG)" \ + "USE_PAPI = $(USE_PAPI)" \ + "OPENMP = $(OPENMP)" \ + "OPENACC = $(OPENACC)" \ + "CPPFLAGS = $(MODEL_FORMULATION) -D_MPI -DCPRPGI" ) + CPPINCLUDES = FCINCLUDES = LIBS = diff --git a/src/core_atmosphere/physics/physics_noahmp/src/Makefile b/src/core_atmosphere/physics/physics_noahmp/src/Makefile index 675bdf9df..981753511 100644 --- a/src/core_atmosphere/physics/physics_noahmp/src/Makefile +++ b/src/core_atmosphere/physics/physics_noahmp/src/Makefile @@ -347,5 +347,5 @@ clean: $(RM) *.i .F90.o: - $(FC) $(CPPFLAGS) $(COREDEF) $(FFLAGS_NONSTD) -c $*.F90 $(CPPINCLUDES) $(FCINCLUDES) -I../utility -I../../../../framework + $(FC) $(CPPFLAGS) $(COREDEF) $(FFLAGS_NONSTD) -c $*.F90 $(CPPINCLUDES) $(FCINCLUDES) -I../utility -I../../../../framework -I../../../../external/esmf_time_f90 From 7d64c12ad1030573515418f4db6c39793d2b8f6e Mon Sep 17 00:00:00 2001 From: marcelopaivaramos Date: Thu, 2 Jul 2026 14:59:36 -0300 Subject: [PATCH 2/4] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7152def09..7bb534b0a 100644 --- a/Makefile +++ b/Makefile @@ -817,7 +817,7 @@ nvhpc-xd2000: # BUILDTARGET NVIDIA HPC SDK "FFLAGS_DEBUG = -O0 -g -Mbounds -Mchkptr -byteswapio -Mfree -Ktrap=divz,fp,inv,ovf -traceback" \ "CFLAGS_DEBUG = -O0 -g -traceback" \ "CXXFLAGS_DEBUG = -O0 -g -traceback" \ - "LDFLAGS_DEBUG = -O0 -g -Mbounds -Mchkptr -Ktrap=divz,fp,inv,ovf -traceback" \ + "LDFLAGS_DEBUG = -O0 -g -Mbounds -Ktrap=divz,fp,inv,ovf -traceback" \ "FFLAGS_OMP = -mp" \ "CFLAGS_OMP = -mp" \ "FFLAGS_ACC = -Mnofma -acc -gpu=cc70,cc80 -Minfo=accel" \ From 60ab38fab10a5a1c1cae99f50433c6c05635f4ac Mon Sep 17 00:00:00 2001 From: marcelopaivaramos Date: Thu, 2 Jul 2026 15:10:52 -0300 Subject: [PATCH 3/4] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7bb534b0a..07d6d4b3b 100644 --- a/Makefile +++ b/Makefile @@ -817,7 +817,7 @@ nvhpc-xd2000: # BUILDTARGET NVIDIA HPC SDK "FFLAGS_DEBUG = -O0 -g -Mbounds -Mchkptr -byteswapio -Mfree -Ktrap=divz,fp,inv,ovf -traceback" \ "CFLAGS_DEBUG = -O0 -g -traceback" \ "CXXFLAGS_DEBUG = -O0 -g -traceback" \ - "LDFLAGS_DEBUG = -O0 -g -Mbounds -Ktrap=divz,fp,inv,ovf -traceback" \ + "LDFLAGS_DEBUG = -O0 -g -Mbounds -Ktrap=divz,fp,inv,ovf" \ "FFLAGS_OMP = -mp" \ "CFLAGS_OMP = -mp" \ "FFLAGS_ACC = -Mnofma -acc -gpu=cc70,cc80 -Minfo=accel" \ From fcf4232334677c21f0e3b10902361a0f161fecb1 Mon Sep 17 00:00:00 2001 From: marcelopaivaramos Date: Fri, 3 Jul 2026 18:00:16 -0300 Subject: [PATCH 4/4] Update Makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 07d6d4b3b..f5161e5af 100644 --- a/Makefile +++ b/Makefile @@ -814,10 +814,10 @@ nvhpc-xd2000: # BUILDTARGET NVIDIA HPC SDK "CFLAGS_OPT = -gopt -O3" \ "CXXFLAGS_OPT = -gopt -O3" \ "LDFLAGS_OPT = -gopt -O3" \ - "FFLAGS_DEBUG = -O0 -g -Mbounds -Mchkptr -byteswapio -Mfree -Ktrap=divz,fp,inv,ovf -traceback" \ + "FFLAGS_DEBUG = -O0 -g -Mbounds -Mchkptr -Mchkstk -byteswapio -Mfree -traceback" \ "CFLAGS_DEBUG = -O0 -g -traceback" \ "CXXFLAGS_DEBUG = -O0 -g -traceback" \ - "LDFLAGS_DEBUG = -O0 -g -Mbounds -Ktrap=divz,fp,inv,ovf" \ + "LDFLAGS_DEBUG = -O0 -g -traceback" \ "FFLAGS_OMP = -mp" \ "CFLAGS_OMP = -mp" \ "FFLAGS_ACC = -Mnofma -acc -gpu=cc70,cc80 -Minfo=accel" \