From 809b3f10a4e4e39f8b79482aeaef59329ba560ba Mon Sep 17 00:00:00 2001 From: wwlwpd <46434714+wwlwpd@users.noreply.github.com> Date: Mon, 7 Oct 2024 17:11:27 -0500 Subject: [PATCH] Removed unsupported ADCIRC versions. (#1403) Issue 1402: Without sufficient commercial support, the maintenance burden is too heavy to maintain all these versions of ADCIRC to the standard we wish to provide an SLA for all versions building on all supported platforms. Users may contact us for custom version support, even strictly in a privated and maintanable way using ASGS' "local assets" feature, at . Resolves #1402. --- bin/init-adcirc.sh | 3 +- .../latest-upstream/01-issue-1299.patch | 757 ------------------ patches/ADCIRC/latest-upstream/about.txt | 1 - patches/ADCIRC/latest-upstream/info.sh | 5 - .../01-issue-1299.patch | 591 -------------- .../noaa.stofs.2d.glo.v1.1.0r2/about.txt | 1 - .../ADCIRC/noaa.stofs.2d.glo.v1.1.0r2/info.sh | 5 - .../01-issue-1299.patch | 754 ----------------- .../about.txt | 1 - .../noaa.stofs.2d.glo.v2.1.0r1.v55.12/info.sh | 5 - .../01-issue-1298.patch | 653 --------------- .../ADCIRC/v53release-adcircpolate/about.txt | 1 - .../ADCIRC/v53release-adcircpolate/info.sh | 5 - .../v53release-testsuite/01-issue-1298.patch | 742 ----------------- patches/ADCIRC/v53release-testsuite/about.txt | 1 - patches/ADCIRC/v53release-testsuite/info.sh | 5 - patches/ADCIRC/v53release/about.txt | 2 +- .../ADCIRC/v55-GLOBAL/01-cmplrflags-mk.patch | 435 ---------- patches/ADCIRC/v55-GLOBAL/about.txt | 1 - patches/ADCIRC/v55-GLOBAL/info.sh | 7 - 20 files changed, 3 insertions(+), 3972 deletions(-) delete mode 100644 patches/ADCIRC/latest-upstream/01-issue-1299.patch delete mode 100644 patches/ADCIRC/latest-upstream/about.txt delete mode 100644 patches/ADCIRC/latest-upstream/info.sh delete mode 100644 patches/ADCIRC/noaa.stofs.2d.glo.v1.1.0r2/01-issue-1299.patch delete mode 100644 patches/ADCIRC/noaa.stofs.2d.glo.v1.1.0r2/about.txt delete mode 100644 patches/ADCIRC/noaa.stofs.2d.glo.v1.1.0r2/info.sh delete mode 100644 patches/ADCIRC/noaa.stofs.2d.glo.v2.1.0r1.v55.12/01-issue-1299.patch delete mode 100644 patches/ADCIRC/noaa.stofs.2d.glo.v2.1.0r1.v55.12/about.txt delete mode 100644 patches/ADCIRC/noaa.stofs.2d.glo.v2.1.0r1.v55.12/info.sh delete mode 100644 patches/ADCIRC/v53release-adcircpolate/01-issue-1298.patch delete mode 100644 patches/ADCIRC/v53release-adcircpolate/about.txt delete mode 100644 patches/ADCIRC/v53release-adcircpolate/info.sh delete mode 100644 patches/ADCIRC/v53release-testsuite/01-issue-1298.patch delete mode 100644 patches/ADCIRC/v53release-testsuite/about.txt delete mode 100644 patches/ADCIRC/v53release-testsuite/info.sh delete mode 100644 patches/ADCIRC/v55-GLOBAL/01-cmplrflags-mk.patch delete mode 100644 patches/ADCIRC/v55-GLOBAL/about.txt delete mode 100644 patches/ADCIRC/v55-GLOBAL/info.sh diff --git a/bin/init-adcirc.sh b/bin/init-adcirc.sh index cf41d416e..c986889a8 100755 --- a/bin/init-adcirc.sh +++ b/bin/init-adcirc.sh @@ -90,10 +90,11 @@ _show_supported_versions() fi # final menu entry for custom directory num=$(($num+1)) - printf "%2s. %-33s | %-66s\n" $num custom "select this option for custom directory" + printf "%2s. %-33s | %-66s\n" $num custom "(*) select this option for custom directory" num=$(($num+1)) printf "%2s. %-33s | %-66s\n" $num quit "type 'quit', 'q', or 'ctrl-c' to quit" echo "--" + echo "* Contact if additional ADCIRC version supported is required." echo ADCIRCS=($_ADCIRCS custom) if [ "${1}" != "noexit" ]; then diff --git a/patches/ADCIRC/latest-upstream/01-issue-1299.patch b/patches/ADCIRC/latest-upstream/01-issue-1299.patch deleted file mode 100644 index 4a5c3c081..000000000 --- a/patches/ADCIRC/latest-upstream/01-issue-1299.patch +++ /dev/null @@ -1,757 +0,0 @@ -diff --git a/work/cmplrflags.mk b/work/cmplrflags.mk -index 9f89de7..d81eece 100644 ---- a/work/cmplrflags.mk -+++ b/work/cmplrflags.mk -@@ -1,5 +1,46 @@ - # SRCDIR is set in makefile or on the compile line --INCDIRS := -I. -I$(SRCDIR)/prep -+INCDIRS := -I . -I $(SRCDIR)/prep -+ -+######################################################################## -+# Compiler flags for Linux operating system on 64bit x86 CPU -+# -+ifeq ($(MACHINE)-$(OS),i686-mingw32) -+# -+# ***NOTE*** User must select between various Linux setups -+# by commenting/uncommenting the appropriate compiler -+# -+compiler=gnu -+ifeq ($(compiler),gnu) -+ PPFC := gfortran -+ FC := gfortran -+ PFC := mpif90 -+ FFLAGS1 := $(INCDIRS) -O2 -mcmodel=medium -ffixed-line-length-none -march=corei7-avx -m64 -static -+ FFLAGS2 := $(FFLAGS1) -+ FFLAGS3 := $(FFLAGS1) -+ DA := -DREAL8 -DLINUX -DCSCA -+ DP := -DREAL8 -DLINUX -DCSCA -DCMPI -DHAVE_MPI_MOD -+ DPRE := -DREAL8 -DLINUX -+ IMODS := -I -+ CC := gcc -+ CCBE := $(CC) -+ CFLAGS := $(INCDIRS) -O2 -mcmodel=medium -DLINUX -march=corei7-avx -m64 -static-libgcc -+ CLIBS := -+ LIBS := -+ MSGLIBS := -+ ifeq ($(NETCDF),enable) -+ FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -lhdf5_fortran -+ endif -+ $(warning (INFO) Corresponding compilers and flags found in cmplrflags.mk.) -+ ifneq ($(FOUND),TRUE) -+ FOUND := TRUE -+ else -+ MULTIPLE := TRUE -+ endif -+endif -+endif -+#$(MACHINE) -+ -+ - - ######################################################################## - # Compiler flags for Linux operating system on 64bit x86 CPU -@@ -33,28 +74,25 @@ ifeq ($(compiler),gnu) - PPFC := gfortran - FC := gfortran - PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O2 -mcmodel=medium -ffixed-line-length-none -m64 -+ FFLAGS1 := $(INCDIRS) -O2 -mcmodel=medium -ffixed-line-length-none -march=k8 -m64 - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCSCA -DCMPI -+ DP := -DREAL8 -DLINUX -DCSCA -DCMPI -DHAVE_MPI_MOD - DPRE := -DREAL8 -DLINUX - IMODS := -I - CC := gcc - CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O2 -mcmodel=medium -DLINUX -m64 -+ CFLAGS := $(INCDIRS) -O2 -mcmodel=medium -DLINUX -march=k8 -m64 - CLIBS := - LIBS := - MSGLIBS := - ifeq ($(NETCDF),enable) - ifeq ($(MACHINENAME),blueridge) - # FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -- NETCDFHOME :=/usr - FFLAGS1 :=$(FFLAGS1) -I/usr/lib64/gfortran/modules - FFLAGS2 :=$(FFLAGS1) - FFLAGS3 :=$(FFLAGS1) -- # NETCDFHOME :=/shared/apps/RHEL-5/x86_64/NetCDF/netcdf-4.1.1-gcc4.1-ifort -- # NETCDFHOME :=/shared/apps/RHEL-5/x86_64/NetCDF/netcdf-4.1.2-gcc4.1-ifort - FLIBS :=$(FLIBS) -L/usr/lib64 -lnetcdff - else - FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -lhdf5_fortran -@@ -136,12 +174,7 @@ ifeq ($(compiler),gfortran) - FFLAGS2 := $(FFLAGS2) -I/usr/lib64/gfortran/modules - FFLAGS3 := $(FFLAGS3) -I/usr/lib64/gfortran/modules - endif -- ifeq ($(MACHINENAME),wsl2-ubuntu) -- NETCDFHOME := /usr -- FFLAGS1 := $(FFLAGS1) -I/usr/include -- FFLAGS2 := $(FFLAGS2) -I/usr/include -- FFLAGS3 := $(FFLAGS3) -I/usr/include -- endif -+ FLIBS := $(FLIBS) -lnetcdff - endif - IMODS := -I - CC := gcc -@@ -164,7 +197,7 @@ ifeq ($(compiler),g95) - PPFC := g95 - FC := g95 - PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O3 -mcmodel=medium -fstatic -ffixed-line-length-132 -+ FFLAGS1 := $(INCDIRS) -O2 -mcmodel=medium -fstatic -ffixed-line-length-132 - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -@@ -189,22 +222,21 @@ endif - # jgf: The -i-dynamic flag defers the inclusion of the library with - # feupdateenv until run time, thus avoiding the error message: - # "feupdateenv is not implemented and will always fail" --ifeq ($(compiler),intel) -+# this line is to support icc/ifort and icx/ifort (llvm based) -+ifneq (,$(filter intel intel-oneapi,$(compiler))) -+ CC := icc - PPFC := ifort - FC := ifort -- PFC ?= mpif90 -- FFLAGS1 := $(INCDIRS) -O2 -g -traceback -FI -assume byterecl -132 -xSSE4.2 -assume buffered_io -+ PFC := mpif90 -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xSSE4.2 - CFLAGS := $(INCDIRS) -O2 -xSSE4.2 -m64 -mcmodel=medium -DLINUX - FLIBS := - ifeq ($(DEBUG),full) -- CFLAGS := $(INCDIRS) -g -O0 -m64 -mcmodel=medium -DLINUX -+ CFLAGS := $(INCDIRS) -g -O0 -march=k8 -m64 -mcmodel=medium -DLINUX - endif - ifeq ($(DEBUG),full) - FFLAGS1 := $(INCDIRS) -g -O0 -traceback -debug all -check all -ftrapuv -fpe0 -FI -assume byterecl -132 -DALL_TRACE -DFULL_STACK -DFLUSH_MESSAGES - endif -- ifeq ($(DEBUG),full-not-fpe) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -debug all -check all -FI -assume byterecl -132 -DALL_TRACE -DFULL_STACK -DFLUSH_MESSAGES -- endif - ifeq ($(DEBUG),trace) - FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -DALL_TRACE -DFULL_STACK -DFLUSH_MESSAGES - endif -@@ -216,45 +248,114 @@ ifeq ($(compiler),intel) - endif - # - ifeq ($(MACHINENAME),stampede2) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - endif - endif -- ifeq ($(MACHINENAME),frontera) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xCORE-AVX512 -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xCORE-AVX512 -- FLIBS := $(INCDIRS) -xCORE-AVX512 -+ ifeq ($(MACHINENAME),frontera) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xCORE-AVX512 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX512 -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX512 - CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX512 -- FLIBS := $(INCDIRS) -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 - endif - endif - ifeq ($(MACHINENAME),queenbee) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xSSE4.2 -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xSSE4.2 -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xSSE4.2 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xSSE4.2 - FLIBS := $(INCDIRS) -xSSE4.2 - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xSSE4.2 -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xSSE4.2 - CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xSSE4.2 - FLIBS := $(INCDIRS) -xSSE4.2 - endif - endif -- ifeq ($(MACHINENAME),supermic) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xAVX -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xAVX -+ ifeq ($(MACHINENAME),queenbeeC) -+ FFLAGS1 := $(INCDIRS) -O2 -132 -+ CFLAGS := $(INCDIRS) -O2 -mcmodel=medium -DLINUX -m64 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX512 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 -+ endif -+ endif -+ ifeq ($(MACHINENAME),queenbeeD) -+ PFC := mpiifort -+ FFLAGS1 := $(INCDIRS) -O2 -132 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ endif -+ endif -+ ifeq ($(MACHINENAME),supermic) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ endif -+ endif -+ ifeq ($(MACHINENAME),rostam) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xAVX - FLIBS := $(INCDIRS) -xAVX - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -assume buffered_io -- CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX - FLIBS := $(INCDIRS) -xAVX - endif - endif -+ ifeq ($(MACHINENAME),ls6) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -+ FLIBS := $(INCDIRS) -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -+ FLIBS := $(INCDIRS) -+ endif -+ endif -+ #wwlwpd: NOTE: Mike III at LSU-HPC recommends 'mpiifort', Intel's MPI implementation wrapper -+ #wwlwpd: instead of the traditional "mpif90"; but the flags are the same we still redefine -+ #wwlwpd: "PFC" below -+ ifeq ($(MACHINENAME),mike) -+ PFC := mpiifort -+ FFLAGS1 := $(INCDIRS) -O2 -132 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ endif -+ endif -+ ifeq ($(MACHINENAME),stampede3) -+ CC := icx -+ FFLAGS1 := $(INCDIRS) -O0 -132 -+ FFLAGS2 := $(FFLAGS1) -+ FFLAGS3 := $(FFLAGS1) -+ CFLAGS := $(INCDIRS) -O0 -mcmodel=medium -DLINUX -m64 -+ FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -O0 -132 -g -traceback -+ FFLAGS2 := $(FFLAGS1) -+ FFLAGS3 := $(FFLAGS1) -+ CFLAGS := $(INCDIRS) -O0 -mcmodel=medium -DLINUX -m64 -g -traceback -+ endif -+ endif - # - #@jasonfleming Added to fix bus error on hatteras@renci - ifeq ($(HEAP_ARRAYS),fix) -@@ -269,51 +370,51 @@ ifeq ($(compiler),intel) - DPRE := $(DPRE) -DADCSWAN - endif - IMODS := -I -- CC := icc -+ #CC := icc # get from start of this section - CCBE := $(CC) - CLIBS := - MSGLIBS := - ifeq ($(NETCDF),enable) -- ifeq ($(MACHINENAME),hatteras) -- NETCDFHOME :=$(shell nf-config --prefix) -- FLIBS :=$(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -- FFLAGS1 :=$(FFLAGS1) -I$(NETCDFHOME)/include -- FFLAGS2 :=$(FFLAGS1) -- FFLAGS3 :=$(FFLAGS1) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - # jgf20150417 queenbee requires that the analyst load the netcdf and - # netcdf_fortran modules prior to compiling or executing ADCIRC - ifeq ($(MACHINENAME),queenbee) -- FLIBS := $(FLIBS) -L/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0/lib -lnetcdff -lnetcdf -- NETCDFHOME :=/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0 -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),queenbeeC) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),queenbeeD) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),supermic) -- FLIBS := $(FLIBS) -L/usr/local/packages/netcdf_fortran/4.2/INTEL-140-MVAPICH2-2.0/lib -lnetcdff -L/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0/lib -lnetcdf -lnetcdf -liomp5 -lpthread -- NETCDFHOME :=/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0/include -- FFLAGS1 :=$(FFLAGS1) -I/usr/local/packages/hdf5/1.8.12/INTEL-140-MVAPICH2-2.0/include -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),rostam) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),stampede) -- NETCDFHOME :=/opt/apps/intel17/netcdf/4.3.3.1/x86_64 - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),stampede2) -- NETCDFHOME :=/opt/apps/intel17/netcdf/4.3.3.1/x86_64 - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -- ifeq ($(USER),jgflemin) -- NETCDFHOME :=/work/00976/jgflemin/stampede2/local -- FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -- endif -+ endif -+ ifeq ($(MACHINENAME),stampede3) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),frontera) -- # specify NETCDFHOME on the command line or as an environment var - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - # @jasonfleming: Added support for lonestar5 at tacc.utexas.edu; - # load the following module: netcdf/4.3.3.1 - ifeq ($(MACHINENAME),lonestar5) -- #NETCDFHOME :=/opt/apps/intel18/netcdf/4.3.3.1/x86_64 -- # @jasonfleming: Updated support for lonestar5 -- NETCDFHOME :=/opt/apps/intel18/netcdf/4.6.2/x86_64 -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),ls6) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),mike) - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - # jgf20150817: Adding support for spirit.afrl.hpc.mil; -@@ -326,25 +427,12 @@ ifeq ($(compiler),intel) - # jgf20150420 mike requires that the analyst add netcdf to the softenv - # with the following on the command line - # soft add +netcdf-4.1.3-Intel-13.0.0 -- ifeq ($(MACHINENAME),mike) -- FLIBS := $(FLIBS) -L/usr/local/packages/netcdf/4.1.3/Intel-13.0.0/lib -lnetcdff -lnetcdf -- NETCDFHOME :=/usr/local/packages/netcdf/4.1.3/Intel-13.0.0 -- endif - ifeq ($(MACHINENAME),killdevil) - HDF5HOME :=/nas02/apps/hdf5-1.8.5/lib - NETCDFHOME :=/nas02/apps/netcdf-4.1.1 - FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -lhdf5_fortran - endif - endif -- --# ------------ -- ifeq ($(NETCDF),enable) -- ifeq ($(WDALTVAL),enable) -- DP := $(DP) -DWDVAL_NETCDF -- endif -- endif --# ----------- -- - #jgf20110519: For netcdf on topsail at UNC, use - #NETCDFHOME=/ifs1/apps/netcdf/ - $(warning (INFO) Corresponding machine found in cmplrflags.mk.) -@@ -354,62 +442,36 @@ ifeq ($(compiler),intel) - MULTIPLE := TRUE - endif - endif -- - # - # Corbitt 120322: These flags work on the Notre Dame Athos & Zas - ifeq ($(compiler),intel-ND) -- PPFC := ifort -+ PPFC := ifort - FC := ifort -- PFC ?= mpif90 --# FFLAGS1 := $(INCDIRS) -w -O3 -assume byterecl -132 -assume buffered_io #-i-dynamic -- -- ifeq ($(AMD),yes) -- FFLAGS1 := $(INCDIRS) -g -traceback -O2 -assume byterecl -132 -mcmodel=medium -shared-intel -assume buffered_io -- else -- FFLAGS1 := $(INCDIRS) -O3 -g -traceback -xSSE4.2 -assume byterecl -132 -mcmodel=medium -shared-intel -assume buffered_io --# FFLAGS1 := $(INCDIRS) -O2 -g -traceback -xSSE4.2 -assume byterecl -132 -mcmodel=medium -shared-intel -assume buffered_io --# FFLAGS1 := $(INCDIRS) -O0 -g -traceback -check bounds -xSSE4.2 -assume byterecl -132 -mcmodel=medium -shared-intel -assume buffered_io -- endif -+ PFC := mpif90 -+ FFLAGS1 := $(INCDIRS) -w -O2 -assume byterecl -132 -i-dynamic - ifeq ($(DEBUG),full) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -debug -check all -FI -assume byterecl -132 -DEBUG -DALL_TRACE -DFULL_STACK -DFLUSH_MESSAGES -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -debug -check all -i-dynamic -FI -assume byterecl -132 -DALL_TRACE -DFULL_STACK -DFLUSH_MESSAGES - endif - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCSCA -DCMPI -DHAVE_MPI_MOD #-DNOFSBPG #-DNOIVB -DPOWELL -+ DP := -DREAL8 -DLINUX -DCSCA -DCMPI -DPOWELL - DPRE := -DREAL8 -DLINUX -DADCSWAN - ifeq ($(SWAN),enable) -- DPRE := $(DPRE) -DADCSWAN -+ DPRE := $(DPRE) -DADCSWAN - endif - IMODS := -I - CC := icc - CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O3 -m64 -mcmodel=medium -DLINUX -- FLIBS := -- ifeq ($(DATETIME),enable) -- DATETIMEHOME := /asclepius/cblakely/libs/OC-GTSM_utility/libs/datetime-fortran/build/ -- FLIBS := -ldatetime -L$(DATETIMEHOME)lib/ -- endif -- ifeq ($(GRIB2),enable) -- WGRIB2HOME := /asclepius/cblakely/libs/grib2/lib/ -- FLIBS := $(FLIBS) -lwgrib2_api -lwgrib2 -ljasper -L$(WGRIB2HOME) -- endif -+ CFLAGS := $(INCDIRS) -O2 -m64 -mcmodel=medium -DLINUX -+ FLIBS := - ifeq ($(DEBUG),full) -- CFLAGS := $(INCDIRS) -g -O0 -m64 -mcmodel=medium -DLINUX -+ CFLAGS := $(INCDIRS) -g -O0 -march=k8 -m64 -mcmodel=medium -DLINUX - endif - ifeq ($(NETCDF),enable) -- #HDF5HOME=/afs/crc.nd.edu/x86_64_linux/hdf/hdf5-1.8.6-linux-x86_64-static/lib -- HDF5HOME=/opt/crc/n/netcdf/4.7.0/intel/18.0 -- FLIBS := $(FLIBS) -lnetcdff -L$(HDF5HOME) -+ HDF5HOME=/afs/crc.nd.edu/x86_64_linux/hdf/hdf5-1.8.6-linux-x86_64-static/lib -+ FLIBS := $(FLIBS) -lnetcdff -L$(HDF5HOME) - endif --# ------------ -- ifeq ($(NETCDF),enable) -- ifeq ($(WDALTVAL),enable) -- DP := $(DP) -DWDVAL_NETCDF -- endif -- endif --# ----------- -- - CLIBS := - MSGLIBS := - $(warning (INFO) Corresponding machine found in cmplrflags.mk.) -@@ -418,23 +480,24 @@ ifeq ($(compiler),intel-ND) - else - MULTIPLE := TRUE - endif -- NETCDFHOME=/afs/crc.nd.edu/x86_64_linux/n/netcdf/4.7.0/intel/18.0/ -+ NETCDFHOME=/afs/crc.nd.edu/x86_64_linux/netcdf/rhel6/4.1.3/intel-12.0/ -+ #NETCDFHOME=/afs/crc.nd.edu/x86_64_linux/scilib/netcdf/4.1.2/intel-12.0/inst - endif -- -+# - # SGI ICE X (e.g. topaz@ERDC) using Intel compilers, added by TCM - # jgf: Added flags for Thunder@AFRL. - ifeq ($(compiler),intel-sgi) - PPFC := ifort - FC := ifort -- PFC ?= mpif90 -+ PFC := mpif90 - CC := icc -O2 -no-ipo - CCBE := icc -O2 -no-ipo -- FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -finline-limit=1000 -real-size 64 -no-ipo -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -finline-limit=1000 -real-size 64 -no-ipo - # FFLAGS1 := $(INCDIRS) -Mextend -g -O0 -traceback - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) -assume buffered_stdout - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCMPI -DCSCA -+ DP := -DREAL8 -DLINUX -DCMPI -DHAVE_MPI_MOD -DCSCA - DPRE := -DREAL8 -DLINUX - CFLAGS := $(INCDIRS) -DLINUX - IMODS := -module -@@ -474,8 +537,8 @@ ifeq ($(compiler),cray_xt3) - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) -r8 -Mr8 -Mr8intrinsics - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCMPI -DCSCA -DDEBUG_WARN_ELEV --# DP := -DREAL8 -DLINUX -DCMPI -DCSCA -+ DP := -DREAL8 -DLINUX -DCMPI -DHAVE_MPI_MOD -DCSCA -DDEBUG_WARN_ELEV -+# DP := -DREAL8 -DLINUX -DCMPI -DHAVE_MPI_MOD -DCSCA - DPRE := -DREAL8 -DLINUX - CFLAGS := -c89 $(INCDIRS) -DLINUX - IMODS := -module -@@ -512,7 +575,7 @@ ifeq ($(compiler),cray_xt4) - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) -r8 -Mr8 -Mr8intrinsics - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCMPI -DCSCA -+ DP := -DREAL8 -DLINUX -DCMPI -DHAVE_MPI_MOD -DCSCA - DPRE := -DREAL8 -DLINUX - ifeq ($(SWAN),enable) - DPRE := -DREAL8 -DLINUX -DADCSWAN -@@ -556,7 +619,7 @@ ifeq ($(compiler),cray_xt5) - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) -r8 -Mr8 -Mr8intrinsics - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCMPI -DCSCA -+ DP := -DREAL8 -DLINUX -DCMPI -DHAVE_MPI_MOD -DCSCA - DPRE := -DREAL8 -DLINUX - CFLAGS := -c89 $(INCDIRS) -DLINUX - IMODS := -module -@@ -585,12 +648,12 @@ ifeq ($(compiler),xtintel) - PFC := ftn - CC := cc -O2 -no-ipo - CCBE := cc -O2 -no-ipo -- FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -default64 -finline-limit=1000 -real-size 64 -no-ipo -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -default64 -finline-limit=1000 -real-size 64 -no-ipo - # FFLAGS1 := $(INCDIRS) -Mextend -g -O0 -traceback - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) -assume buffered_stdout - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCMPI -DCSCA -+ DP := -DREAL8 -DLINUX -DCMPI -DHAVE_MPI_MOD -DCSCA - DPRE := -DREAL8 -DLINUX - CFLAGS := $(INCDIRS) -DLINUX - IMODS := -module -@@ -652,7 +715,7 @@ ifeq ($(compiler),utils) - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) -r8 -Mr8 -Mr8intrinsics - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCMPI -DCSCA -+ DP := -DREAL8 -DLINUX -DCMPI -DHAVE_MPI_MOD -DCSCA - DPRE := -DREAL8 -DLINUX - ifeq ($(SWAN),enable) - DPRE := -DREAL8 -DLINUX -DADCSWAN -@@ -717,15 +780,15 @@ ifeq ($(compiler),diamond) - PPFC := ifort - FC := ifort - PFC := ifort --# FFLAGS1 := $(INCDIRS) -O3 -xT -132 -- FFLAGS1 := -O3 -132 -xSSSE3 -+# FFLAGS1 := $(INCDIRS) -O2 -xT -132 -+ FFLAGS1 := -O2 -132 -xSSSE3 - ifeq ($(DEBUG),full) - FFLAGS1 := $(INCDIRS) -g -O0 -debug -fpe0 -132 -traceback -check all -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK - endif - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCSCA -DCMPI -+ DP := -DREAL8 -DLINUX -DCSCA -DCMPI -DHAVE_MPI_MOD - DPRE := -DREAL8 -DLINUX - ifeq ($(SWAN),enable) - DPRE := -DREAL8 -DLINUX -DADCSWAN -@@ -733,8 +796,8 @@ ifeq ($(compiler),diamond) - IMODS := -I - CC := icc - CCBE := $(CC) --# CFLAGS := $(INCDIRS) -O3 -xT -- CFLAGS := $(INCDIRS) -O3 -xSSSE3 -+# CFLAGS := $(INCDIRS) -O2 -xT -+ CFLAGS := $(INCDIRS) -O2 -xSSSE3 - ifeq ($(DEBUG),full) - CFLAGS := $(INCDIRS) -g -O0 - endif -@@ -775,7 +838,7 @@ ifeq ($(compiler),garnet) - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) #-r8 -Mr8 -Mr8intrinsics - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCMPI -DCSCA -+ DP := -DREAL8 -DLINUX -DCMPI -DHAVE_MPI_MOD -DCSCA - DPRE := -DREAL8 -DLINUX - ifeq ($(SWAN),enable) - DPRE := -DREAL8 -DLINUX -DADCSWAN -@@ -810,7 +873,7 @@ ifeq ($(compiler),kraken) - PPFC := ftn - FC := ftn - PFC := ftn -- FFLAGS1 := $(INCDIRS) -O3 -static -132 -+ FFLAGS1 := $(INCDIRS) -O2 -static -132 - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -DPOWELL -@@ -834,24 +897,24 @@ endif - # - # Compiler Flags for CircleCI Build Server - ifeq ($(compiler),circleci) -- PPFC := ifort -- FC := ifort -+ PPFC := gfortran -+ FC := gfortran - PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O0 -132 -+ FFLAGS1 := $(INCDIRS) -O0 -g -mcmodel=medium -ffixed-line-length-none -m64 - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCSCA -DCMPI -+ DP := -DREAL8 -DLINUX -DCSCA -DCMPI -DHAVE_MPI_MOD - DPRE := -DREAL8 -DLINUX -DADCSWAN - IMODS := -I -- CC := icx -+ CC := gcc - CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O0 -mcmodel=medium -DLINUX -m64 -+ CFLAGS := $(INCDIRS) -O0 -g -mcmodel=medium -DLINUX -m64 - CLIBS := - LIBS := - MSGLIBS := - ifeq ($(NETCDF),enable) -- FLIBS := $(FLIBS) -L${NETCDF_C_HOME}/lib -lnetcdff -+ FLIBS := $(FLIBS) -lnetcdff - endif - $(warning (INFO) Corresponding compilers and flags found in cmplrflags.mk.) - ifneq ($(FOUND),TRUE) -@@ -860,8 +923,7 @@ ifeq ($(compiler),circleci) - MULTIPLE := TRUE - endif - endif --# --endif -+ - #$(MACHINE) - ######################################################################## - # Compiler flags for Linux operating system on 32bit x86 CPU -@@ -908,7 +970,7 @@ endif - ifeq ($(compiler),intel) - PPFC := ifort -w - FC := ifort -w -- PFC ?= mpif90 -+ PFC := mpif90 - OPTLVL := -O2 - ifeq ($(ADC_DEBUG),yes) - OPTLVL := -g -@@ -917,7 +979,7 @@ ifeq ($(compiler),intel) - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCSCA -DCMPI -+ DP := -DREAL8 -DLINUX -DCSCA -DCMPI -DHAVE_MPI_MOD - DPRE := -DREAL8 -DLINUX - IMODS := -I - CC := icc -@@ -989,69 +1051,6 @@ ifeq ($(compiler),gnu) - endif - endif - # --# gfortran --ifeq ($(compiler),gfortran) -- ifeq ($(MACHINENAME),jason-desktop) -- XDMFPATH := /home/jason/projects/XDMF/Code/latestCode -- XDMFLIBPATH := /home/jason/projects/XDMF/Code/testLatest -- endif -- PPFC := gfortran -- FC := gfortran -- PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O2 -ffixed-line-length-none -- ifeq ($(PROFILE),enable) -- FFLAGS1 := $(INCDIRS) -pg -O0 -fprofile-arcs -ftest-coverage -ffixed-line-length-none -- endif -- ifeq ($(DEBUG),full) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -DDEBUG_WARN_ELEV -- endif -- ifeq ($(DEBUG),compiler-warnings) -- FFLAGS1 := $(INCDIRS) -g -O0 -Wall -Wextra -ffixed-line-length-none -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -- endif -- ifeq ($(DEBUG),full-not-warnelev) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -- endif -- ifeq ($(DEBUG),full-not-fpe) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -- endif -- ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -- endif -- ifneq ($(MACHINENAME),jason-desktop) -- FFLAGS1 := $(FFLAGS1) -fno-underscoring -- endif -- FFLAGS2 := $(FFLAGS1) -- FFLAGS3 := $(FFLAGS1) -- DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCSCA -DCMPI -- DPRE := -DREAL8 -DLINUX -- ifeq ($(SWAN),enable) -- DPRE := -DREAL8 -DLINUX -DADCSWAN -- endif -- FLIBS := -- ifeq ($(NETCDF),enable) -- ifeq ($(MACHINENAME),jason-desktop) -- NETCDFHOME := /usr -- endif -- FLIBS := $(FLIBS) -lnetcdff -- endif -- IMODS := -I -- CC := gcc -- CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O2 -DLINUX -- ifeq ($(DEBUG),full) -- CFLAGS := $(INCDIRS) -g -O0 -DLINUX -- endif -- CLIBS := -- MSGLIBS := -- $(warning (INFO) Corresponding machine found in cmplrflags.mk.) -- ifneq ($(FOUND),TRUE) -- FOUND := TRUE -- else -- MULTIPLE := TRUE -- endif --endif -- - endif - - ######################################################################## -@@ -1096,7 +1095,7 @@ ifeq ($(arch),altix) - PPFC := ifort - FC := ifort - PFC := ifort -- FFLAGS1 := $(INCDIRS) -O3 -tpp2 -+ FFLAGS1 := $(INCDIRS) -O2 -tpp2 - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DCSCA -@@ -1169,7 +1168,7 @@ ifeq ($(IBM),p5) - FFLAGS0 := $(INCDIRS) -w -qfixed=132 -qarch=auto -qcache=auto - FFLAGS1 := $(FFLAGS0) -O2 - FFLAGS2 := $(FFLAGS0) -qhot -qstrict -- FFLAGS3 := $(FFLAGS0) -O3 -qinitauto -+ FFLAGS3 := $(FFLAGS0) -O2 -qinitauto - DA := -WF,"-DREAL8,-DIBM,-DCSCA" - DP := -tF -WF,"-DREAL8,-DIBM,-DCSCA,-DCMPI" - DPRE := -tF -WF,"-DREAL8,-DIBM" -@@ -1489,9 +1488,9 @@ ifneq (,$(findstring powerpc-darwin,$(MACHINE)-$(OS))) - PPFC := f90 - FC := f90 - PFC := mpif77 -- FFLAGS1 := $(INCDIRS) -w -O3 -m64 -cpu:g5 -f fixed -W132 -I. -DLINUX -- FFLAGS2 := $(INCDIRS) -w -O3 -m64 -cpu:g5 -N11 -f fixed -W132 -I. -- FFLAGS3 := $(INCDIRS) -w -O3 -m64 -cpu:g5 -N11 -f fixed -W132 -I. -+ FFLAGS1 := $(INCDIRS) -w -O2 -m64 -cpu:g5 -f fixed -W132 -I . -DLINUX -+ FFLAGS2 := $(INCDIRS) -w -O2 -m64 -cpu:g5 -N11 -f fixed -W132 -I . -+ FFLAGS3 := $(INCDIRS) -w -O2 -m64 -cpu:g5 -N11 -f fixed -W132 -I . - DA := -DREAL8 -DCSCA -DLINUX - DP := -DREAL8 -DCSCA -DCMPI -DLINUX - DPRE := -DREAL8 -DLINUX -@@ -1519,17 +1518,17 @@ ifneq (,$(findstring i386-darwin,$(MACHINE)-$(OS))) - PPFC := ifort - FC := ifort - PFC := mpif77 -- FFLAGS1 := $(INCDIRS) -nowarn -O3 -fixed -132 -check all -traceback -DLINUX -DNETCDF_DEBUG -I. --# FFLAGS1 := $(INCDIRS) -nowarn -O3 -fixed -132 -DIBM -I. -- FFLAGS2 := $(INCDIRS) -nowarn -O3 -fixed -132 -I. -- FFLAGS3 := $(INCDIRS) -nowarn -O3 -fixed -132 -I. -+ FFLAGS1 := $(INCDIRS) -nowarn -O2 -fixed -132 -check all -traceback -DLINUX -DNETCDF_DEBUG -I . -+# FFLAGS1 := $(INCDIRS) -nowarn -O2 -fixed -132 -DIBM -I . -+ FFLAGS2 := $(INCDIRS) -nowarn -O2 -fixed -132 -I . -+ FFLAGS3 := $(INCDIRS) -nowarn -O2 -fixed -132 -I . - DA := -DREAL8 -DCSCA -DLINUX - DP := -DREAL8 -DCSCA -DLINUX -DCMPI -DNETCDF_DEBUG - DPRE := -DREAL8 -DLINUX - IMODS := -I - CC := gcc - CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O3 -DLINUX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX - LDFLAGS := - FLIBS := - MSGLIBS := diff --git a/patches/ADCIRC/latest-upstream/about.txt b/patches/ADCIRC/latest-upstream/about.txt deleted file mode 100644 index f821f0a96..000000000 --- a/patches/ADCIRC/latest-upstream/about.txt +++ /dev/null @@ -1 +0,0 @@ -Attempts to build the latest upstream development branch (main) diff --git a/patches/ADCIRC/latest-upstream/info.sh b/patches/ADCIRC/latest-upstream/info.sh deleted file mode 100644 index 415800793..000000000 --- a/patches/ADCIRC/latest-upstream/info.sh +++ /dev/null @@ -1,5 +0,0 @@ -export ADCIRC_SRC_TYPE=git -export ADCIRC_GIT_URL=https://github.com/adcirc -export ADCIRC_GIT_REPO=adcirc -export ADCIRC_GIT_BRANCH=main -export SWANDIR=thirdparty/swan diff --git a/patches/ADCIRC/noaa.stofs.2d.glo.v1.1.0r2/01-issue-1299.patch b/patches/ADCIRC/noaa.stofs.2d.glo.v1.1.0r2/01-issue-1299.patch deleted file mode 100644 index da295c344..000000000 --- a/patches/ADCIRC/noaa.stofs.2d.glo.v1.1.0r2/01-issue-1299.patch +++ /dev/null @@ -1,591 +0,0 @@ -diff --git a/work/cmplrflags.mk b/work/cmplrflags.mk -index cafdbe0..369f2d0 100644 ---- a/work/cmplrflags.mk -+++ b/work/cmplrflags.mk -@@ -1,15 +1,15 @@ - # SRCDIR is set in makefile or on the compile line --INCDIRS := -I. -I$(SRCDIR)/prep -+INCDIRS := -I . -I $(SRCDIR)/prep - - ######################################################################## - # Compiler flags for Linux operating system on 64bit x86 CPU - # --ifeq ($(MACHINE)-$(OS),x86_64-linux-gnu) -+ifeq ($(MACHINE)-$(OS),i686-mingw32) - # - # ***NOTE*** User must select between various Linux setups - # by commenting/uncommenting the appropriate compiler - # --#compiler=gnu -+compiler=gnu - ifeq ($(compiler),gnu) - PPFC := gfortran - FC := gfortran -@@ -53,7 +53,7 @@ ifeq ($(MACHINE)-$(OS),x86_64-linux-gnu) - #compiler=gnu - #compiler=g95 - #compiler=gfortran --compiler=intel -+#compiler=intel - #compiler=intel-ND - #compiler=intel-lonestar - #compiler=intel-sgi -@@ -90,12 +90,9 @@ ifeq ($(compiler),gnu) - ifeq ($(NETCDF),enable) - ifeq ($(MACHINENAME),blueridge) - # FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -- NETCDFHOME :=/usr - FFLAGS1 :=$(FFLAGS1) -I/usr/lib64/gfortran/modules - FFLAGS2 :=$(FFLAGS1) - FFLAGS3 :=$(FFLAGS1) -- # NETCDFHOME :=/shared/apps/RHEL-5/x86_64/NetCDF/netcdf-4.1.1-gcc4.1-ifort -- # NETCDFHOME :=/shared/apps/RHEL-5/x86_64/NetCDF/netcdf-4.1.2-gcc4.1-ifort - FLIBS :=$(FLIBS) -L/usr/lib64 -lnetcdff - else - FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -lhdf5_fortran -@@ -200,7 +197,7 @@ ifeq ($(compiler),g95) - PPFC := g95 - FC := g95 - PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O3 -mcmodel=medium -fstatic -ffixed-line-length-132 -+ FFLAGS1 := $(INCDIRS) -O2 -mcmodel=medium -fstatic -ffixed-line-length-132 - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -@@ -225,11 +222,13 @@ endif - # jgf: The -i-dynamic flag defers the inclusion of the library with - # feupdateenv until run time, thus avoiding the error message: - # "feupdateenv is not implemented and will always fail" --ifeq ($(compiler),intel) -+# this line is to support icc/ifort and icx/ifort (llvm based) -+ifneq (,$(filter intel intel-oneapi,$(compiler))) -+ CC := icc - PPFC := ifort - FC := ifort -- PFC ?= mpif90 -- FFLAGS1 := $(INCDIRS) -O2 -g -traceback -FI -assume byterecl -132 -xSSE4.2 -assume buffered_io -+ PFC := mpif90 -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xSSE4.2 - CFLAGS := $(INCDIRS) -O2 -xSSE4.2 -m64 -mcmodel=medium -DLINUX - FLIBS := - ifeq ($(DEBUG),full) -@@ -238,9 +237,6 @@ ifeq ($(compiler),intel) - ifeq ($(DEBUG),full) - FFLAGS1 := $(INCDIRS) -g -O0 -traceback -debug all -check all -ftrapuv -fpe0 -FI -assume byterecl -132 -DALL_TRACE -DFULL_STACK -DFLUSH_MESSAGES - endif -- ifeq ($(DEBUG),full-not-fpe) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -debug all -check all -FI -assume byterecl -132 -DALL_TRACE -DFULL_STACK -DFLUSH_MESSAGES -- endif - ifeq ($(DEBUG),trace) - FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -DALL_TRACE -DFULL_STACK -DFLUSH_MESSAGES - endif -@@ -252,45 +248,111 @@ ifeq ($(compiler),intel) - endif - # - ifeq ($(MACHINENAME),stampede2) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - endif - endif -- ifeq ($(MACHINENAME),frontera) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xCORE-AVX512 -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xCORE-AVX512 -- FLIBS := $(INCDIRS) -xCORE-AVX512 -+ ifeq ($(MACHINENAME),frontera) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xCORE-AVX512 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX512 -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX512 - CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX512 -- FLIBS := $(INCDIRS) -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 - endif - endif - ifeq ($(MACHINENAME),queenbee) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xSSE4.2 -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xSSE4.2 -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xSSE4.2 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xSSE4.2 - FLIBS := $(INCDIRS) -xSSE4.2 - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xSSE4.2 -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xSSE4.2 - CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xSSE4.2 - FLIBS := $(INCDIRS) -xSSE4.2 - endif - endif -- ifeq ($(MACHINENAME),supermic) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xAVX -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xAVX -+ ifeq ($(MACHINENAME),queenbeeC) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xCORE-AVX512 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX512 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 -+ endif -+ endif -+ ifeq ($(MACHINENAME),queenbeeD) -+ PFC := mpiifort -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xAVX - FLIBS := $(INCDIRS) -xAVX - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -assume buffered_io -- CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX - FLIBS := $(INCDIRS) -xAVX - endif - endif -+ ifeq ($(MACHINENAME),supermic) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ endif -+ endif -+ ifeq ($(MACHINENAME),rostam) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ endif -+ endif -+ ifeq ($(MACHINENAME),ls6) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -+ FLIBS := $(INCDIRS) -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -+ FLIBS := $(INCDIRS) -+ endif -+ endif -+ #wwlwpd: NOTE: Mike III at LSU-HPC recommends 'mpiifort', Intel's MPI implementation wrapper -+ #wwlwpd: instead of the traditional "mpif90"; but the flags are the same we still redefine -+ #wwlwpd: "PFC" below -+ ifeq ($(MACHINENAME),mike) -+ PFC := mpiifort -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ endif -+ endif -+ ifeq ($(MACHINENAME),stampede3) -+ CC := icx -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xCORE-AVX2 -axCORE-AVX512 -Wno-implicit-function-declaration -+ FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -Wimplicit-function-declaration -+ FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -+ endif -+ endif - # - #@jasonfleming Added to fix bus error on hatteras@renci - ifeq ($(HEAP_ARRAYS),fix) -@@ -305,51 +367,51 @@ ifeq ($(compiler),intel) - DPRE := $(DPRE) -DADCSWAN - endif - IMODS := -I -- CC := icc -+ #CC := icc # get from start of this section - CCBE := $(CC) - CLIBS := - MSGLIBS := - ifeq ($(NETCDF),enable) -- ifeq ($(MACHINENAME),hatteras) -- NETCDFHOME :=$(shell nf-config --prefix) -- FLIBS :=$(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -- FFLAGS1 :=$(FFLAGS1) -I$(NETCDFHOME)/include -- FFLAGS2 :=$(FFLAGS1) -- FFLAGS3 :=$(FFLAGS1) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - # jgf20150417 queenbee requires that the analyst load the netcdf and - # netcdf_fortran modules prior to compiling or executing ADCIRC - ifeq ($(MACHINENAME),queenbee) -- FLIBS := $(FLIBS) -L/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0/lib -lnetcdff -lnetcdf -- NETCDFHOME :=/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0 -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),queenbeeC) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),queenbeeD) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),supermic) -- FLIBS := $(FLIBS) -L/usr/local/packages/netcdf_fortran/4.2/INTEL-140-MVAPICH2-2.0/lib -lnetcdff -L/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0/lib -lnetcdf -lnetcdf -liomp5 -lpthread -- NETCDFHOME :=/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0/include -- FFLAGS1 :=$(FFLAGS1) -I/usr/local/packages/hdf5/1.8.12/INTEL-140-MVAPICH2-2.0/include -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),rostam) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),stampede) -- NETCDFHOME :=/opt/apps/intel17/netcdf/4.3.3.1/x86_64 - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),stampede2) -- NETCDFHOME :=/opt/apps/intel17/netcdf/4.3.3.1/x86_64 - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -- ifeq ($(USER),jgflemin) -- NETCDFHOME :=/work/00976/jgflemin/stampede2/local -- FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -- endif -+ endif -+ ifeq ($(MACHINENAME),stampede3) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),frontera) -- # specify NETCDFHOME on the command line or as an environment var - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - # @jasonfleming: Added support for lonestar5 at tacc.utexas.edu; - # load the following module: netcdf/4.3.3.1 - ifeq ($(MACHINENAME),lonestar5) -- #NETCDFHOME :=/opt/apps/intel18/netcdf/4.3.3.1/x86_64 -- # @jasonfleming: Updated support for lonestar5 -- NETCDFHOME :=/opt/apps/intel18/netcdf/4.6.2/x86_64 -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),ls6) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),mike) - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - # jgf20150817: Adding support for spirit.afrl.hpc.mil; -@@ -362,25 +424,12 @@ ifeq ($(compiler),intel) - # jgf20150420 mike requires that the analyst add netcdf to the softenv - # with the following on the command line - # soft add +netcdf-4.1.3-Intel-13.0.0 -- ifeq ($(MACHINENAME),mike) -- FLIBS := $(FLIBS) -L/usr/local/packages/netcdf/4.1.3/Intel-13.0.0/lib -lnetcdff -lnetcdf -- NETCDFHOME :=/usr/local/packages/netcdf/4.1.3/Intel-13.0.0 -- endif - ifeq ($(MACHINENAME),killdevil) - HDF5HOME :=/nas02/apps/hdf5-1.8.5/lib - NETCDFHOME :=/nas02/apps/netcdf-4.1.1 - FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -lhdf5_fortran - endif - endif -- --# ------------ -- ifeq ($(NETCDF),enable) -- ifeq ($(WDALTVAL),enable) -- DP := $(DP) -DWDVAL_NETCDF -- endif -- endif --# ----------- -- - #jgf20110519: For netcdf on topsail at UNC, use - #NETCDFHOME=/ifs1/apps/netcdf/ - $(warning (INFO) Corresponding machine found in cmplrflags.mk.) -@@ -390,62 +439,36 @@ ifeq ($(compiler),intel) - MULTIPLE := TRUE - endif - endif -- - # - # Corbitt 120322: These flags work on the Notre Dame Athos & Zas - ifeq ($(compiler),intel-ND) -- PPFC := ifort -+ PPFC := ifort - FC := ifort -- PFC ?= mpif90 --# FFLAGS1 := $(INCDIRS) -w -O3 -assume byterecl -132 -assume buffered_io #-i-dynamic -- -- ifeq ($(AMD),yes) -- FFLAGS1 := $(INCDIRS) -g -traceback -O2 -assume byterecl -132 -mcmodel=medium -shared-intel -assume buffered_io -- else -- FFLAGS1 := $(INCDIRS) -O3 -g -traceback -xSSE4.2 -assume byterecl -132 -mcmodel=medium -shared-intel -assume buffered_io --# FFLAGS1 := $(INCDIRS) -O2 -g -traceback -xSSE4.2 -assume byterecl -132 -mcmodel=medium -shared-intel -assume buffered_io --# FFLAGS1 := $(INCDIRS) -O0 -g -traceback -check bounds -xSSE4.2 -assume byterecl -132 -mcmodel=medium -shared-intel -assume buffered_io -- endif -+ PFC := mpif90 -+ FFLAGS1 := $(INCDIRS) -w -O2 -assume byterecl -132 -i-dynamic - ifeq ($(DEBUG),full) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -debug -check all -FI -assume byterecl -132 -DEBUG -DALL_TRACE -DFULL_STACK -DFLUSH_MESSAGES -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -debug -check all -i-dynamic -FI -assume byterecl -132 -DALL_TRACE -DFULL_STACK -DFLUSH_MESSAGES - endif - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCSCA -DCMPI #-DNOFSBPG #-DNOIVB -DPOWELL -+ DP := -DREAL8 -DLINUX -DCSCA -DCMPI -DPOWELL - DPRE := -DREAL8 -DLINUX -DADCSWAN - ifeq ($(SWAN),enable) -- DPRE := $(DPRE) -DADCSWAN -+ DPRE := $(DPRE) -DADCSWAN - endif - IMODS := -I - CC := icc - CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O3 -m64 -mcmodel=medium -DLINUX -- FLIBS := -- ifeq ($(DATETIME),enable) -- DATETIMEHOME := /pontus/gling/ADCIRC_Codes/adcirc-cg-GLOBAL_WP_20200513/lib/datetime-fortran/ -- FLIBS := -ldatetime -L$(DATETIMEHOME)lib/ -- endif -- ifeq ($(GRIB2),enable) -- WGRIB2HOME := /pontus/gling/ADCIRC_Codes/adcirc-cg-GLOBAL_WP_20200513/lib/grib2/lib/ -- FLIBS := $(FLIBS) -lwgrib2_api -lwgrib2 -ljasper -L$(WGRIB2HOME) -- endif -+ CFLAGS := $(INCDIRS) -O2 -m64 -mcmodel=medium -DLINUX -+ FLIBS := - ifeq ($(DEBUG),full) -- CFLAGS := $(INCDIRS) -g -O0 -m64 -march=k8 -mcmodel=medium -DLINUX -- endif -- ifeq ($(NETCDF),enable) -- #HDF5HOME=/afs/crc.nd.edu/x86_64_linux/hdf/hdf5-1.8.6-linux-x86_64-static/lib -- HDF5HOME=/opt/crc/n/netcdf/4.7.0/intel/18.0 -- FLIBS := $(FLIBS) -lnetcdff -L$(HDF5HOME) -+ CFLAGS := $(INCDIRS) -g -O0 -march=k8 -m64 -mcmodel=medium -DLINUX - endif --# ------------ - ifeq ($(NETCDF),enable) -- ifeq ($(WDALTVAL),enable) -- DP := $(DP) -DWDVAL_NETCDF -- endif -+ HDF5HOME=/afs/crc.nd.edu/x86_64_linux/hdf/hdf5-1.8.6-linux-x86_64-static/lib -+ FLIBS := $(FLIBS) -lnetcdff -L$(HDF5HOME) - endif --# ----------- -- - CLIBS := - MSGLIBS := - $(warning (INFO) Corresponding machine found in cmplrflags.mk.) -@@ -454,18 +477,19 @@ ifeq ($(compiler),intel-ND) - else - MULTIPLE := TRUE - endif -- NETCDFHOME=/afs/crc.nd.edu/x86_64_linux/n/netcdf/4.7.0/intel/18.0/ -+ NETCDFHOME=/afs/crc.nd.edu/x86_64_linux/netcdf/rhel6/4.1.3/intel-12.0/ -+ #NETCDFHOME=/afs/crc.nd.edu/x86_64_linux/scilib/netcdf/4.1.2/intel-12.0/inst - endif -- -+# - # SGI ICE X (e.g. topaz@ERDC) using Intel compilers, added by TCM - # jgf: Added flags for Thunder@AFRL. - ifeq ($(compiler),intel-sgi) - PPFC := ifort - FC := ifort -- PFC ?= mpif90 -+ PFC := mpif90 - CC := icc -O2 -no-ipo - CCBE := icc -O2 -no-ipo -- FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -finline-limit=1000 -real-size 64 -no-ipo -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -finline-limit=1000 -real-size 64 -no-ipo - # FFLAGS1 := $(INCDIRS) -Mextend -g -O0 -traceback - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) -assume buffered_stdout -@@ -621,7 +645,7 @@ ifeq ($(compiler),xtintel) - PFC := ftn - CC := cc -O2 -no-ipo - CCBE := cc -O2 -no-ipo -- FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -default64 -finline-limit=1000 -real-size 64 -no-ipo -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -default64 -finline-limit=1000 -real-size 64 -no-ipo - # FFLAGS1 := $(INCDIRS) -Mextend -g -O0 -traceback - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) -assume buffered_stdout -@@ -753,8 +777,8 @@ ifeq ($(compiler),diamond) - PPFC := ifort - FC := ifort - PFC := ifort --# FFLAGS1 := $(INCDIRS) -O3 -xT -132 -- FFLAGS1 := -O3 -132 -xSSSE3 -+# FFLAGS1 := $(INCDIRS) -O2 -xT -132 -+ FFLAGS1 := -O2 -132 -xSSSE3 - ifeq ($(DEBUG),full) - FFLAGS1 := $(INCDIRS) -g -O0 -debug -fpe0 -132 -traceback -check all -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK - endif -@@ -769,8 +793,8 @@ ifeq ($(compiler),diamond) - IMODS := -I - CC := icc - CCBE := $(CC) --# CFLAGS := $(INCDIRS) -O3 -xT -- CFLAGS := $(INCDIRS) -O3 -xSSSE3 -+# CFLAGS := $(INCDIRS) -O2 -xT -+ CFLAGS := $(INCDIRS) -O2 -xSSSE3 - ifeq ($(DEBUG),full) - CFLAGS := $(INCDIRS) -g -O0 - endif -@@ -846,7 +870,7 @@ ifeq ($(compiler),kraken) - PPFC := ftn - FC := ftn - PFC := ftn -- FFLAGS1 := $(INCDIRS) -O3 -static -132 -+ FFLAGS1 := $(INCDIRS) -O2 -static -132 - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -DPOWELL -@@ -896,8 +920,7 @@ ifeq ($(compiler),circleci) - MULTIPLE := TRUE - endif - endif --# --endif -+ - #$(MACHINE) - ######################################################################## - # Compiler flags for Linux operating system on 32bit x86 CPU -@@ -944,7 +967,7 @@ endif - ifeq ($(compiler),intel) - PPFC := ifort -w - FC := ifort -w -- PFC ?= mpif90 -+ PFC := mpif90 - OPTLVL := -O2 - ifeq ($(ADC_DEBUG),yes) - OPTLVL := -g -@@ -1025,69 +1048,6 @@ ifeq ($(compiler),gnu) - endif - endif - # --# gfortran --ifeq ($(compiler),gfortran) -- ifeq ($(MACHINENAME),jason-desktop) -- XDMFPATH := /home/jason/projects/XDMF/Code/latestCode -- XDMFLIBPATH := /home/jason/projects/XDMF/Code/testLatest -- endif -- PPFC := gfortran -- FC := gfortran -- PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O2 -ffixed-line-length-none -- ifeq ($(PROFILE),enable) -- FFLAGS1 := $(INCDIRS) -pg -O0 -fprofile-arcs -ftest-coverage -ffixed-line-length-none -- endif -- ifeq ($(DEBUG),full) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -DDEBUG_WARN_ELEV -- endif -- ifeq ($(DEBUG),compiler-warnings) -- FFLAGS1 := $(INCDIRS) -g -O0 -Wall -Wextra -ffixed-line-length-none -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -- endif -- ifeq ($(DEBUG),full-not-warnelev) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -- endif -- ifeq ($(DEBUG),full-not-fpe) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -- endif -- ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -- endif -- ifneq ($(MACHINENAME),jason-desktop) -- FFLAGS1 := $(FFLAGS1) -fno-underscoring -- endif -- FFLAGS2 := $(FFLAGS1) -- FFLAGS3 := $(FFLAGS1) -- DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCSCA -DCMPI -- DPRE := -DREAL8 -DLINUX -- ifeq ($(SWAN),enable) -- DPRE := -DREAL8 -DLINUX -DADCSWAN -- endif -- FLIBS := -- ifeq ($(NETCDF),enable) -- ifeq ($(MACHINENAME),jason-desktop) -- NETCDFHOME := /usr -- endif -- FLIBS := $(FLIBS) -lnetcdff -- endif -- IMODS := -I -- CC := gcc -- CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O2 -DLINUX -- ifeq ($(DEBUG),full) -- CFLAGS := $(INCDIRS) -g -O0 -DLINUX -- endif -- CLIBS := -- MSGLIBS := -- $(warning (INFO) Corresponding machine found in cmplrflags.mk.) -- ifneq ($(FOUND),TRUE) -- FOUND := TRUE -- else -- MULTIPLE := TRUE -- endif --endif -- - endif - - ######################################################################## -@@ -1132,7 +1092,7 @@ ifeq ($(arch),altix) - PPFC := ifort - FC := ifort - PFC := ifort -- FFLAGS1 := $(INCDIRS) -O3 -tpp2 -+ FFLAGS1 := $(INCDIRS) -O2 -tpp2 - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DCSCA -@@ -1205,7 +1165,7 @@ ifeq ($(IBM),p5) - FFLAGS0 := $(INCDIRS) -w -qfixed=132 -qarch=auto -qcache=auto - FFLAGS1 := $(FFLAGS0) -O2 - FFLAGS2 := $(FFLAGS0) -qhot -qstrict -- FFLAGS3 := $(FFLAGS0) -O3 -qinitauto -+ FFLAGS3 := $(FFLAGS0) -O2 -qinitauto - DA := -WF,"-DREAL8,-DIBM,-DCSCA" - DP := -tF -WF,"-DREAL8,-DIBM,-DCSCA,-DCMPI" - DPRE := -tF -WF,"-DREAL8,-DIBM" -@@ -1525,9 +1485,9 @@ ifneq (,$(findstring powerpc-darwin,$(MACHINE)-$(OS))) - PPFC := f90 - FC := f90 - PFC := mpif77 -- FFLAGS1 := $(INCDIRS) -w -O3 -m64 -cpu:g5 -f fixed -W132 -I. -DLINUX -- FFLAGS2 := $(INCDIRS) -w -O3 -m64 -cpu:g5 -N11 -f fixed -W132 -I. -- FFLAGS3 := $(INCDIRS) -w -O3 -m64 -cpu:g5 -N11 -f fixed -W132 -I. -+ FFLAGS1 := $(INCDIRS) -w -O2 -m64 -cpu:g5 -f fixed -W132 -I . -DLINUX -+ FFLAGS2 := $(INCDIRS) -w -O2 -m64 -cpu:g5 -N11 -f fixed -W132 -I . -+ FFLAGS3 := $(INCDIRS) -w -O2 -m64 -cpu:g5 -N11 -f fixed -W132 -I . - DA := -DREAL8 -DCSCA -DLINUX - DP := -DREAL8 -DCSCA -DCMPI -DLINUX - DPRE := -DREAL8 -DLINUX -@@ -1555,17 +1515,17 @@ ifneq (,$(findstring i386-darwin,$(MACHINE)-$(OS))) - PPFC := ifort - FC := ifort - PFC := mpif77 -- FFLAGS1 := $(INCDIRS) -nowarn -O3 -fixed -132 -check all -traceback -DLINUX -DNETCDF_DEBUG -I. --# FFLAGS1 := $(INCDIRS) -nowarn -O3 -fixed -132 -DIBM -I. -- FFLAGS2 := $(INCDIRS) -nowarn -O3 -fixed -132 -I. -- FFLAGS3 := $(INCDIRS) -nowarn -O3 -fixed -132 -I. -+ FFLAGS1 := $(INCDIRS) -nowarn -O2 -fixed -132 -check all -traceback -DLINUX -DNETCDF_DEBUG -I . -+# FFLAGS1 := $(INCDIRS) -nowarn -O2 -fixed -132 -DIBM -I . -+ FFLAGS2 := $(INCDIRS) -nowarn -O2 -fixed -132 -I . -+ FFLAGS3 := $(INCDIRS) -nowarn -O2 -fixed -132 -I . - DA := -DREAL8 -DCSCA -DLINUX - DP := -DREAL8 -DCSCA -DLINUX -DCMPI -DNETCDF_DEBUG - DPRE := -DREAL8 -DLINUX - IMODS := -I - CC := gcc - CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O3 -DLINUX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX - LDFLAGS := - FLIBS := - MSGLIBS := diff --git a/patches/ADCIRC/noaa.stofs.2d.glo.v1.1.0r2/about.txt b/patches/ADCIRC/noaa.stofs.2d.glo.v1.1.0r2/about.txt deleted file mode 100644 index 56b821ae4..000000000 --- a/patches/ADCIRC/noaa.stofs.2d.glo.v1.1.0r2/about.txt +++ /dev/null @@ -1 +0,0 @@ -upstream version tagged, noaa.stofs.2d.glo.v1.1.0r2 diff --git a/patches/ADCIRC/noaa.stofs.2d.glo.v1.1.0r2/info.sh b/patches/ADCIRC/noaa.stofs.2d.glo.v1.1.0r2/info.sh deleted file mode 100644 index 5c141753c..000000000 --- a/patches/ADCIRC/noaa.stofs.2d.glo.v1.1.0r2/info.sh +++ /dev/null @@ -1,5 +0,0 @@ -export ADCIRC_SRC_TYPE=git -export ADCIRC_GIT_URL=https://github.com/stormsurgelive -export ADCIRC_GIT_REPO=adcirc -export ADCIRC_GIT_BRANCH=noaa.stofs.2d.glo.v1.1.0r2 -export SWANDIR=thirdparty/swan diff --git a/patches/ADCIRC/noaa.stofs.2d.glo.v2.1.0r1.v55.12/01-issue-1299.patch b/patches/ADCIRC/noaa.stofs.2d.glo.v2.1.0r1.v55.12/01-issue-1299.patch deleted file mode 100644 index 9e894bb7e..000000000 --- a/patches/ADCIRC/noaa.stofs.2d.glo.v2.1.0r1.v55.12/01-issue-1299.patch +++ /dev/null @@ -1,754 +0,0 @@ -diff --git a/work/cmplrflags.mk b/work/cmplrflags.mk -index 9f89de7..369f2d0 100644 ---- a/work/cmplrflags.mk -+++ b/work/cmplrflags.mk -@@ -1,5 +1,46 @@ - # SRCDIR is set in makefile or on the compile line --INCDIRS := -I. -I$(SRCDIR)/prep -+INCDIRS := -I . -I $(SRCDIR)/prep -+ -+######################################################################## -+# Compiler flags for Linux operating system on 64bit x86 CPU -+# -+ifeq ($(MACHINE)-$(OS),i686-mingw32) -+# -+# ***NOTE*** User must select between various Linux setups -+# by commenting/uncommenting the appropriate compiler -+# -+compiler=gnu -+ifeq ($(compiler),gnu) -+ PPFC := gfortran -+ FC := gfortran -+ PFC := mpif90 -+ FFLAGS1 := $(INCDIRS) -O2 -mcmodel=medium -ffixed-line-length-none -march=corei7-avx -m64 -static -+ FFLAGS2 := $(FFLAGS1) -+ FFLAGS3 := $(FFLAGS1) -+ DA := -DREAL8 -DLINUX -DCSCA -+ DP := -DREAL8 -DLINUX -DCSCA -DCMPI -DHAVE_MPI_MOD -+ DPRE := -DREAL8 -DLINUX -+ IMODS := -I -+ CC := gcc -+ CCBE := $(CC) -+ CFLAGS := $(INCDIRS) -O2 -mcmodel=medium -DLINUX -march=corei7-avx -m64 -static-libgcc -+ CLIBS := -+ LIBS := -+ MSGLIBS := -+ ifeq ($(NETCDF),enable) -+ FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -lhdf5_fortran -+ endif -+ $(warning (INFO) Corresponding compilers and flags found in cmplrflags.mk.) -+ ifneq ($(FOUND),TRUE) -+ FOUND := TRUE -+ else -+ MULTIPLE := TRUE -+ endif -+endif -+endif -+#$(MACHINE) -+ -+ - - ######################################################################## - # Compiler flags for Linux operating system on 64bit x86 CPU -@@ -33,28 +74,25 @@ ifeq ($(compiler),gnu) - PPFC := gfortran - FC := gfortran - PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O2 -mcmodel=medium -ffixed-line-length-none -m64 -+ FFLAGS1 := $(INCDIRS) -O2 -mcmodel=medium -ffixed-line-length-none -march=k8 -m64 - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCSCA -DCMPI -+ DP := -DREAL8 -DLINUX -DCSCA -DCMPI -DHAVE_MPI_MOD - DPRE := -DREAL8 -DLINUX - IMODS := -I - CC := gcc - CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O2 -mcmodel=medium -DLINUX -m64 -+ CFLAGS := $(INCDIRS) -O2 -mcmodel=medium -DLINUX -march=k8 -m64 - CLIBS := - LIBS := - MSGLIBS := - ifeq ($(NETCDF),enable) - ifeq ($(MACHINENAME),blueridge) - # FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -- NETCDFHOME :=/usr - FFLAGS1 :=$(FFLAGS1) -I/usr/lib64/gfortran/modules - FFLAGS2 :=$(FFLAGS1) - FFLAGS3 :=$(FFLAGS1) -- # NETCDFHOME :=/shared/apps/RHEL-5/x86_64/NetCDF/netcdf-4.1.1-gcc4.1-ifort -- # NETCDFHOME :=/shared/apps/RHEL-5/x86_64/NetCDF/netcdf-4.1.2-gcc4.1-ifort - FLIBS :=$(FLIBS) -L/usr/lib64 -lnetcdff - else - FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -lhdf5_fortran -@@ -136,12 +174,7 @@ ifeq ($(compiler),gfortran) - FFLAGS2 := $(FFLAGS2) -I/usr/lib64/gfortran/modules - FFLAGS3 := $(FFLAGS3) -I/usr/lib64/gfortran/modules - endif -- ifeq ($(MACHINENAME),wsl2-ubuntu) -- NETCDFHOME := /usr -- FFLAGS1 := $(FFLAGS1) -I/usr/include -- FFLAGS2 := $(FFLAGS2) -I/usr/include -- FFLAGS3 := $(FFLAGS3) -I/usr/include -- endif -+ FLIBS := $(FLIBS) -lnetcdff - endif - IMODS := -I - CC := gcc -@@ -164,7 +197,7 @@ ifeq ($(compiler),g95) - PPFC := g95 - FC := g95 - PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O3 -mcmodel=medium -fstatic -ffixed-line-length-132 -+ FFLAGS1 := $(INCDIRS) -O2 -mcmodel=medium -fstatic -ffixed-line-length-132 - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -@@ -189,22 +222,21 @@ endif - # jgf: The -i-dynamic flag defers the inclusion of the library with - # feupdateenv until run time, thus avoiding the error message: - # "feupdateenv is not implemented and will always fail" --ifeq ($(compiler),intel) -+# this line is to support icc/ifort and icx/ifort (llvm based) -+ifneq (,$(filter intel intel-oneapi,$(compiler))) -+ CC := icc - PPFC := ifort - FC := ifort -- PFC ?= mpif90 -- FFLAGS1 := $(INCDIRS) -O2 -g -traceback -FI -assume byterecl -132 -xSSE4.2 -assume buffered_io -+ PFC := mpif90 -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xSSE4.2 - CFLAGS := $(INCDIRS) -O2 -xSSE4.2 -m64 -mcmodel=medium -DLINUX - FLIBS := - ifeq ($(DEBUG),full) -- CFLAGS := $(INCDIRS) -g -O0 -m64 -mcmodel=medium -DLINUX -+ CFLAGS := $(INCDIRS) -g -O0 -march=k8 -m64 -mcmodel=medium -DLINUX - endif - ifeq ($(DEBUG),full) - FFLAGS1 := $(INCDIRS) -g -O0 -traceback -debug all -check all -ftrapuv -fpe0 -FI -assume byterecl -132 -DALL_TRACE -DFULL_STACK -DFLUSH_MESSAGES - endif -- ifeq ($(DEBUG),full-not-fpe) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -debug all -check all -FI -assume byterecl -132 -DALL_TRACE -DFULL_STACK -DFLUSH_MESSAGES -- endif - ifeq ($(DEBUG),trace) - FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -DALL_TRACE -DFULL_STACK -DFLUSH_MESSAGES - endif -@@ -216,45 +248,111 @@ ifeq ($(compiler),intel) - endif - # - ifeq ($(MACHINENAME),stampede2) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - endif - endif -- ifeq ($(MACHINENAME),frontera) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xCORE-AVX512 -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xCORE-AVX512 -- FLIBS := $(INCDIRS) -xCORE-AVX512 -+ ifeq ($(MACHINENAME),frontera) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xCORE-AVX512 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX512 -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX512 - CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX512 -- FLIBS := $(INCDIRS) -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 - endif - endif - ifeq ($(MACHINENAME),queenbee) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xSSE4.2 -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xSSE4.2 -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xSSE4.2 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xSSE4.2 - FLIBS := $(INCDIRS) -xSSE4.2 - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xSSE4.2 -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xSSE4.2 - CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xSSE4.2 - FLIBS := $(INCDIRS) -xSSE4.2 - endif - endif -- ifeq ($(MACHINENAME),supermic) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xAVX -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xAVX -+ ifeq ($(MACHINENAME),queenbeeC) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xCORE-AVX512 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX512 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 -+ endif -+ endif -+ ifeq ($(MACHINENAME),queenbeeD) -+ PFC := mpiifort -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ endif -+ endif -+ ifeq ($(MACHINENAME),supermic) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ endif -+ endif -+ ifeq ($(MACHINENAME),rostam) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xAVX - FLIBS := $(INCDIRS) -xAVX - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -assume buffered_io -- CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX - FLIBS := $(INCDIRS) -xAVX - endif - endif -+ ifeq ($(MACHINENAME),ls6) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -+ FLIBS := $(INCDIRS) -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -+ FLIBS := $(INCDIRS) -+ endif -+ endif -+ #wwlwpd: NOTE: Mike III at LSU-HPC recommends 'mpiifort', Intel's MPI implementation wrapper -+ #wwlwpd: instead of the traditional "mpif90"; but the flags are the same we still redefine -+ #wwlwpd: "PFC" below -+ ifeq ($(MACHINENAME),mike) -+ PFC := mpiifort -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ endif -+ endif -+ ifeq ($(MACHINENAME),stampede3) -+ CC := icx -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xCORE-AVX2 -axCORE-AVX512 -Wno-implicit-function-declaration -+ FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -Wimplicit-function-declaration -+ FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -+ endif -+ endif - # - #@jasonfleming Added to fix bus error on hatteras@renci - ifeq ($(HEAP_ARRAYS),fix) -@@ -269,51 +367,51 @@ ifeq ($(compiler),intel) - DPRE := $(DPRE) -DADCSWAN - endif - IMODS := -I -- CC := icc -+ #CC := icc # get from start of this section - CCBE := $(CC) - CLIBS := - MSGLIBS := - ifeq ($(NETCDF),enable) -- ifeq ($(MACHINENAME),hatteras) -- NETCDFHOME :=$(shell nf-config --prefix) -- FLIBS :=$(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -- FFLAGS1 :=$(FFLAGS1) -I$(NETCDFHOME)/include -- FFLAGS2 :=$(FFLAGS1) -- FFLAGS3 :=$(FFLAGS1) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - # jgf20150417 queenbee requires that the analyst load the netcdf and - # netcdf_fortran modules prior to compiling or executing ADCIRC - ifeq ($(MACHINENAME),queenbee) -- FLIBS := $(FLIBS) -L/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0/lib -lnetcdff -lnetcdf -- NETCDFHOME :=/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0 -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),queenbeeC) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),queenbeeD) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),supermic) -- FLIBS := $(FLIBS) -L/usr/local/packages/netcdf_fortran/4.2/INTEL-140-MVAPICH2-2.0/lib -lnetcdff -L/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0/lib -lnetcdf -lnetcdf -liomp5 -lpthread -- NETCDFHOME :=/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0/include -- FFLAGS1 :=$(FFLAGS1) -I/usr/local/packages/hdf5/1.8.12/INTEL-140-MVAPICH2-2.0/include -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),rostam) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),stampede) -- NETCDFHOME :=/opt/apps/intel17/netcdf/4.3.3.1/x86_64 - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),stampede2) -- NETCDFHOME :=/opt/apps/intel17/netcdf/4.3.3.1/x86_64 - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -- ifeq ($(USER),jgflemin) -- NETCDFHOME :=/work/00976/jgflemin/stampede2/local -- FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -- endif -+ endif -+ ifeq ($(MACHINENAME),stampede3) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),frontera) -- # specify NETCDFHOME on the command line or as an environment var - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - # @jasonfleming: Added support for lonestar5 at tacc.utexas.edu; - # load the following module: netcdf/4.3.3.1 - ifeq ($(MACHINENAME),lonestar5) -- #NETCDFHOME :=/opt/apps/intel18/netcdf/4.3.3.1/x86_64 -- # @jasonfleming: Updated support for lonestar5 -- NETCDFHOME :=/opt/apps/intel18/netcdf/4.6.2/x86_64 -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),ls6) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),mike) - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - # jgf20150817: Adding support for spirit.afrl.hpc.mil; -@@ -326,25 +424,12 @@ ifeq ($(compiler),intel) - # jgf20150420 mike requires that the analyst add netcdf to the softenv - # with the following on the command line - # soft add +netcdf-4.1.3-Intel-13.0.0 -- ifeq ($(MACHINENAME),mike) -- FLIBS := $(FLIBS) -L/usr/local/packages/netcdf/4.1.3/Intel-13.0.0/lib -lnetcdff -lnetcdf -- NETCDFHOME :=/usr/local/packages/netcdf/4.1.3/Intel-13.0.0 -- endif - ifeq ($(MACHINENAME),killdevil) - HDF5HOME :=/nas02/apps/hdf5-1.8.5/lib - NETCDFHOME :=/nas02/apps/netcdf-4.1.1 - FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -lhdf5_fortran - endif - endif -- --# ------------ -- ifeq ($(NETCDF),enable) -- ifeq ($(WDALTVAL),enable) -- DP := $(DP) -DWDVAL_NETCDF -- endif -- endif --# ----------- -- - #jgf20110519: For netcdf on topsail at UNC, use - #NETCDFHOME=/ifs1/apps/netcdf/ - $(warning (INFO) Corresponding machine found in cmplrflags.mk.) -@@ -354,62 +439,36 @@ ifeq ($(compiler),intel) - MULTIPLE := TRUE - endif - endif -- - # - # Corbitt 120322: These flags work on the Notre Dame Athos & Zas - ifeq ($(compiler),intel-ND) -- PPFC := ifort -+ PPFC := ifort - FC := ifort -- PFC ?= mpif90 --# FFLAGS1 := $(INCDIRS) -w -O3 -assume byterecl -132 -assume buffered_io #-i-dynamic -- -- ifeq ($(AMD),yes) -- FFLAGS1 := $(INCDIRS) -g -traceback -O2 -assume byterecl -132 -mcmodel=medium -shared-intel -assume buffered_io -- else -- FFLAGS1 := $(INCDIRS) -O3 -g -traceback -xSSE4.2 -assume byterecl -132 -mcmodel=medium -shared-intel -assume buffered_io --# FFLAGS1 := $(INCDIRS) -O2 -g -traceback -xSSE4.2 -assume byterecl -132 -mcmodel=medium -shared-intel -assume buffered_io --# FFLAGS1 := $(INCDIRS) -O0 -g -traceback -check bounds -xSSE4.2 -assume byterecl -132 -mcmodel=medium -shared-intel -assume buffered_io -- endif -+ PFC := mpif90 -+ FFLAGS1 := $(INCDIRS) -w -O2 -assume byterecl -132 -i-dynamic - ifeq ($(DEBUG),full) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -debug -check all -FI -assume byterecl -132 -DEBUG -DALL_TRACE -DFULL_STACK -DFLUSH_MESSAGES -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -debug -check all -i-dynamic -FI -assume byterecl -132 -DALL_TRACE -DFULL_STACK -DFLUSH_MESSAGES - endif - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCSCA -DCMPI -DHAVE_MPI_MOD #-DNOFSBPG #-DNOIVB -DPOWELL -+ DP := -DREAL8 -DLINUX -DCSCA -DCMPI -DPOWELL - DPRE := -DREAL8 -DLINUX -DADCSWAN - ifeq ($(SWAN),enable) -- DPRE := $(DPRE) -DADCSWAN -+ DPRE := $(DPRE) -DADCSWAN - endif - IMODS := -I - CC := icc - CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O3 -m64 -mcmodel=medium -DLINUX -- FLIBS := -- ifeq ($(DATETIME),enable) -- DATETIMEHOME := /asclepius/cblakely/libs/OC-GTSM_utility/libs/datetime-fortran/build/ -- FLIBS := -ldatetime -L$(DATETIMEHOME)lib/ -- endif -- ifeq ($(GRIB2),enable) -- WGRIB2HOME := /asclepius/cblakely/libs/grib2/lib/ -- FLIBS := $(FLIBS) -lwgrib2_api -lwgrib2 -ljasper -L$(WGRIB2HOME) -- endif -+ CFLAGS := $(INCDIRS) -O2 -m64 -mcmodel=medium -DLINUX -+ FLIBS := - ifeq ($(DEBUG),full) -- CFLAGS := $(INCDIRS) -g -O0 -m64 -mcmodel=medium -DLINUX -+ CFLAGS := $(INCDIRS) -g -O0 -march=k8 -m64 -mcmodel=medium -DLINUX - endif - ifeq ($(NETCDF),enable) -- #HDF5HOME=/afs/crc.nd.edu/x86_64_linux/hdf/hdf5-1.8.6-linux-x86_64-static/lib -- HDF5HOME=/opt/crc/n/netcdf/4.7.0/intel/18.0 -- FLIBS := $(FLIBS) -lnetcdff -L$(HDF5HOME) -+ HDF5HOME=/afs/crc.nd.edu/x86_64_linux/hdf/hdf5-1.8.6-linux-x86_64-static/lib -+ FLIBS := $(FLIBS) -lnetcdff -L$(HDF5HOME) - endif --# ------------ -- ifeq ($(NETCDF),enable) -- ifeq ($(WDALTVAL),enable) -- DP := $(DP) -DWDVAL_NETCDF -- endif -- endif --# ----------- -- - CLIBS := - MSGLIBS := - $(warning (INFO) Corresponding machine found in cmplrflags.mk.) -@@ -418,23 +477,24 @@ ifeq ($(compiler),intel-ND) - else - MULTIPLE := TRUE - endif -- NETCDFHOME=/afs/crc.nd.edu/x86_64_linux/n/netcdf/4.7.0/intel/18.0/ -+ NETCDFHOME=/afs/crc.nd.edu/x86_64_linux/netcdf/rhel6/4.1.3/intel-12.0/ -+ #NETCDFHOME=/afs/crc.nd.edu/x86_64_linux/scilib/netcdf/4.1.2/intel-12.0/inst - endif -- -+# - # SGI ICE X (e.g. topaz@ERDC) using Intel compilers, added by TCM - # jgf: Added flags for Thunder@AFRL. - ifeq ($(compiler),intel-sgi) - PPFC := ifort - FC := ifort -- PFC ?= mpif90 -+ PFC := mpif90 - CC := icc -O2 -no-ipo - CCBE := icc -O2 -no-ipo -- FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -finline-limit=1000 -real-size 64 -no-ipo -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -finline-limit=1000 -real-size 64 -no-ipo - # FFLAGS1 := $(INCDIRS) -Mextend -g -O0 -traceback - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) -assume buffered_stdout - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCMPI -DCSCA -+ DP := -DREAL8 -DLINUX -DCMPI -DHAVE_MPI_MOD -DCSCA - DPRE := -DREAL8 -DLINUX - CFLAGS := $(INCDIRS) -DLINUX - IMODS := -module -@@ -474,8 +534,8 @@ ifeq ($(compiler),cray_xt3) - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) -r8 -Mr8 -Mr8intrinsics - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCMPI -DCSCA -DDEBUG_WARN_ELEV --# DP := -DREAL8 -DLINUX -DCMPI -DCSCA -+ DP := -DREAL8 -DLINUX -DCMPI -DHAVE_MPI_MOD -DCSCA -DDEBUG_WARN_ELEV -+# DP := -DREAL8 -DLINUX -DCMPI -DHAVE_MPI_MOD -DCSCA - DPRE := -DREAL8 -DLINUX - CFLAGS := -c89 $(INCDIRS) -DLINUX - IMODS := -module -@@ -512,7 +572,7 @@ ifeq ($(compiler),cray_xt4) - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) -r8 -Mr8 -Mr8intrinsics - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCMPI -DCSCA -+ DP := -DREAL8 -DLINUX -DCMPI -DHAVE_MPI_MOD -DCSCA - DPRE := -DREAL8 -DLINUX - ifeq ($(SWAN),enable) - DPRE := -DREAL8 -DLINUX -DADCSWAN -@@ -556,7 +616,7 @@ ifeq ($(compiler),cray_xt5) - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) -r8 -Mr8 -Mr8intrinsics - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCMPI -DCSCA -+ DP := -DREAL8 -DLINUX -DCMPI -DHAVE_MPI_MOD -DCSCA - DPRE := -DREAL8 -DLINUX - CFLAGS := -c89 $(INCDIRS) -DLINUX - IMODS := -module -@@ -585,12 +645,12 @@ ifeq ($(compiler),xtintel) - PFC := ftn - CC := cc -O2 -no-ipo - CCBE := cc -O2 -no-ipo -- FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -default64 -finline-limit=1000 -real-size 64 -no-ipo -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -default64 -finline-limit=1000 -real-size 64 -no-ipo - # FFLAGS1 := $(INCDIRS) -Mextend -g -O0 -traceback - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) -assume buffered_stdout - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCMPI -DCSCA -+ DP := -DREAL8 -DLINUX -DCMPI -DHAVE_MPI_MOD -DCSCA - DPRE := -DREAL8 -DLINUX - CFLAGS := $(INCDIRS) -DLINUX - IMODS := -module -@@ -652,7 +712,7 @@ ifeq ($(compiler),utils) - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) -r8 -Mr8 -Mr8intrinsics - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCMPI -DCSCA -+ DP := -DREAL8 -DLINUX -DCMPI -DHAVE_MPI_MOD -DCSCA - DPRE := -DREAL8 -DLINUX - ifeq ($(SWAN),enable) - DPRE := -DREAL8 -DLINUX -DADCSWAN -@@ -717,15 +777,15 @@ ifeq ($(compiler),diamond) - PPFC := ifort - FC := ifort - PFC := ifort --# FFLAGS1 := $(INCDIRS) -O3 -xT -132 -- FFLAGS1 := -O3 -132 -xSSSE3 -+# FFLAGS1 := $(INCDIRS) -O2 -xT -132 -+ FFLAGS1 := -O2 -132 -xSSSE3 - ifeq ($(DEBUG),full) - FFLAGS1 := $(INCDIRS) -g -O0 -debug -fpe0 -132 -traceback -check all -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK - endif - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCSCA -DCMPI -+ DP := -DREAL8 -DLINUX -DCSCA -DCMPI -DHAVE_MPI_MOD - DPRE := -DREAL8 -DLINUX - ifeq ($(SWAN),enable) - DPRE := -DREAL8 -DLINUX -DADCSWAN -@@ -733,8 +793,8 @@ ifeq ($(compiler),diamond) - IMODS := -I - CC := icc - CCBE := $(CC) --# CFLAGS := $(INCDIRS) -O3 -xT -- CFLAGS := $(INCDIRS) -O3 -xSSSE3 -+# CFLAGS := $(INCDIRS) -O2 -xT -+ CFLAGS := $(INCDIRS) -O2 -xSSSE3 - ifeq ($(DEBUG),full) - CFLAGS := $(INCDIRS) -g -O0 - endif -@@ -775,7 +835,7 @@ ifeq ($(compiler),garnet) - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) #-r8 -Mr8 -Mr8intrinsics - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCMPI -DCSCA -+ DP := -DREAL8 -DLINUX -DCMPI -DHAVE_MPI_MOD -DCSCA - DPRE := -DREAL8 -DLINUX - ifeq ($(SWAN),enable) - DPRE := -DREAL8 -DLINUX -DADCSWAN -@@ -810,7 +870,7 @@ ifeq ($(compiler),kraken) - PPFC := ftn - FC := ftn - PFC := ftn -- FFLAGS1 := $(INCDIRS) -O3 -static -132 -+ FFLAGS1 := $(INCDIRS) -O2 -static -132 - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -DPOWELL -@@ -834,24 +894,24 @@ endif - # - # Compiler Flags for CircleCI Build Server - ifeq ($(compiler),circleci) -- PPFC := ifort -- FC := ifort -+ PPFC := gfortran -+ FC := gfortran - PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O0 -132 -+ FFLAGS1 := $(INCDIRS) -O0 -g -mcmodel=medium -ffixed-line-length-none -m64 - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCSCA -DCMPI -+ DP := -DREAL8 -DLINUX -DCSCA -DCMPI -DHAVE_MPI_MOD - DPRE := -DREAL8 -DLINUX -DADCSWAN - IMODS := -I -- CC := icx -+ CC := gcc - CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O0 -mcmodel=medium -DLINUX -m64 -+ CFLAGS := $(INCDIRS) -O0 -g -mcmodel=medium -DLINUX -m64 - CLIBS := - LIBS := - MSGLIBS := - ifeq ($(NETCDF),enable) -- FLIBS := $(FLIBS) -L${NETCDF_C_HOME}/lib -lnetcdff -+ FLIBS := $(FLIBS) -lnetcdff - endif - $(warning (INFO) Corresponding compilers and flags found in cmplrflags.mk.) - ifneq ($(FOUND),TRUE) -@@ -860,8 +920,7 @@ ifeq ($(compiler),circleci) - MULTIPLE := TRUE - endif - endif --# --endif -+ - #$(MACHINE) - ######################################################################## - # Compiler flags for Linux operating system on 32bit x86 CPU -@@ -908,7 +967,7 @@ endif - ifeq ($(compiler),intel) - PPFC := ifort -w - FC := ifort -w -- PFC ?= mpif90 -+ PFC := mpif90 - OPTLVL := -O2 - ifeq ($(ADC_DEBUG),yes) - OPTLVL := -g -@@ -917,7 +976,7 @@ ifeq ($(compiler),intel) - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCSCA -DCMPI -+ DP := -DREAL8 -DLINUX -DCSCA -DCMPI -DHAVE_MPI_MOD - DPRE := -DREAL8 -DLINUX - IMODS := -I - CC := icc -@@ -989,69 +1048,6 @@ ifeq ($(compiler),gnu) - endif - endif - # --# gfortran --ifeq ($(compiler),gfortran) -- ifeq ($(MACHINENAME),jason-desktop) -- XDMFPATH := /home/jason/projects/XDMF/Code/latestCode -- XDMFLIBPATH := /home/jason/projects/XDMF/Code/testLatest -- endif -- PPFC := gfortran -- FC := gfortran -- PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O2 -ffixed-line-length-none -- ifeq ($(PROFILE),enable) -- FFLAGS1 := $(INCDIRS) -pg -O0 -fprofile-arcs -ftest-coverage -ffixed-line-length-none -- endif -- ifeq ($(DEBUG),full) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -DDEBUG_WARN_ELEV -- endif -- ifeq ($(DEBUG),compiler-warnings) -- FFLAGS1 := $(INCDIRS) -g -O0 -Wall -Wextra -ffixed-line-length-none -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -- endif -- ifeq ($(DEBUG),full-not-warnelev) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -- endif -- ifeq ($(DEBUG),full-not-fpe) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -- endif -- ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -- endif -- ifneq ($(MACHINENAME),jason-desktop) -- FFLAGS1 := $(FFLAGS1) -fno-underscoring -- endif -- FFLAGS2 := $(FFLAGS1) -- FFLAGS3 := $(FFLAGS1) -- DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCSCA -DCMPI -- DPRE := -DREAL8 -DLINUX -- ifeq ($(SWAN),enable) -- DPRE := -DREAL8 -DLINUX -DADCSWAN -- endif -- FLIBS := -- ifeq ($(NETCDF),enable) -- ifeq ($(MACHINENAME),jason-desktop) -- NETCDFHOME := /usr -- endif -- FLIBS := $(FLIBS) -lnetcdff -- endif -- IMODS := -I -- CC := gcc -- CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O2 -DLINUX -- ifeq ($(DEBUG),full) -- CFLAGS := $(INCDIRS) -g -O0 -DLINUX -- endif -- CLIBS := -- MSGLIBS := -- $(warning (INFO) Corresponding machine found in cmplrflags.mk.) -- ifneq ($(FOUND),TRUE) -- FOUND := TRUE -- else -- MULTIPLE := TRUE -- endif --endif -- - endif - - ######################################################################## -@@ -1096,7 +1092,7 @@ ifeq ($(arch),altix) - PPFC := ifort - FC := ifort - PFC := ifort -- FFLAGS1 := $(INCDIRS) -O3 -tpp2 -+ FFLAGS1 := $(INCDIRS) -O2 -tpp2 - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DCSCA -@@ -1169,7 +1165,7 @@ ifeq ($(IBM),p5) - FFLAGS0 := $(INCDIRS) -w -qfixed=132 -qarch=auto -qcache=auto - FFLAGS1 := $(FFLAGS0) -O2 - FFLAGS2 := $(FFLAGS0) -qhot -qstrict -- FFLAGS3 := $(FFLAGS0) -O3 -qinitauto -+ FFLAGS3 := $(FFLAGS0) -O2 -qinitauto - DA := -WF,"-DREAL8,-DIBM,-DCSCA" - DP := -tF -WF,"-DREAL8,-DIBM,-DCSCA,-DCMPI" - DPRE := -tF -WF,"-DREAL8,-DIBM" -@@ -1489,9 +1485,9 @@ ifneq (,$(findstring powerpc-darwin,$(MACHINE)-$(OS))) - PPFC := f90 - FC := f90 - PFC := mpif77 -- FFLAGS1 := $(INCDIRS) -w -O3 -m64 -cpu:g5 -f fixed -W132 -I. -DLINUX -- FFLAGS2 := $(INCDIRS) -w -O3 -m64 -cpu:g5 -N11 -f fixed -W132 -I. -- FFLAGS3 := $(INCDIRS) -w -O3 -m64 -cpu:g5 -N11 -f fixed -W132 -I. -+ FFLAGS1 := $(INCDIRS) -w -O2 -m64 -cpu:g5 -f fixed -W132 -I . -DLINUX -+ FFLAGS2 := $(INCDIRS) -w -O2 -m64 -cpu:g5 -N11 -f fixed -W132 -I . -+ FFLAGS3 := $(INCDIRS) -w -O2 -m64 -cpu:g5 -N11 -f fixed -W132 -I . - DA := -DREAL8 -DCSCA -DLINUX - DP := -DREAL8 -DCSCA -DCMPI -DLINUX - DPRE := -DREAL8 -DLINUX -@@ -1519,17 +1515,17 @@ ifneq (,$(findstring i386-darwin,$(MACHINE)-$(OS))) - PPFC := ifort - FC := ifort - PFC := mpif77 -- FFLAGS1 := $(INCDIRS) -nowarn -O3 -fixed -132 -check all -traceback -DLINUX -DNETCDF_DEBUG -I. --# FFLAGS1 := $(INCDIRS) -nowarn -O3 -fixed -132 -DIBM -I. -- FFLAGS2 := $(INCDIRS) -nowarn -O3 -fixed -132 -I. -- FFLAGS3 := $(INCDIRS) -nowarn -O3 -fixed -132 -I. -+ FFLAGS1 := $(INCDIRS) -nowarn -O2 -fixed -132 -check all -traceback -DLINUX -DNETCDF_DEBUG -I . -+# FFLAGS1 := $(INCDIRS) -nowarn -O2 -fixed -132 -DIBM -I . -+ FFLAGS2 := $(INCDIRS) -nowarn -O2 -fixed -132 -I . -+ FFLAGS3 := $(INCDIRS) -nowarn -O2 -fixed -132 -I . - DA := -DREAL8 -DCSCA -DLINUX - DP := -DREAL8 -DCSCA -DLINUX -DCMPI -DNETCDF_DEBUG - DPRE := -DREAL8 -DLINUX - IMODS := -I - CC := gcc - CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O3 -DLINUX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX - LDFLAGS := - FLIBS := - MSGLIBS := diff --git a/patches/ADCIRC/noaa.stofs.2d.glo.v2.1.0r1.v55.12/about.txt b/patches/ADCIRC/noaa.stofs.2d.glo.v2.1.0r1.v55.12/about.txt deleted file mode 100644 index 9e92ff2c7..000000000 --- a/patches/ADCIRC/noaa.stofs.2d.glo.v2.1.0r1.v55.12/about.txt +++ /dev/null @@ -1 +0,0 @@ -upstream version tagged, noaa.stofs.2d.glo.v2.1.0r1.v55.12 diff --git a/patches/ADCIRC/noaa.stofs.2d.glo.v2.1.0r1.v55.12/info.sh b/patches/ADCIRC/noaa.stofs.2d.glo.v2.1.0r1.v55.12/info.sh deleted file mode 100644 index 6fbc3e46f..000000000 --- a/patches/ADCIRC/noaa.stofs.2d.glo.v2.1.0r1.v55.12/info.sh +++ /dev/null @@ -1,5 +0,0 @@ -export ADCIRC_SRC_TYPE=git -export ADCIRC_GIT_URL=https://github.com/stormsurgelive -export ADCIRC_GIT_REPO=adcirc -export ADCIRC_GIT_BRANCH=noaa.stofs.2d.glo.v2.1.0r1.v55.12 -export SWANDIR=thirdparty/swan diff --git a/patches/ADCIRC/v53release-adcircpolate/01-issue-1298.patch b/patches/ADCIRC/v53release-adcircpolate/01-issue-1298.patch deleted file mode 100644 index 3048902d4..000000000 --- a/patches/ADCIRC/v53release-adcircpolate/01-issue-1298.patch +++ /dev/null @@ -1,653 +0,0 @@ -diff --git a/prep/prep.F b/prep/prep.F -index c2a8ced..5ec7914 100644 ---- a/prep/prep.F -+++ b/prep/prep.F -@@ -791,7 +791,9 @@ CTGA 20180524: Adjusted code to better handle out-of-order attributes in the bod - IF (Mode.eq.0) SDNumND(iproc,k) = SDNumND(iproc,k)+1 - IF (Mode.eq.1) THEN - SDNode = IMAP_NOD_GL(2,NodeNum) -- WRITE(sdu(iproc),1100) labels(NodeNum),(AttrData(j),j=1,NumCol(curAttrInd))!tgaf13mod -+ ! jgf: write the fulldomain node number, it will be mapped -+ ! to the subdomain node number at run time -+ WRITE(sdu(iproc),1100) NodeNum,(AttrData(j),j=1,NumCol(curAttrInd))!tgaf13mod - ENDIF - ELSE - DO m=1, ITOTPROC(NodeNum) -@@ -803,7 +805,7 @@ CTGA 20180524: Adjusted code to better handle out-of-order attributes in the bod - ENDIF - IF (Mode.eq.1) THEN - SDNode = IMAP_NOD_GL2(2*(m-1)+2,NodeNum) -- WRITE(sdu(iproc),1100) labels(NodeNum), -+ WRITE(sdu(iproc),1100) NodeNum, - & (AttrData(j),j=1,NumCol(curAttrInd))!tgaf13mod - ENDIF - ENDIF -diff --git a/src/hstart.F b/src/hstart.F -index b8e8ae1..7bfea39 100644 ---- a/src/hstart.F -+++ b/src/hstart.F -@@ -817,7 +817,7 @@ C momentum equations - ENDIF - IF ( (metOutputOn.eqv..true.) .AND. - & (nonMetOutputOff.eqv..true.) ) THEN -- call allMessage(INFO,'Only meteorological output was '// -+ call allMessage(INFO,'Only meterological output was '// - & 'requested. ADCIRC will not solve the GWCE or '// - & 'momentum equations.') - METONLY = .TRUE. ! set flag -diff --git a/swan/macros.inc.queenbee b/swan/macros.inc.queenbee -index e35a794..9fd6715 100644 ---- a/swan/macros.inc.queenbee -+++ b/swan/macros.inc.queenbee -@@ -5,7 +5,7 @@ F90_SER = ifort - F90_OMP = ifort - F90_MPI = mpif90 - FLAGS_OPT = -O2 --FLAGS_MSC = -W0 -assume byterecl -traceback -diag-disable 8290 -diag-disable 8291 -diag-disable 8293 -assume buffered_io -xSSE4.2 -+FLAGS_MSC = -W0 -traceback -diag-disable 8290 -diag-disable 8291 -diag-disable 8293 -xSSE4.2 - FLAGS90_MSC = $(FLAGS_MSC) - FLAGS_SER = - FLAGS_OMP = -openmp -diff --git a/swan/macros.inc.stampede2 b/swan/macros.inc.stampede2 -index 651ae8a..2f96d9b 100644 ---- a/swan/macros.inc.stampede2 -+++ b/swan/macros.inc.stampede2 -@@ -5,7 +5,7 @@ F90_SER = ifort - F90_OMP = ifort - F90_MPI = mpif90 - FLAGS_OPT = -O2 --FLAGS_MSC = -W0 -assume byterecl -traceback -diag-disable 8290 -diag-disable 8291 -diag-disable 8293 -assume buffered_io -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+FLAGS_MSC = -W0 -traceback -diag-disable 8290 -diag-disable 8291 -diag-disable 8293 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - FLAGS90_MSC = $(FLAGS_MSC) - FLAGS_SER = - FLAGS_OMP = -openmp -diff --git a/swan/macros.inc.supermic b/swan/macros.inc.supermic -index 94d190e..71cc03b 100644 ---- a/swan/macros.inc.supermic -+++ b/swan/macros.inc.supermic -@@ -2,7 +2,7 @@ F90_SER = ifort - F90_OMP = ifort - F90_MPI = mpif90 - FLAGS_OPT = -O2 --FLAGS_MSC = -W0 -assume byterecl -traceback -diag-disable 8290 -diag-disable 8291 -diag-disable 8293 -assume buffered_io -xAVX -+FLAGS_MSC = -W0 -traceback -diag-disable 8290 -diag-disable 8291 -diag-disable 8293 -xAVX - FLAGS90_MSC = $(FLAGS_MSC) - FLAGS_SER = - FLAGS_OMP = -openmp -diff --git a/work/cmplrflags.mk b/work/cmplrflags.mk -index 2c0eb06..6e08692 100644 ---- a/work/cmplrflags.mk -+++ b/work/cmplrflags.mk -@@ -89,13 +89,10 @@ ifeq ($(compiler),gnu) - MSGLIBS := - ifeq ($(NETCDF),enable) - ifeq ($(MACHINENAME),blueridge) -- # FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -- NETCDFHOME :=/usr -+ # FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 - FFLAGS1 :=$(FFLAGS1) -I/usr/lib64/gfortran/modules - FFLAGS2 :=$(FFLAGS1) - FFLAGS3 :=$(FFLAGS1) -- # NETCDFHOME :=/shared/apps/RHEL-5/x86_64/NetCDF/netcdf-4.1.1-gcc4.1-ifort -- # NETCDFHOME :=/shared/apps/RHEL-5/x86_64/NetCDF/netcdf-4.1.2-gcc4.1-ifort - FLIBS :=$(FLIBS) -L/usr/lib64 -lnetcdff - else - FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -lhdf5_fortran -@@ -117,9 +114,9 @@ ifeq ($(compiler),gfortran) - PPFC := gfortran - FC := gfortran - PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O2 -ffixed-line-length-none -+ FFLAGS1 := $(INCDIRS) -O2 -ffixed-line-length-none - ifeq ($(PROFILE),enable) -- FFLAGS1 := $(INCDIRS) -pg -O0 -fprofile-arcs -ftest-coverage -ffixed-line-length-none -+ FFLAGS1 := $(INCDIRS) -pg -O0 -fprofile-arcs -ftest-coverage -ffixed-line-length-none - endif - ifeq ($(DEBUG),full) - FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -DDEBUG_WARN_ELEV -@@ -128,7 +125,7 @@ ifeq ($(compiler),gfortran) - FFLAGS1 := $(INCDIRS) -g -O0 -Wall -Wextra -ffixed-line-length-none -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK - endif - ifeq ($(DEBUG),full-not-warnelev) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -+ FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND - endif - ifeq ($(DEBUG),full-not-fpe) - FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -@@ -147,16 +144,16 @@ ifeq ($(compiler),gfortran) - ifeq ($(SWAN),enable) - DPRE := -DREAL8 -DLINUX -DADCSWAN - endif -- FLIBS := -+ FLIBS := - ifeq ($(NETCDF),enable) -- ifeq ($(MACHINENAME),penguin) -+ ifeq ($(MACHINENAME),penguin) - # module purge -- # module load gcc/6.2.0 openmpi/2.1.2/gcc.6.2.0 -+ # module load gcc/6.2.0 openmpi/2.1.2/gcc.6.2.0 - # curl -O ftp://ftp.unidata.ucar.edu/pub/netcdf/old/netcdf-4.2.1.1.tar.gz - # curl -O ftp://ftp.unidata.ucar.edu/pub/netcdf/old/netcdf-fortran-4.2.tar.gz - # curl -O https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-1.8.12/src/hdf5-1.8.12.tar.gz - # CPPFLAGS=-I/home/jgflemin/local/include LDFLAGS=-L/home/jgflemin/local/lib ./configure --prefix=/home/jgflemin/local -- # -+ # - # export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${HOME}/local/lib - # export PATH=${PATH}:${HOME}/local/bin - NETCDFHOME := ${HOME}/local -@@ -164,20 +161,20 @@ ifeq ($(compiler),gfortran) - FFLAGS2 := $(FFLAGS2) -I${HOME}/local/include - FFLAGS3 := $(FFLAGS3) -I${HOME}/local/include - FLIBS := $(FLIBS) -L${HOME}/local/lib -lnetcdff -lnetcdf -- endif -+ endif - ifeq ($(MACHINENAME),jason-desktop) - NETCDFHOME := /usr - FFLAGS1 := $(FFLAGS1) -L/usr/lib/x86_64-linux-gnu - FFLAGS2 := $(FFLAGS2) -L/usr/lib/x86_64-linux-gnu - FFLAGS3 := $(FFLAGS3) -L/usr/lib/x86_64-linux-gnu - endif -- ifeq ($(MACHINENAME),rostam) -+ ifeq ($(MACHINENAME),rostam) - NETCDFHOME := /usr - FFLAGS1 := $(FFLAGS1) -I/usr/lib64/gfortran/modules - FFLAGS2 := $(FFLAGS2) -I/usr/lib64/gfortran/modules - FFLAGS3 := $(FFLAGS3) -I/usr/lib64/gfortran/modules - endif -- FLIBS := $(FLIBS) -lnetcdff -+ FLIBS := $(FLIBS) -lnetcdff - endif - IMODS := -I - CC := gcc -@@ -200,7 +197,7 @@ ifeq ($(compiler),g95) - PPFC := g95 - FC := g95 - PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O3 -mcmodel=medium -fstatic -ffixed-line-length-132 -+ FFLAGS1 := $(INCDIRS) -O2 -mcmodel=medium -fstatic -ffixed-line-length-132 - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -@@ -222,14 +219,16 @@ ifeq ($(compiler),g95) - endif - # - # jgf45.12 These flags work on the UNC Topsail Cluster. --# jgf: The -i-dynamic flag defers the inclusion of the library with -+# jgf: The -i-dynamic flag defers the inclusion of the library with - # feupdateenv until run time, thus avoiding the error message: - # "feupdateenv is not implemented and will always fail" --ifeq ($(compiler),intel) -- PPFC := ifort -+# this line is to support icc/ifort and icx/ifort (llvm based) -+ifneq (,$(filter intel intel-oneapi,$(compiler))) -+ CC := icc -+ PPFC := ifort - FC := ifort - PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xSSE4.2 -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xSSE4.2 - CFLAGS := $(INCDIRS) -O2 -xSSE4.2 -m64 -mcmodel=medium -DLINUX - FLIBS := - ifeq ($(DEBUG),full) -@@ -248,45 +247,100 @@ ifeq ($(compiler),intel) - FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -DNETCDF_TRACE -DFULL_STACK -DFLUSH_MESSAGES - endif - # -- ifeq ($(MACHINENAME),stampede2) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -- FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ ifeq ($(MACHINENAME),stampede2) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -assume buffered_io -- CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -- FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - endif - endif -- ifeq ($(MACHINENAME),frontera) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xCORE-AVX512 -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xCORE-AVX512 -- FLIBS := $(INCDIRS) -xCORE-AVX512 -+ ifeq ($(MACHINENAME),frontera) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xCORE-AVX512 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX512 -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX512 - CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX512 -- FLIBS := $(INCDIRS) -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 -+ endif -+ endif -+ ifeq ($(MACHINENAME),queenbee) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xSSE4.2 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xSSE4.2 -+ FLIBS := $(INCDIRS) -xSSE4.2 -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xSSE4.2 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xSSE4.2 -+ FLIBS := $(INCDIRS) -xSSE4.2 -+ endif -+ endif -+ ifeq ($(MACHINENAME),queenbeeC) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xCORE-AVX512 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX512 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 -+ endif -+ endif -+ ifeq ($(MACHINENAME),supermic) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX - endif - endif -- ifeq ($(MACHINENAME),queenbee) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xSSE4.2 -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xSSE4.2 -- FLIBS := $(INCDIRS) -xSSE4.2 -+ ifeq ($(MACHINENAME),rostam) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xSSE4.2 -assume buffered_io -- CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xSSE4.2 -- FLIBS := $(INCDIRS) -xSSE4.2 -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX - endif -- ifeq ($(MACHINENAME),supermic) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xAVX -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xAVX -+ endif -+ ifeq ($(MACHINENAME),ls6) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -+ FLIBS := $(INCDIRS) -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -+ FLIBS := $(INCDIRS) -+ endif -+ endif -+ #wwlwpd: NOTE: Mike III at LSU-HPC recommends 'mpiifort', Intel's MPI implementation wrapper -+ #wwlwpd: instead of the traditional "mpif90"; but the flags are the same we still redefine -+ #wwlwpd: "PFC" below -+ ifeq ($(MACHINENAME),mike) -+ PFC := mpiifort -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xAVX - FLIBS := $(INCDIRS) -xAVX - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -assume buffered_io -- CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX - FLIBS := $(INCDIRS) -xAVX - endif - endif -+ ifeq ($(MACHINENAME),stampede3) -+ CC := icx -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xCORE-AVX2 -axCORE-AVX512 -Wno-implicit-function-declaration -+ FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -Wimplicit-function-declaration -+ FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -+ endif - endif - # - #@jasonfleming Added to fix bus error on hatteras@renci -@@ -302,67 +356,60 @@ ifeq ($(compiler),intel) - DPRE := $(DPRE) -DADCSWAN - endif - IMODS := -I -- CC := icc -+ #CC := icc # get from start of this section - CCBE := $(CC) - CLIBS := - MSGLIBS := - ifeq ($(NETCDF),enable) -- ifeq ($(MACHINENAME),hatteras) -- NETCDFHOME :=/usr/share/Modules/software/CentOS-7/netcdf-Fortran/4.4.0_intel-18.0.0 -- FLIBS :=$(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -- FFLAGS1 :=$(FFLAGS1) -I$(NETCDFHOME)/include -- FFLAGS2 :=$(FFLAGS1) -- FFLAGS3 :=$(FFLAGS1) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - # jgf20150417 queenbee requires that the analyst load the netcdf and - # netcdf_fortran modules prior to compiling or executing ADCIRC - ifeq ($(MACHINENAME),queenbee) -- FLIBS := $(FLIBS) -L/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0/lib -lnetcdff -lnetcdf -- NETCDFHOME :=/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0 -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),queenbeeC) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),supermic) -- FLIBS := $(FLIBS) -L /usr/local/packages/netcdf_fortran/4.2/INTEL-140-MVAPICH2-2.0/lib -lnetcdff -L/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0/lib -lnetcdf -lnetcdf -liomp5 -lpthread -- NETCDFHOME :=/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0/include -- FFLAGS1 :=$(FFLAGS1) -I/usr/local/packages/hdf5/1.8.12/INTEL-140-MVAPICH2-2.0/include -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),rostam) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),stampede) -- NETCDFHOME :=/opt/apps/intel17/netcdf/4.3.3.1/x86_64 - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),stampede2) -- NETCDFHOME :=/opt/apps/intel17/netcdf/4.3.3.1/x86_64 - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -- ifeq ($(USER),jgflemin) -- NETCDFHOME :=/work/00976/jgflemin/stampede2/local -- FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -- endif -+ endif -+ ifeq ($(MACHINENAME),stampede3) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),frontera) -- # specify NETCDFHOME on the command line or as an environment var - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - # @jasonfleming: Added support for lonestar5 at tacc.utexas.edu; - # load the following module: netcdf/4.3.3.1 - ifeq ($(MACHINENAME),lonestar5) -- #NETCDFHOME :=/opt/apps/intel18/netcdf/4.3.3.1/x86_64 -- # @jasonfleming: Updated support for lonestar5 -- NETCDFHOME :=/opt/apps/intel18/netcdf/4.6.2/x86_64 -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),ls6) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),mike) - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - # jgf20150817: Adding support for spirit.afrl.hpc.mil; - # load the following modules: netcdf-fortran/intel/4.4.2 - # and hdf5/intel/1.8.12 and hdf5-mpi/intel/sgimpt/1.8.12 -- ifeq ($(MACHINENAME),spirit) -+ ifeq ($(MACHINENAME),spirit) - NETCDFHOME :=/app/wpostool/COST/netcdf-fortran-4.4.2/intel - FLIBS := $(FLIBS) -L/app/wpostool/COST/netcdf-c-4.3.1.1/intel/lib -L$(NETCDFHOME)/lib -L/app/wpostool/COST/hdf5-mpi/1.8.12/intel/sgimpt/lib -lnetcdff -lnetcdf - endif - # jgf20150420 mike requires that the analyst add netcdf to the softenv -- # with the following on the command line -+ # with the following on the command line - # soft add +netcdf-4.1.3-Intel-13.0.0 -- ifeq ($(MACHINENAME),mike) -- FLIBS := $(FLIBS) -L/usr/local/packages/netcdf/4.1.3/Intel-13.0.0/lib -lnetcdff -lnetcdf -- NETCDFHOME :=/usr/local/packages/netcdf/4.1.3/Intel-13.0.0 -- endif - ifeq ($(MACHINENAME),killdevil) - HDF5HOME :=/nas02/apps/hdf5-1.8.5/lib - NETCDFHOME :=/nas02/apps/netcdf-4.1.1 -@@ -384,7 +431,7 @@ ifeq ($(compiler),intel-ND) - PPFC := ifort - FC := ifort - PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -w -O3 -assume byterecl -132 -i-dynamic -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -w -O2 -assume byterecl -132 -i-dynamic - ifeq ($(DEBUG),full) - FFLAGS1 := $(INCDIRS) -g -O0 -traceback -debug -check all -i-dynamic -FI -assume byterecl -132 -DALL_TRACE -DFULL_STACK -DFLUSH_MESSAGES - endif -@@ -399,15 +446,15 @@ ifeq ($(compiler),intel-ND) - IMODS := -I - CC := icc - CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O3 -m64 -mcmodel=medium -DLINUX -+ CFLAGS := $(INCDIRS) -O2 -m64 -mcmodel=medium -DLINUX - FLIBS := - ifeq ($(DEBUG),full) - CFLAGS := $(INCDIRS) -g -O0 -march=k8 -m64 -mcmodel=medium -DLINUX - endif - ifeq ($(NETCDF),enable) - HDF5HOME=/afs/crc.nd.edu/x86_64_linux/hdf/hdf5-1.8.6-linux-x86_64-static/lib -- FLIBS := $(FLIBS) -lnetcdff -L$(HDF5HOME) -- endif -+ FLIBS := $(FLIBS) -lnetcdff -L$(HDF5HOME) -+ endif - CLIBS := - MSGLIBS := - $(warning (INFO) Corresponding machine found in cmplrflags.mk.) -@@ -428,7 +475,7 @@ ifeq ($(compiler),intel-sgi) - PFC := mpif90 - CC := icc -O2 -no-ipo - CCBE := icc -O2 -no-ipo -- FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -finline-limit=1000 -real-size 64 -no-ipo -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -finline-limit=1000 -real-size 64 -no-ipo - # FFLAGS1 := $(INCDIRS) -Mextend -g -O0 -traceback - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) -assume buffered_stdout -@@ -504,7 +551,7 @@ ifeq ($(compiler),cray_xt4) - PFC := ftn - CC := pgcc - CCBE := cc -- FFLAGS1 := $(INCDIRS) -Mextend -Minform,inform -O2 -fastsse -+ FFLAGS1 := $(INCDIRS) -Mextend -Minform,inform -O2 -fastsse - ifeq ($(DEBUG),full) - FFLAGS1 := $(INCDIRS) -Mextend -g -O0 -traceback -Mbounds -Mchkfpstk -Mchkptr -Mchkstk -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK - endif -@@ -584,7 +631,7 @@ ifeq ($(compiler),xtintel) - PFC := ftn - CC := cc -O2 -no-ipo - CCBE := cc -O2 -no-ipo -- FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -default64 -finline-limit=1000 -real-size 64 -no-ipo -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -default64 -finline-limit=1000 -real-size 64 -no-ipo - # FFLAGS1 := $(INCDIRS) -Mextend -g -O0 -traceback - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) -assume buffered_stdout -@@ -716,8 +763,8 @@ ifeq ($(compiler),diamond) - PPFC := ifort - FC := ifort - PFC := ifort --# FFLAGS1 := $(INCDIRS) -O3 -xT -132 -- FFLAGS1 := -O3 -132 -xSSSE3 -+# FFLAGS1 := $(INCDIRS) -O2 -xT -132 -+ FFLAGS1 := -O2 -132 -xSSSE3 - ifeq ($(DEBUG),full) - FFLAGS1 := $(INCDIRS) -g -O0 -debug -fpe0 -132 -traceback -check all -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK - endif -@@ -732,8 +779,8 @@ ifeq ($(compiler),diamond) - IMODS := -I - CC := icc - CCBE := $(CC) --# CFLAGS := $(INCDIRS) -O3 -xT -- CFLAGS := $(INCDIRS) -O3 -xSSSE3 -+# CFLAGS := $(INCDIRS) -O2 -xT -+ CFLAGS := $(INCDIRS) -O2 -xSSSE3 - ifeq ($(DEBUG),full) - CFLAGS := $(INCDIRS) -g -O0 - endif -@@ -784,7 +831,7 @@ ifeq ($(compiler),garnet) - CFLAGS := $(INCDIRS) -DLINUX -g -O0 - endif - IMODS := -module -- FLIBS := -+ FLIBS := - # jgf20110728: on Garnet, NETCDFHOME=/opt/cray/netcdf/4.1.1.0/netcdf-pgi - # jgf20110815: on Garnet, HDF5HOME=/opt/cray/hdf5/default/hdf5-pgi - # jgf20130815: on Garnet, load module cray-netcdf, with the path to the -@@ -809,7 +856,7 @@ ifeq ($(compiler),kraken) - PPFC := ftn - FC := ftn - PFC := ftn -- FFLAGS1 := $(INCDIRS) -O3 -static -132 -+ FFLAGS1 := $(INCDIRS) -O2 -static -132 - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -DPOWELL -@@ -845,7 +892,7 @@ ifeq ($(compiler),circleci) - IMODS := -I - CC := gcc - CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O0 -g -mcmodel=medium -DLINUX -m64 -+ CFLAGS := $(INCDIRS) -O0 -g -mcmodel=medium -DLINUX -m64 - CLIBS := - LIBS := - MSGLIBS := -@@ -859,8 +906,7 @@ ifeq ($(compiler),circleci) - MULTIPLE := TRUE - endif - endif --# --endif -+ - #$(MACHINE) - ######################################################################## - # Compiler flags for Linux operating system on 32bit x86 CPU -@@ -950,7 +996,7 @@ ifeq ($(compiler),gnu) - FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-132 -ftrace=full -fbounds-check -DNETCDF_TRACE -DFLUSH_MESSAGES -DFULL_STACK - endif - ifeq ($(DEBUG),valgrind) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-132 -+ FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-132 - endif - ifeq ($(SWAN),enable) - FFLAGS1 := $(FFLAGS1) -freal-loops -@@ -988,69 +1034,6 @@ ifeq ($(compiler),gnu) - endif - endif - # --# gfortran --ifeq ($(compiler),gfortran) -- ifeq ($(MACHINENAME),jason-desktop) -- XDMFPATH := /home/jason/projects/XDMF/Code/latestCode -- XDMFLIBPATH := /home/jason/projects/XDMF/Code/testLatest -- endif -- PPFC := gfortran -- FC := gfortran -- PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O2 -ffixed-line-length-none -- ifeq ($(PROFILE),enable) -- FFLAGS1 := $(INCDIRS) -pg -O0 -fprofile-arcs -ftest-coverage -ffixed-line-length-none -- endif -- ifeq ($(DEBUG),full) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -DDEBUG_WARN_ELEV -- endif -- ifeq ($(DEBUG),compiler-warnings) -- FFLAGS1 := $(INCDIRS) -g -O0 -Wall -Wextra -ffixed-line-length-none -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -- endif -- ifeq ($(DEBUG),full-not-warnelev) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -- endif -- ifeq ($(DEBUG),full-not-fpe) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -- endif -- ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -- endif -- ifneq ($(MACHINENAME),jason-desktop) -- FFLAGS1 := $(FFLAGS1) -fno-underscoring -- endif -- FFLAGS2 := $(FFLAGS1) -- FFLAGS3 := $(FFLAGS1) -- DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCSCA -DCMPI -- DPRE := -DREAL8 -DLINUX -- ifeq ($(SWAN),enable) -- DPRE := -DREAL8 -DLINUX -DADCSWAN -- endif -- FLIBS := -- ifeq ($(NETCDF),enable) -- ifeq ($(MACHINENAME),jason-desktop) -- NETCDFHOME := /usr -- endif -- FLIBS := $(FLIBS) -lnetcdff -- endif -- IMODS := -I -- CC := gcc -- CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O2 -DLINUX -- ifeq ($(DEBUG),full) -- CFLAGS := $(INCDIRS) -g -O0 -DLINUX -- endif -- CLIBS := -- MSGLIBS := -- $(warning (INFO) Corresponding machine found in cmplrflags.mk.) -- ifneq ($(FOUND),TRUE) -- FOUND := TRUE -- else -- MULTIPLE := TRUE -- endif --endif -- - endif - - ######################################################################## -@@ -1095,7 +1078,7 @@ ifeq ($(arch),altix) - PPFC := ifort - FC := ifort - PFC := ifort -- FFLAGS1 := $(INCDIRS) -O3 -tpp2 -+ FFLAGS1 := $(INCDIRS) -O2 -tpp2 - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DCSCA -@@ -1168,7 +1151,7 @@ ifeq ($(IBM),p5) - FFLAGS0 := $(INCDIRS) -w -qfixed=132 -qarch=auto -qcache=auto - FFLAGS1 := $(FFLAGS0) -O2 - FFLAGS2 := $(FFLAGS0) -qhot -qstrict -- FFLAGS3 := $(FFLAGS0) -O3 -qinitauto -+ FFLAGS3 := $(FFLAGS0) -O2 -qinitauto - DA := -WF,"-DREAL8,-DIBM,-DCSCA" - DP := -tF -WF,"-DREAL8,-DIBM,-DCSCA,-DCMPI" - DPRE := -tF -WF,"-DREAL8,-DIBM" -@@ -1488,9 +1471,9 @@ ifneq (,$(findstring powerpc-darwin,$(MACHINE)-$(OS))) - PPFC := f90 - FC := f90 - PFC := mpif77 -- FFLAGS1 := $(INCDIRS) -w -O3 -m64 -cpu:g5 -f fixed -W132 -I . -DLINUX -- FFLAGS2 := $(INCDIRS) -w -O3 -m64 -cpu:g5 -N11 -f fixed -W132 -I . -- FFLAGS3 := $(INCDIRS) -w -O3 -m64 -cpu:g5 -N11 -f fixed -W132 -I . -+ FFLAGS1 := $(INCDIRS) -w -O2 -m64 -cpu:g5 -f fixed -W132 -I . -DLINUX -+ FFLAGS2 := $(INCDIRS) -w -O2 -m64 -cpu:g5 -N11 -f fixed -W132 -I . -+ FFLAGS3 := $(INCDIRS) -w -O2 -m64 -cpu:g5 -N11 -f fixed -W132 -I . - DA := -DREAL8 -DCSCA -DLINUX - DP := -DREAL8 -DCSCA -DCMPI -DLINUX - DPRE := -DREAL8 -DLINUX -@@ -1518,17 +1501,17 @@ ifneq (,$(findstring i386-darwin,$(MACHINE)-$(OS))) - PPFC := ifort - FC := ifort - PFC := mpif77 -- FFLAGS1 := $(INCDIRS) -nowarn -O3 -fixed -132 -check all -traceback -DLINUX -DNETCDF_DEBUG -I . --# FFLAGS1 := $(INCDIRS) -nowarn -O3 -fixed -132 -DIBM -I . -- FFLAGS2 := $(INCDIRS) -nowarn -O3 -fixed -132 -I . -- FFLAGS3 := $(INCDIRS) -nowarn -O3 -fixed -132 -I . -+ FFLAGS1 := $(INCDIRS) -nowarn -O2 -fixed -132 -check all -traceback -DLINUX -DNETCDF_DEBUG -I . -+# FFLAGS1 := $(INCDIRS) -nowarn -O2 -fixed -132 -DIBM -I . -+ FFLAGS2 := $(INCDIRS) -nowarn -O2 -fixed -132 -I . -+ FFLAGS3 := $(INCDIRS) -nowarn -O2 -fixed -132 -I . - DA := -DREAL8 -DCSCA -DLINUX - DP := -DREAL8 -DCSCA -DLINUX -DCMPI -DNETCDF_DEBUG - DPRE := -DREAL8 -DLINUX - IMODS := -I - CC := gcc - CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O3 -DLINUX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX - LDFLAGS := - FLIBS := - MSGLIBS := diff --git a/patches/ADCIRC/v53release-adcircpolate/about.txt b/patches/ADCIRC/v53release-adcircpolate/about.txt deleted file mode 100644 index c149912b7..000000000 --- a/patches/ADCIRC/v53release-adcircpolate/about.txt +++ /dev/null @@ -1 +0,0 @@ -v53release with experimental adaptive mesh refinement (TACC/ND) diff --git a/patches/ADCIRC/v53release-adcircpolate/info.sh b/patches/ADCIRC/v53release-adcircpolate/info.sh deleted file mode 100644 index ebb27c2a3..000000000 --- a/patches/ADCIRC/v53release-adcircpolate/info.sh +++ /dev/null @@ -1,5 +0,0 @@ -export ADCIRC_SRC_TYPE=git -export ADCIRC_GIT_URL=https://github.com/stormsurgelive -export ADCIRC_GIT_REPO=adcirc -export ADCIRC_GIT_BRANCH=v53release -export SWANDIR=swan diff --git a/patches/ADCIRC/v53release-testsuite/01-issue-1298.patch b/patches/ADCIRC/v53release-testsuite/01-issue-1298.patch deleted file mode 100644 index f441b9055..000000000 --- a/patches/ADCIRC/v53release-testsuite/01-issue-1298.patch +++ /dev/null @@ -1,742 +0,0 @@ -diff --git a/prep/prep.F b/prep/prep.F -index c2a8ced..5ec7914 100644 ---- a/prep/prep.F -+++ b/prep/prep.F -@@ -791,7 +791,9 @@ CTGA 20180524: Adjusted code to better handle out-of-order attributes in the bod - IF (Mode.eq.0) SDNumND(iproc,k) = SDNumND(iproc,k)+1 - IF (Mode.eq.1) THEN - SDNode = IMAP_NOD_GL(2,NodeNum) -- WRITE(sdu(iproc),1100) labels(NodeNum),(AttrData(j),j=1,NumCol(curAttrInd))!tgaf13mod -+ ! jgf: write the fulldomain node number, it will be mapped -+ ! to the subdomain node number at run time -+ WRITE(sdu(iproc),1100) NodeNum,(AttrData(j),j=1,NumCol(curAttrInd))!tgaf13mod - ENDIF - ELSE - DO m=1, ITOTPROC(NodeNum) -@@ -803,7 +805,7 @@ CTGA 20180524: Adjusted code to better handle out-of-order attributes in the bod - ENDIF - IF (Mode.eq.1) THEN - SDNode = IMAP_NOD_GL2(2*(m-1)+2,NodeNum) -- WRITE(sdu(iproc),1100) labels(NodeNum), -+ WRITE(sdu(iproc),1100) NodeNum, - & (AttrData(j),j=1,NumCol(curAttrInd))!tgaf13mod - ENDIF - ENDIF -diff --git a/swan/macros.inc.queenbee b/swan/macros.inc.queenbee -index e35a794..9fd6715 100644 ---- a/swan/macros.inc.queenbee -+++ b/swan/macros.inc.queenbee -@@ -5,7 +5,7 @@ F90_SER = ifort - F90_OMP = ifort - F90_MPI = mpif90 - FLAGS_OPT = -O2 --FLAGS_MSC = -W0 -assume byterecl -traceback -diag-disable 8290 -diag-disable 8291 -diag-disable 8293 -assume buffered_io -xSSE4.2 -+FLAGS_MSC = -W0 -traceback -diag-disable 8290 -diag-disable 8291 -diag-disable 8293 -xSSE4.2 - FLAGS90_MSC = $(FLAGS_MSC) - FLAGS_SER = - FLAGS_OMP = -openmp -diff --git a/swan/macros.inc.stampede2 b/swan/macros.inc.stampede2 -index 651ae8a..2f96d9b 100644 ---- a/swan/macros.inc.stampede2 -+++ b/swan/macros.inc.stampede2 -@@ -5,7 +5,7 @@ F90_SER = ifort - F90_OMP = ifort - F90_MPI = mpif90 - FLAGS_OPT = -O2 --FLAGS_MSC = -W0 -assume byterecl -traceback -diag-disable 8290 -diag-disable 8291 -diag-disable 8293 -assume buffered_io -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+FLAGS_MSC = -W0 -traceback -diag-disable 8290 -diag-disable 8291 -diag-disable 8293 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - FLAGS90_MSC = $(FLAGS_MSC) - FLAGS_SER = - FLAGS_OMP = -openmp -diff --git a/swan/macros.inc.supermic b/swan/macros.inc.supermic -index 94d190e..71cc03b 100644 ---- a/swan/macros.inc.supermic -+++ b/swan/macros.inc.supermic -@@ -2,7 +2,7 @@ F90_SER = ifort - F90_OMP = ifort - F90_MPI = mpif90 - FLAGS_OPT = -O2 --FLAGS_MSC = -W0 -assume byterecl -traceback -diag-disable 8290 -diag-disable 8291 -diag-disable 8293 -assume buffered_io -xAVX -+FLAGS_MSC = -W0 -traceback -diag-disable 8290 -diag-disable 8291 -diag-disable 8293 -xAVX - FLAGS90_MSC = $(FLAGS_MSC) - FLAGS_SER = - FLAGS_OMP = -openmp -diff --git a/work/cmplrflags.mk b/work/cmplrflags.mk -index 2c0eb06..6e08692 100644 ---- a/work/cmplrflags.mk -+++ b/work/cmplrflags.mk -@@ -89,13 +89,10 @@ ifeq ($(compiler),gnu) - MSGLIBS := - ifeq ($(NETCDF),enable) - ifeq ($(MACHINENAME),blueridge) -- # FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -- NETCDFHOME :=/usr -+ # FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 - FFLAGS1 :=$(FFLAGS1) -I/usr/lib64/gfortran/modules - FFLAGS2 :=$(FFLAGS1) - FFLAGS3 :=$(FFLAGS1) -- # NETCDFHOME :=/shared/apps/RHEL-5/x86_64/NetCDF/netcdf-4.1.1-gcc4.1-ifort -- # NETCDFHOME :=/shared/apps/RHEL-5/x86_64/NetCDF/netcdf-4.1.2-gcc4.1-ifort - FLIBS :=$(FLIBS) -L/usr/lib64 -lnetcdff - else - FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -lhdf5_fortran -@@ -117,9 +114,9 @@ ifeq ($(compiler),gfortran) - PPFC := gfortran - FC := gfortran - PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O2 -ffixed-line-length-none -+ FFLAGS1 := $(INCDIRS) -O2 -ffixed-line-length-none - ifeq ($(PROFILE),enable) -- FFLAGS1 := $(INCDIRS) -pg -O0 -fprofile-arcs -ftest-coverage -ffixed-line-length-none -+ FFLAGS1 := $(INCDIRS) -pg -O0 -fprofile-arcs -ftest-coverage -ffixed-line-length-none - endif - ifeq ($(DEBUG),full) - FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -DDEBUG_WARN_ELEV -@@ -128,7 +125,7 @@ ifeq ($(compiler),gfortran) - FFLAGS1 := $(INCDIRS) -g -O0 -Wall -Wextra -ffixed-line-length-none -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK - endif - ifeq ($(DEBUG),full-not-warnelev) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -+ FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND - endif - ifeq ($(DEBUG),full-not-fpe) - FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -@@ -147,16 +144,16 @@ ifeq ($(compiler),gfortran) - ifeq ($(SWAN),enable) - DPRE := -DREAL8 -DLINUX -DADCSWAN - endif -- FLIBS := -+ FLIBS := - ifeq ($(NETCDF),enable) -- ifeq ($(MACHINENAME),penguin) -+ ifeq ($(MACHINENAME),penguin) - # module purge -- # module load gcc/6.2.0 openmpi/2.1.2/gcc.6.2.0 -+ # module load gcc/6.2.0 openmpi/2.1.2/gcc.6.2.0 - # curl -O ftp://ftp.unidata.ucar.edu/pub/netcdf/old/netcdf-4.2.1.1.tar.gz - # curl -O ftp://ftp.unidata.ucar.edu/pub/netcdf/old/netcdf-fortran-4.2.tar.gz - # curl -O https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-1.8.12/src/hdf5-1.8.12.tar.gz - # CPPFLAGS=-I/home/jgflemin/local/include LDFLAGS=-L/home/jgflemin/local/lib ./configure --prefix=/home/jgflemin/local -- # -+ # - # export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${HOME}/local/lib - # export PATH=${PATH}:${HOME}/local/bin - NETCDFHOME := ${HOME}/local -@@ -164,20 +161,20 @@ ifeq ($(compiler),gfortran) - FFLAGS2 := $(FFLAGS2) -I${HOME}/local/include - FFLAGS3 := $(FFLAGS3) -I${HOME}/local/include - FLIBS := $(FLIBS) -L${HOME}/local/lib -lnetcdff -lnetcdf -- endif -+ endif - ifeq ($(MACHINENAME),jason-desktop) - NETCDFHOME := /usr - FFLAGS1 := $(FFLAGS1) -L/usr/lib/x86_64-linux-gnu - FFLAGS2 := $(FFLAGS2) -L/usr/lib/x86_64-linux-gnu - FFLAGS3 := $(FFLAGS3) -L/usr/lib/x86_64-linux-gnu - endif -- ifeq ($(MACHINENAME),rostam) -+ ifeq ($(MACHINENAME),rostam) - NETCDFHOME := /usr - FFLAGS1 := $(FFLAGS1) -I/usr/lib64/gfortran/modules - FFLAGS2 := $(FFLAGS2) -I/usr/lib64/gfortran/modules - FFLAGS3 := $(FFLAGS3) -I/usr/lib64/gfortran/modules - endif -- FLIBS := $(FLIBS) -lnetcdff -+ FLIBS := $(FLIBS) -lnetcdff - endif - IMODS := -I - CC := gcc -@@ -200,7 +197,7 @@ ifeq ($(compiler),g95) - PPFC := g95 - FC := g95 - PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O3 -mcmodel=medium -fstatic -ffixed-line-length-132 -+ FFLAGS1 := $(INCDIRS) -O2 -mcmodel=medium -fstatic -ffixed-line-length-132 - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -@@ -222,14 +219,16 @@ ifeq ($(compiler),g95) - endif - # - # jgf45.12 These flags work on the UNC Topsail Cluster. --# jgf: The -i-dynamic flag defers the inclusion of the library with -+# jgf: The -i-dynamic flag defers the inclusion of the library with - # feupdateenv until run time, thus avoiding the error message: - # "feupdateenv is not implemented and will always fail" --ifeq ($(compiler),intel) -- PPFC := ifort -+# this line is to support icc/ifort and icx/ifort (llvm based) -+ifneq (,$(filter intel intel-oneapi,$(compiler))) -+ CC := icc -+ PPFC := ifort - FC := ifort - PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xSSE4.2 -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xSSE4.2 - CFLAGS := $(INCDIRS) -O2 -xSSE4.2 -m64 -mcmodel=medium -DLINUX - FLIBS := - ifeq ($(DEBUG),full) -@@ -248,45 +247,100 @@ ifeq ($(compiler),intel) - FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -DNETCDF_TRACE -DFULL_STACK -DFLUSH_MESSAGES - endif - # -- ifeq ($(MACHINENAME),stampede2) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -- FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ ifeq ($(MACHINENAME),stampede2) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -assume buffered_io -- CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -- FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - endif - endif -- ifeq ($(MACHINENAME),frontera) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xCORE-AVX512 -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xCORE-AVX512 -- FLIBS := $(INCDIRS) -xCORE-AVX512 -+ ifeq ($(MACHINENAME),frontera) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xCORE-AVX512 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX512 -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX512 - CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX512 -- FLIBS := $(INCDIRS) -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 -+ endif -+ endif -+ ifeq ($(MACHINENAME),queenbee) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xSSE4.2 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xSSE4.2 -+ FLIBS := $(INCDIRS) -xSSE4.2 -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xSSE4.2 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xSSE4.2 -+ FLIBS := $(INCDIRS) -xSSE4.2 -+ endif -+ endif -+ ifeq ($(MACHINENAME),queenbeeC) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xCORE-AVX512 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX512 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 -+ endif -+ endif -+ ifeq ($(MACHINENAME),supermic) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX - endif - endif -- ifeq ($(MACHINENAME),queenbee) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xSSE4.2 -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xSSE4.2 -- FLIBS := $(INCDIRS) -xSSE4.2 -+ ifeq ($(MACHINENAME),rostam) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xSSE4.2 -assume buffered_io -- CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xSSE4.2 -- FLIBS := $(INCDIRS) -xSSE4.2 -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX - endif -- ifeq ($(MACHINENAME),supermic) -- FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xAVX -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xAVX -+ endif -+ ifeq ($(MACHINENAME),ls6) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -+ FLIBS := $(INCDIRS) -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -+ FLIBS := $(INCDIRS) -+ endif -+ endif -+ #wwlwpd: NOTE: Mike III at LSU-HPC recommends 'mpiifort', Intel's MPI implementation wrapper -+ #wwlwpd: instead of the traditional "mpif90"; but the flags are the same we still redefine -+ #wwlwpd: "PFC" below -+ ifeq ($(MACHINENAME),mike) -+ PFC := mpiifort -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xAVX - FLIBS := $(INCDIRS) -xAVX - ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -assume buffered_io -- CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX - FLIBS := $(INCDIRS) -xAVX - endif - endif -+ ifeq ($(MACHINENAME),stampede3) -+ CC := icx -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xCORE-AVX2 -axCORE-AVX512 -Wno-implicit-function-declaration -+ FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -Wimplicit-function-declaration -+ FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,COMMON-AVX512 -+ endif - endif - # - #@jasonfleming Added to fix bus error on hatteras@renci -@@ -302,67 +356,60 @@ ifeq ($(compiler),intel) - DPRE := $(DPRE) -DADCSWAN - endif - IMODS := -I -- CC := icc -+ #CC := icc # get from start of this section - CCBE := $(CC) - CLIBS := - MSGLIBS := - ifeq ($(NETCDF),enable) -- ifeq ($(MACHINENAME),hatteras) -- NETCDFHOME :=/usr/share/Modules/software/CentOS-7/netcdf-Fortran/4.4.0_intel-18.0.0 -- FLIBS :=$(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -- FFLAGS1 :=$(FFLAGS1) -I$(NETCDFHOME)/include -- FFLAGS2 :=$(FFLAGS1) -- FFLAGS3 :=$(FFLAGS1) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - # jgf20150417 queenbee requires that the analyst load the netcdf and - # netcdf_fortran modules prior to compiling or executing ADCIRC - ifeq ($(MACHINENAME),queenbee) -- FLIBS := $(FLIBS) -L/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0/lib -lnetcdff -lnetcdf -- NETCDFHOME :=/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0 -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),queenbeeC) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),supermic) -- FLIBS := $(FLIBS) -L /usr/local/packages/netcdf_fortran/4.2/INTEL-140-MVAPICH2-2.0/lib -lnetcdff -L/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0/lib -lnetcdf -lnetcdf -liomp5 -lpthread -- NETCDFHOME :=/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0/include -- FFLAGS1 :=$(FFLAGS1) -I/usr/local/packages/hdf5/1.8.12/INTEL-140-MVAPICH2-2.0/include -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),rostam) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),stampede) -- NETCDFHOME :=/opt/apps/intel17/netcdf/4.3.3.1/x86_64 - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),stampede2) -- NETCDFHOME :=/opt/apps/intel17/netcdf/4.3.3.1/x86_64 - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -- ifeq ($(USER),jgflemin) -- NETCDFHOME :=/work/00976/jgflemin/stampede2/local -- FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -- endif -+ endif -+ ifeq ($(MACHINENAME),stampede3) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),frontera) -- # specify NETCDFHOME on the command line or as an environment var - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - # @jasonfleming: Added support for lonestar5 at tacc.utexas.edu; - # load the following module: netcdf/4.3.3.1 - ifeq ($(MACHINENAME),lonestar5) -- #NETCDFHOME :=/opt/apps/intel18/netcdf/4.3.3.1/x86_64 -- # @jasonfleming: Updated support for lonestar5 -- NETCDFHOME :=/opt/apps/intel18/netcdf/4.6.2/x86_64 -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),ls6) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),mike) - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - # jgf20150817: Adding support for spirit.afrl.hpc.mil; - # load the following modules: netcdf-fortran/intel/4.4.2 - # and hdf5/intel/1.8.12 and hdf5-mpi/intel/sgimpt/1.8.12 -- ifeq ($(MACHINENAME),spirit) -+ ifeq ($(MACHINENAME),spirit) - NETCDFHOME :=/app/wpostool/COST/netcdf-fortran-4.4.2/intel - FLIBS := $(FLIBS) -L/app/wpostool/COST/netcdf-c-4.3.1.1/intel/lib -L$(NETCDFHOME)/lib -L/app/wpostool/COST/hdf5-mpi/1.8.12/intel/sgimpt/lib -lnetcdff -lnetcdf - endif - # jgf20150420 mike requires that the analyst add netcdf to the softenv -- # with the following on the command line -+ # with the following on the command line - # soft add +netcdf-4.1.3-Intel-13.0.0 -- ifeq ($(MACHINENAME),mike) -- FLIBS := $(FLIBS) -L/usr/local/packages/netcdf/4.1.3/Intel-13.0.0/lib -lnetcdff -lnetcdf -- NETCDFHOME :=/usr/local/packages/netcdf/4.1.3/Intel-13.0.0 -- endif - ifeq ($(MACHINENAME),killdevil) - HDF5HOME :=/nas02/apps/hdf5-1.8.5/lib - NETCDFHOME :=/nas02/apps/netcdf-4.1.1 -@@ -384,7 +431,7 @@ ifeq ($(compiler),intel-ND) - PPFC := ifort - FC := ifort - PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -w -O3 -assume byterecl -132 -i-dynamic -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -w -O2 -assume byterecl -132 -i-dynamic - ifeq ($(DEBUG),full) - FFLAGS1 := $(INCDIRS) -g -O0 -traceback -debug -check all -i-dynamic -FI -assume byterecl -132 -DALL_TRACE -DFULL_STACK -DFLUSH_MESSAGES - endif -@@ -399,15 +446,15 @@ ifeq ($(compiler),intel-ND) - IMODS := -I - CC := icc - CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O3 -m64 -mcmodel=medium -DLINUX -+ CFLAGS := $(INCDIRS) -O2 -m64 -mcmodel=medium -DLINUX - FLIBS := - ifeq ($(DEBUG),full) - CFLAGS := $(INCDIRS) -g -O0 -march=k8 -m64 -mcmodel=medium -DLINUX - endif - ifeq ($(NETCDF),enable) - HDF5HOME=/afs/crc.nd.edu/x86_64_linux/hdf/hdf5-1.8.6-linux-x86_64-static/lib -- FLIBS := $(FLIBS) -lnetcdff -L$(HDF5HOME) -- endif -+ FLIBS := $(FLIBS) -lnetcdff -L$(HDF5HOME) -+ endif - CLIBS := - MSGLIBS := - $(warning (INFO) Corresponding machine found in cmplrflags.mk.) -@@ -428,7 +475,7 @@ ifeq ($(compiler),intel-sgi) - PFC := mpif90 - CC := icc -O2 -no-ipo - CCBE := icc -O2 -no-ipo -- FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -finline-limit=1000 -real-size 64 -no-ipo -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -finline-limit=1000 -real-size 64 -no-ipo - # FFLAGS1 := $(INCDIRS) -Mextend -g -O0 -traceback - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) -assume buffered_stdout -@@ -504,7 +551,7 @@ ifeq ($(compiler),cray_xt4) - PFC := ftn - CC := pgcc - CCBE := cc -- FFLAGS1 := $(INCDIRS) -Mextend -Minform,inform -O2 -fastsse -+ FFLAGS1 := $(INCDIRS) -Mextend -Minform,inform -O2 -fastsse - ifeq ($(DEBUG),full) - FFLAGS1 := $(INCDIRS) -Mextend -g -O0 -traceback -Mbounds -Mchkfpstk -Mchkptr -Mchkstk -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK - endif -@@ -584,7 +631,7 @@ ifeq ($(compiler),xtintel) - PFC := ftn - CC := cc -O2 -no-ipo - CCBE := cc -O2 -no-ipo -- FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -default64 -finline-limit=1000 -real-size 64 -no-ipo -assume buffered_io -+ FFLAGS1 := $(INCDIRS) -fixed -extend-source 132 -O2 -default64 -finline-limit=1000 -real-size 64 -no-ipo - # FFLAGS1 := $(INCDIRS) -Mextend -g -O0 -traceback - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) -assume buffered_stdout -@@ -716,8 +763,8 @@ ifeq ($(compiler),diamond) - PPFC := ifort - FC := ifort - PFC := ifort --# FFLAGS1 := $(INCDIRS) -O3 -xT -132 -- FFLAGS1 := -O3 -132 -xSSSE3 -+# FFLAGS1 := $(INCDIRS) -O2 -xT -132 -+ FFLAGS1 := -O2 -132 -xSSSE3 - ifeq ($(DEBUG),full) - FFLAGS1 := $(INCDIRS) -g -O0 -debug -fpe0 -132 -traceback -check all -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK - endif -@@ -732,8 +779,8 @@ ifeq ($(compiler),diamond) - IMODS := -I - CC := icc - CCBE := $(CC) --# CFLAGS := $(INCDIRS) -O3 -xT -- CFLAGS := $(INCDIRS) -O3 -xSSSE3 -+# CFLAGS := $(INCDIRS) -O2 -xT -+ CFLAGS := $(INCDIRS) -O2 -xSSSE3 - ifeq ($(DEBUG),full) - CFLAGS := $(INCDIRS) -g -O0 - endif -@@ -784,7 +831,7 @@ ifeq ($(compiler),garnet) - CFLAGS := $(INCDIRS) -DLINUX -g -O0 - endif - IMODS := -module -- FLIBS := -+ FLIBS := - # jgf20110728: on Garnet, NETCDFHOME=/opt/cray/netcdf/4.1.1.0/netcdf-pgi - # jgf20110815: on Garnet, HDF5HOME=/opt/cray/hdf5/default/hdf5-pgi - # jgf20130815: on Garnet, load module cray-netcdf, with the path to the -@@ -809,7 +856,7 @@ ifeq ($(compiler),kraken) - PPFC := ftn - FC := ftn - PFC := ftn -- FFLAGS1 := $(INCDIRS) -O3 -static -132 -+ FFLAGS1 := $(INCDIRS) -O2 -static -132 - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DLINUX -DCSCA -DPOWELL -@@ -845,7 +892,7 @@ ifeq ($(compiler),circleci) - IMODS := -I - CC := gcc - CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O0 -g -mcmodel=medium -DLINUX -m64 -+ CFLAGS := $(INCDIRS) -O0 -g -mcmodel=medium -DLINUX -m64 - CLIBS := - LIBS := - MSGLIBS := -@@ -859,8 +906,7 @@ ifeq ($(compiler),circleci) - MULTIPLE := TRUE - endif - endif --# --endif -+ - #$(MACHINE) - ######################################################################## - # Compiler flags for Linux operating system on 32bit x86 CPU -@@ -950,7 +996,7 @@ ifeq ($(compiler),gnu) - FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-132 -ftrace=full -fbounds-check -DNETCDF_TRACE -DFLUSH_MESSAGES -DFULL_STACK - endif - ifeq ($(DEBUG),valgrind) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-132 -+ FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-132 - endif - ifeq ($(SWAN),enable) - FFLAGS1 := $(FFLAGS1) -freal-loops -@@ -988,69 +1034,6 @@ ifeq ($(compiler),gnu) - endif - endif - # --# gfortran --ifeq ($(compiler),gfortran) -- ifeq ($(MACHINENAME),jason-desktop) -- XDMFPATH := /home/jason/projects/XDMF/Code/latestCode -- XDMFLIBPATH := /home/jason/projects/XDMF/Code/testLatest -- endif -- PPFC := gfortran -- FC := gfortran -- PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O2 -ffixed-line-length-none -- ifeq ($(PROFILE),enable) -- FFLAGS1 := $(INCDIRS) -pg -O0 -fprofile-arcs -ftest-coverage -ffixed-line-length-none -- endif -- ifeq ($(DEBUG),full) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -DDEBUG_WARN_ELEV -- endif -- ifeq ($(DEBUG),compiler-warnings) -- FFLAGS1 := $(INCDIRS) -g -O0 -Wall -Wextra -ffixed-line-length-none -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -- endif -- ifeq ($(DEBUG),full-not-warnelev) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -- endif -- ifeq ($(DEBUG),full-not-fpe) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -- endif -- ifeq ($(DEBUG),trace) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -- endif -- ifneq ($(MACHINENAME),jason-desktop) -- FFLAGS1 := $(FFLAGS1) -fno-underscoring -- endif -- FFLAGS2 := $(FFLAGS1) -- FFLAGS3 := $(FFLAGS1) -- DA := -DREAL8 -DLINUX -DCSCA -- DP := -DREAL8 -DLINUX -DCSCA -DCMPI -- DPRE := -DREAL8 -DLINUX -- ifeq ($(SWAN),enable) -- DPRE := -DREAL8 -DLINUX -DADCSWAN -- endif -- FLIBS := -- ifeq ($(NETCDF),enable) -- ifeq ($(MACHINENAME),jason-desktop) -- NETCDFHOME := /usr -- endif -- FLIBS := $(FLIBS) -lnetcdff -- endif -- IMODS := -I -- CC := gcc -- CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O2 -DLINUX -- ifeq ($(DEBUG),full) -- CFLAGS := $(INCDIRS) -g -O0 -DLINUX -- endif -- CLIBS := -- MSGLIBS := -- $(warning (INFO) Corresponding machine found in cmplrflags.mk.) -- ifneq ($(FOUND),TRUE) -- FOUND := TRUE -- else -- MULTIPLE := TRUE -- endif --endif -- - endif - - ######################################################################## -@@ -1095,7 +1078,7 @@ ifeq ($(arch),altix) - PPFC := ifort - FC := ifort - PFC := ifort -- FFLAGS1 := $(INCDIRS) -O3 -tpp2 -+ FFLAGS1 := $(INCDIRS) -O2 -tpp2 - FFLAGS2 := $(FFLAGS1) - FFLAGS3 := $(FFLAGS1) - DA := -DREAL8 -DCSCA -@@ -1168,7 +1151,7 @@ ifeq ($(IBM),p5) - FFLAGS0 := $(INCDIRS) -w -qfixed=132 -qarch=auto -qcache=auto - FFLAGS1 := $(FFLAGS0) -O2 - FFLAGS2 := $(FFLAGS0) -qhot -qstrict -- FFLAGS3 := $(FFLAGS0) -O3 -qinitauto -+ FFLAGS3 := $(FFLAGS0) -O2 -qinitauto - DA := -WF,"-DREAL8,-DIBM,-DCSCA" - DP := -tF -WF,"-DREAL8,-DIBM,-DCSCA,-DCMPI" - DPRE := -tF -WF,"-DREAL8,-DIBM" -@@ -1488,9 +1471,9 @@ ifneq (,$(findstring powerpc-darwin,$(MACHINE)-$(OS))) - PPFC := f90 - FC := f90 - PFC := mpif77 -- FFLAGS1 := $(INCDIRS) -w -O3 -m64 -cpu:g5 -f fixed -W132 -I . -DLINUX -- FFLAGS2 := $(INCDIRS) -w -O3 -m64 -cpu:g5 -N11 -f fixed -W132 -I . -- FFLAGS3 := $(INCDIRS) -w -O3 -m64 -cpu:g5 -N11 -f fixed -W132 -I . -+ FFLAGS1 := $(INCDIRS) -w -O2 -m64 -cpu:g5 -f fixed -W132 -I . -DLINUX -+ FFLAGS2 := $(INCDIRS) -w -O2 -m64 -cpu:g5 -N11 -f fixed -W132 -I . -+ FFLAGS3 := $(INCDIRS) -w -O2 -m64 -cpu:g5 -N11 -f fixed -W132 -I . - DA := -DREAL8 -DCSCA -DLINUX - DP := -DREAL8 -DCSCA -DCMPI -DLINUX - DPRE := -DREAL8 -DLINUX -@@ -1518,17 +1501,17 @@ ifneq (,$(findstring i386-darwin,$(MACHINE)-$(OS))) - PPFC := ifort - FC := ifort - PFC := mpif77 -- FFLAGS1 := $(INCDIRS) -nowarn -O3 -fixed -132 -check all -traceback -DLINUX -DNETCDF_DEBUG -I . --# FFLAGS1 := $(INCDIRS) -nowarn -O3 -fixed -132 -DIBM -I . -- FFLAGS2 := $(INCDIRS) -nowarn -O3 -fixed -132 -I . -- FFLAGS3 := $(INCDIRS) -nowarn -O3 -fixed -132 -I . -+ FFLAGS1 := $(INCDIRS) -nowarn -O2 -fixed -132 -check all -traceback -DLINUX -DNETCDF_DEBUG -I . -+# FFLAGS1 := $(INCDIRS) -nowarn -O2 -fixed -132 -DIBM -I . -+ FFLAGS2 := $(INCDIRS) -nowarn -O2 -fixed -132 -I . -+ FFLAGS3 := $(INCDIRS) -nowarn -O2 -fixed -132 -I . - DA := -DREAL8 -DCSCA -DLINUX - DP := -DREAL8 -DCSCA -DLINUX -DCMPI -DNETCDF_DEBUG - DPRE := -DREAL8 -DLINUX - IMODS := -I - CC := gcc - CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O3 -DLINUX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX - LDFLAGS := - FLIBS := - MSGLIBS := -diff --git a/work/makefile b/work/makefile -index b823fda..abb3f81 100644 ---- a/work/makefile -+++ b/work/makefile -@@ -271,6 +271,17 @@ ifeq ($(BUILDTYPE),inflate) - VPATH := $(SRCDIR)/util - MSG_MOBJ:= - endif -+# adcircResultsComparison -+ifeq ($(BUILDTYPE),adcircResultsComparison) -+ CF:= $(PPFC) -+ O_DIR:=$(SRCDIR)/work/odir12/ -+ FFLAGS:= $(FFLAGS2) $(IMODS) $(O_DIR) $(DA) -+ ifeq ($(NETCDF),enable) -+ LIBS := -L$(NETCDFHOME)/lib -lnetcdf $(FLIBS) -+ endif -+ VPATH := $(SRCDIR)/util -+ MSG_MOBJ:= -+endif - # hstime - ifeq ($(BUILDTYPE),hstime) - CF:= $(PPFC) -@@ -389,6 +400,7 @@ B23_SRC = buildstwave23.F - H2A_SRC = hot2asc.F - INF_SRC = inflate.F - HST_SRC = hstime.F -+RCMP_SRC = adcircResultsComparison.F90 - ASW_SRC = aswip_1.0.3.F - CMP_SRC = adccmp.F - -@@ -403,6 +415,7 @@ B12_OBJ:= $(patsubst %.F, $(O_DIR)%.o, $(B12_SRC) ) - B23_OBJ:= $(patsubst %.F, $(O_DIR)%.o, $(B23_SRC) ) - H2A_OBJ:= $(patsubst %.F, $(O_DIR)%.o, $(H2A_SRC) ) - INF_OBJ:= $(patsubst %.F, $(O_DIR)%.o, $(INF_SRC) ) -+RCMP_OBJ:= $(patsubst %.F, $(O_DIR)%.o, $(RCMP_SRC) ) - HST_OBJ:= $(patsubst %.F, $(O_DIR)%.o, $(HST_SRC) ) - ASW_OBJ:= $(patsubst %.F, $(O_DIR)%.o, $(ASW_SRC) ) - CMP_OBJ:= $(patsubst %.F, $(O_DIR)%.o, $(CMP_SRC) ) -@@ -455,7 +468,7 @@ $(O_DIR)%.o : %.f90 - - ########################## Executable Targets ############################ - --.PHONY: all libadc clean clobber metis metis_be adcprep adcprep_be adcpost adcirc $(PARALLEL_ADCIRC) p15 owi22 build13 build12 buildstwave23 hot2asc inflate hstime aswip adccmp adcswan padcswan -+.PHONY: all libadc clean clobber metis metis_be adcprep adcprep_be adcpost adcirc $(PARALLEL_ADCIRC) p15 owi22 build13 build12 buildstwave23 hot2asc inflate hstime aswip adccmp adcswan padcswan adcircResultsComparison - - all : metis adcprep $(BACKEND_EXEC) adcpost adcirc $(PARALLEL_ADCIRC) - -@@ -502,6 +515,8 @@ ifeq ($(MAKELEVEL),0) - $(MAKE) BUILDTYPE=hot2asc $@ - inflate: - $(MAKE) BUILDTYPE=inflate $@ -+ adcircResultsComparison: -+ $(MAKE) BUILDTYPE=adcircResultsComparison $@ - hstime: - $(MAKE) BUILDTYPE=hstime $@ - aswip: -@@ -522,6 +537,7 @@ else - buildstwave23:: $(O_DIR) - hot2asc:: $(O_DIR) - inflate:: $(O_DIR) -+ adcircResultsComparison:: $(O_DIR) - hstime:: $(O_DIR) - aswip:: $(O_DIR) - adccmp: $(O_DIR) -@@ -602,6 +618,9 @@ endif - inflate :: $(INF_OBJ) - $(CF) $(FFLAGS) -o $@ $(wildcard $(O_DIR)*.o) - -+ adcircResultsComparison :: $(RCMP_OBJ) -+ $(CF) $(FFLAGS) -o $@ $(wildcard $(O_DIR)*.o) $(LIBS) $(LDFLAGS) -+ - hstime :: $(HST_OBJ) - $(CF) $(FFLAGS) -o $@ $(wildcard $(O_DIR)*.o) $(LIBS) $(LDFLAGS) - -@@ -622,7 +641,7 @@ clean: - clobber: - rm -r -f odir* - rm -f adcprep adcprep_be adcirc $(PARALLEL_ADCIRC) adcswan padcswan p15 owi22 build13 aswip \ -- build12 buildstwave23 hot2asc inflate hstime sizes.o adcpost adccmp libadc.a -+ build12 buildstwave23 hot2asc inflate hstime sizes.o adcpost adccmp libadc.a adcircResultsComparison - rm -f ../swan/*.f ../swan/*.for ../swan/*.f90 .swanlastcompile - help: - @echo "This makefile supports the following:" -@@ -639,6 +658,7 @@ help: - @echo "make buildstwave23 - makes the fort.23 file generator" - @echo "make hot2asc - makes the hotstart debug program" - @echo "make inflate - makes the output file inflation program" -+ @echo "make adcircResultsComparison - makes the utility used by the ADCIRC test suite" - @echo "make hstime - makes the hot start time examiner" - @echo "make adccmp - makes the output file comparison program" - #Casey 091013: Add text for the SWAN+ADCIRC targets. -@@ -799,6 +819,10 @@ $(O_DIR)hot2asc.o : hot2asc.F - - $(O_DIR)inflate.o : inflate.F - -+# test suite results compare utility -+ -+$(O_DIR)adcircResultsComparison.o : adcircResultsComparison.F90 -+ - # hot start time examiner - - $(O_DIR)hstime.o : hstime.F diff --git a/patches/ADCIRC/v53release-testsuite/about.txt b/patches/ADCIRC/v53release-testsuite/about.txt deleted file mode 100644 index f221b84b5..000000000 --- a/patches/ADCIRC/v53release-testsuite/about.txt +++ /dev/null @@ -1 +0,0 @@ -v53 with backported utilities for upstream testsuite diff --git a/patches/ADCIRC/v53release-testsuite/info.sh b/patches/ADCIRC/v53release-testsuite/info.sh deleted file mode 100644 index ebb27c2a3..000000000 --- a/patches/ADCIRC/v53release-testsuite/info.sh +++ /dev/null @@ -1,5 +0,0 @@ -export ADCIRC_SRC_TYPE=git -export ADCIRC_GIT_URL=https://github.com/stormsurgelive -export ADCIRC_GIT_REPO=adcirc -export ADCIRC_GIT_BRANCH=v53release -export SWANDIR=swan diff --git a/patches/ADCIRC/v53release/about.txt b/patches/ADCIRC/v53release/about.txt index 47ee1eb36..68999f5d0 100644 --- a/patches/ADCIRC/v53release/about.txt +++ b/patches/ADCIRC/v53release/about.txt @@ -1 +1 @@ -latest upstream v53 +latest upstream v53.05 + adcprep "--prep13" fix diff --git a/patches/ADCIRC/v55-GLOBAL/01-cmplrflags-mk.patch b/patches/ADCIRC/v55-GLOBAL/01-cmplrflags-mk.patch deleted file mode 100644 index 602ada739..000000000 --- a/patches/ADCIRC/v55-GLOBAL/01-cmplrflags-mk.patch +++ /dev/null @@ -1,435 +0,0 @@ -diff --git a/work/cmplrflags.mk b/work/cmplrflags.mk -index 125a295..4ebfa10 100644 ---- a/work/cmplrflags.mk -+++ b/work/cmplrflags.mk -@@ -53,7 +53,7 @@ ifeq ($(MACHINE)-$(OS),x86_64-linux-gnu) - #compiler=gnu - #compiler=g95 - #compiler=gfortran --#compiler=intel -+compiler=intel - #compiler=intel-ND - #compiler=intel-lonestar - #compiler=intel-sgi -@@ -89,13 +89,10 @@ ifeq ($(compiler),gnu) - MSGLIBS := - ifeq ($(NETCDF),enable) - ifeq ($(MACHINENAME),blueridge) -- # FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -- NETCDFHOME :=/usr -+ # FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 - FFLAGS1 :=$(FFLAGS1) -I/usr/lib64/gfortran/modules - FFLAGS2 :=$(FFLAGS1) - FFLAGS3 :=$(FFLAGS1) -- # NETCDFHOME :=/shared/apps/RHEL-5/x86_64/NetCDF/netcdf-4.1.1-gcc4.1-ifort -- # NETCDFHOME :=/shared/apps/RHEL-5/x86_64/NetCDF/netcdf-4.1.2-gcc4.1-ifort - FLIBS :=$(FLIBS) -L/usr/lib64 -lnetcdff - else - FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -lhdf5_fortran -@@ -117,9 +114,9 @@ ifeq ($(compiler),gfortran) - PPFC := gfortran - FC := gfortran - PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O2 -ffixed-line-length-none -+ FFLAGS1 := $(INCDIRS) -O2 -ffixed-line-length-none - ifeq ($(PROFILE),enable) -- FFLAGS1 := $(INCDIRS) -pg -O0 -fprofile-arcs -ftest-coverage -ffixed-line-length-none -+ FFLAGS1 := $(INCDIRS) -pg -O0 -fprofile-arcs -ftest-coverage -ffixed-line-length-none - endif - ifeq ($(DEBUG),full) - FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -DDEBUG_WARN_ELEV -@@ -128,7 +125,7 @@ ifeq ($(compiler),gfortran) - FFLAGS1 := $(INCDIRS) -g -O0 -Wall -Wextra -ffixed-line-length-none -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK - endif - ifeq ($(DEBUG),full-not-warnelev) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -+ FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND - endif - ifeq ($(DEBUG),full-not-fpe) - FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -@@ -147,37 +144,29 @@ ifeq ($(compiler),gfortran) - ifeq ($(SWAN),enable) - DPRE := -DREAL8 -DLINUX -DADCSWAN - endif -- FLIBS := -+ FLIBS := - ifeq ($(NETCDF),enable) -- ifeq ($(MACHINENAME),penguin) -+ ifeq ($(MACHINENAME),penguin) - # module purge -- # module load gcc/6.2.0 openmpi/2.1.2/gcc.6.2.0 -+ # module load gcc/6.2.0 openmpi/2.1.2/gcc.6.2.0 - # curl -O ftp://ftp.unidata.ucar.edu/pub/netcdf/old/netcdf-4.2.1.1.tar.gz - # curl -O ftp://ftp.unidata.ucar.edu/pub/netcdf/old/netcdf-fortran-4.2.tar.gz - # curl -O https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-1.8.12/src/hdf5-1.8.12.tar.gz - # CPPFLAGS=-I/home/jgflemin/local/include LDFLAGS=-L/home/jgflemin/local/lib ./configure --prefix=/home/jgflemin/local -- # -+ # - # export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${HOME}/local/lib - # export PATH=${PATH}:${HOME}/local/bin -- NETCDFHOME := ${HOME}/local - FFLAGS1 := $(FFLAGS1) -I${HOME}/local/include - FFLAGS2 := $(FFLAGS2) -I${HOME}/local/include - FFLAGS3 := $(FFLAGS3) -I${HOME}/local/include - FLIBS := $(FLIBS) -L${HOME}/local/lib -lnetcdff -lnetcdf -- endif -+ endif - ifeq ($(MACHINENAME),jason-desktop) -- NETCDFHOME := /usr - FFLAGS1 := $(FFLAGS1) -L/usr/lib/x86_64-linux-gnu - FFLAGS2 := $(FFLAGS2) -L/usr/lib/x86_64-linux-gnu - FFLAGS3 := $(FFLAGS3) -L/usr/lib/x86_64-linux-gnu - endif -- ifeq ($(MACHINENAME),rostam) -- NETCDFHOME := /usr -- FFLAGS1 := $(FFLAGS1) -I/usr/lib64/gfortran/modules -- FFLAGS2 := $(FFLAGS2) -I/usr/lib64/gfortran/modules -- FFLAGS3 := $(FFLAGS3) -I/usr/lib64/gfortran/modules -- endif -- FLIBS := $(FLIBS) -lnetcdff -+ FLIBS := $(FLIBS) -lnetcdff - endif - IMODS := -I - CC := gcc -@@ -222,7 +211,7 @@ ifeq ($(compiler),g95) - endif - # - # jgf45.12 These flags work on the UNC Topsail Cluster. --# jgf: The -i-dynamic flag defers the inclusion of the library with -+# jgf: The -i-dynamic flag defers the inclusion of the library with - # feupdateenv until run time, thus avoiding the error message: - # "feupdateenv is not implemented and will always fail" - ifeq ($(compiler),intel) -@@ -251,14 +240,14 @@ ifeq ($(compiler),intel) - FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -DNETCDF_TRACE -DFULL_STACK -DFLUSH_MESSAGES - endif - # -- ifeq ($(MACHINENAME),stampede2) -+ ifeq ($(MACHINENAME),stampede2) - FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -- FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ CFLAGS := $(INCDIRS) -O3 -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - ifeq ($(DEBUG),trace) - FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -assume buffered_io -- CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -- FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX2 -axCORE-AVX512,MIC-AVX512 - endif - endif - ifeq ($(MACHINENAME),frontera) -@@ -271,16 +260,27 @@ ifeq ($(compiler),intel) - FLIBS := $(INCDIRS) -xCORE-AVX512 - endif - endif -- ifeq ($(MACHINENAME),queenbee) -+ ifeq ($(MACHINENAME),queenbee) - FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xSSE4.2 -assume buffered_io -- CFLAGS := $(INCDIRS) -O3 -DLINUX -xSSE4.2 -- FLIBS := $(INCDIRS) -xSSE4.2 -+ CFLAGS := $(INCDIRS) -O3 -DLINUX -xSSE4.2 -+ FLIBS := $(INCDIRS) -xSSE4.2 - ifeq ($(DEBUG),trace) - FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xSSE4.2 -assume buffered_io -- CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xSSE4.2 -- FLIBS := $(INCDIRS) -xSSE4.2 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xSSE4.2 -+ FLIBS := $(INCDIRS) -xSSE4.2 -+ endif -+ endif -+ ifeq ($(MACHINENAME),supermic) -+ FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xAVX -assume buffered_io -+ CFLAGS := $(INCDIRS) -O3 -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -assume buffered_io -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX - endif -- ifeq ($(MACHINENAME),supermic) -+ endif -+ ifeq ($(MACHINENAME),rostam) - FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xAVX -assume buffered_io - CFLAGS := $(INCDIRS) -O3 -DLINUX -xAVX - FLIBS := $(INCDIRS) -xAVX -@@ -290,6 +290,39 @@ ifeq ($(compiler),intel) - FLIBS := $(INCDIRS) -xAVX - endif - endif -+ ifeq ($(MACHINENAME),queenbeeC) -+ FFLAGS1 := $(INCDIRS) -O3 -FI -assume byterecl -132 -xCORE-AVX512 -assume buffered_io -+ CFLAGS := $(INCDIRS) -O3 -DLINUX -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xCORE-AVX512 -assume buffered_io -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xCORE-AVX512 -+ FLIBS := $(INCDIRS) -xCORE-AVX512 -+ endif -+ endif -+ ifeq ($(MACHINENAME),ls6) -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -+ FLIBS := $(INCDIRS) -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -+ FLIBS := $(INCDIRS) -+ endif -+ endif -+ #wwlwpd: NOTE: Mike III at LSU-HPC recommends 'mpiifort', Intel's MPI implementation wrapper -+ #wwlwpd: instead of the traditional "mpif90"; but the flags are the same we still redefine -+ #wwlwpd: "PFC" below -+ ifeq ($(MACHINENAME),mike) -+ PFC := mpiifort -+ FFLAGS1 := $(INCDIRS) -O2 -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -O2 -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ ifeq ($(DEBUG),trace) -+ FFLAGS1 := $(INCDIRS) -g -O0 -traceback -FI -assume byterecl -132 -xAVX -+ CFLAGS := $(INCDIRS) -g -O0 -traceback -DLINUX -xAVX -+ FLIBS := $(INCDIRS) -xAVX -+ endif - endif - # - #@jasonfleming Added to fix bus error on hatteras@renci -@@ -311,34 +344,27 @@ ifeq ($(compiler),intel) - MSGLIBS := - ifeq ($(NETCDF),enable) - ifeq ($(MACHINENAME),hatteras) -- NETCDFHOME :=/usr/share/Modules/software/CentOS-7/netcdf-Fortran/4.4.0_intel-18.0.0 -- FLIBS :=$(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -- FFLAGS1 :=$(FFLAGS1) -I$(NETCDFHOME)/include -- FFLAGS2 :=$(FFLAGS1) -- FFLAGS3 :=$(FFLAGS1) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - # jgf20150417 queenbee requires that the analyst load the netcdf and - # netcdf_fortran modules prior to compiling or executing ADCIRC - ifeq ($(MACHINENAME),queenbee) -- FLIBS := $(FLIBS) -L/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0/lib -lnetcdff -lnetcdf -- NETCDFHOME :=/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0 -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),queenbeeC) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),supermic) -- FLIBS := $(FLIBS) -L /usr/local/packages/netcdf_fortran/4.2/INTEL-140-MVAPICH2-2.0/lib -lnetcdff -L/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0/lib -lnetcdf -lnetcdf -liomp5 -lpthread -- NETCDFHOME :=/usr/local/packages/netcdf/4.2.1.1/INTEL-140-MVAPICH2-2.0/include -- FFLAGS1 :=$(FFLAGS1) -I/usr/local/packages/hdf5/1.8.12/INTEL-140-MVAPICH2-2.0/include -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),rostam) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),stampede) -- NETCDFHOME :=/opt/apps/intel17/netcdf/4.3.3.1/x86_64 - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - ifeq ($(MACHINENAME),stampede2) -- NETCDFHOME :=/opt/apps/intel17/netcdf/4.3.3.1/x86_64 - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -- ifeq ($(USER),jgflemin) -- NETCDFHOME :=/work/00976/jgflemin/stampede2/local -- FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -- endif - endif - ifeq ($(MACHINENAME),frontera) - # specify NETCDFHOME on the command line or as an environment var -@@ -347,33 +373,32 @@ ifeq ($(compiler),intel) - # @jasonfleming: Added support for lonestar5 at tacc.utexas.edu; - # load the following module: netcdf/4.3.3.1 - ifeq ($(MACHINENAME),lonestar5) -- #NETCDFHOME :=/opt/apps/intel18/netcdf/4.3.3.1/x86_64 -- # @jasonfleming: Updated support for lonestar5 -- NETCDFHOME :=/opt/apps/intel18/netcdf/4.6.2/x86_64 -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),ls6) -+ FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf -+ endif -+ ifeq ($(MACHINENAME),mike) - FLIBS := $(FLIBS) -L$(NETCDFHOME)/lib -lnetcdff -lnetcdf - endif - # jgf20150817: Adding support for spirit.afrl.hpc.mil; - # load the following modules: netcdf-fortran/intel/4.4.2 - # and hdf5/intel/1.8.12 and hdf5-mpi/intel/sgimpt/1.8.12 -- ifeq ($(MACHINENAME),spirit) -- NETCDFHOME :=/app/wpostool/COST/netcdf-fortran-4.4.2/intel -+ ifeq ($(MACHINENAME),spirit) - FLIBS := $(FLIBS) -L/app/wpostool/COST/netcdf-c-4.3.1.1/intel/lib -L$(NETCDFHOME)/lib -L/app/wpostool/COST/hdf5-mpi/1.8.12/intel/sgimpt/lib -lnetcdff -lnetcdf - endif - # jgf20150420 mike requires that the analyst add netcdf to the softenv -- # with the following on the command line -+ # with the following on the command line - # soft add +netcdf-4.1.3-Intel-13.0.0 - ifeq ($(MACHINENAME),mike) - FLIBS := $(FLIBS) -L/usr/local/packages/netcdf/4.1.3/Intel-13.0.0/lib -lnetcdff -lnetcdf -- NETCDFHOME :=/usr/local/packages/netcdf/4.1.3/Intel-13.0.0 - endif - ifeq ($(MACHINENAME),killdevil) - HDF5HOME :=/nas02/apps/hdf5-1.8.5/lib -- NETCDFHOME :=/nas02/apps/netcdf-4.1.1 - FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -lhdf5_fortran - endif - endif - #jgf20110519: For netcdf on topsail at UNC, use -- #NETCDFHOME=/ifs1/apps/netcdf/ - $(warning (INFO) Corresponding machine found in cmplrflags.mk.) - ifneq ($(FOUND),TRUE) - FOUND := TRUE -@@ -428,7 +453,6 @@ ifeq ($(compiler),intel-ND) - else - MULTIPLE := TRUE - endif -- NETCDFHOME=/afs/crc.nd.edu/x86_64_linux/n/netcdf/4.7.0/intel/18.0/ - endif - # SGI ICE X (e.g. topaz@ERDC) using Intel compilers, added by TCM - # jgf: Added flags for Thunder@AFRL. -@@ -449,9 +473,6 @@ ifeq ($(compiler),intel-sgi) - IMODS := -module - FLIBS := - ifeq ($(NETCDF),enable) -- ifeq ($(MACHINENAME),topaz) -- NETCDFHOME :=/apps/unsupported/netcdf/4.3.3.1-intel-15.0.3 -- endif - ifeq ($(MACHINENAME),thunder) - # add the following lines to ~/.personal.bashrc: - # module load costinit -@@ -493,7 +514,6 @@ ifeq ($(compiler),cray_xt3) - # When compiling with netCDF support, the HDF5 libraries must also - # be linked in, so the user must specify HDF5HOME on the command line. - # jgf20101102: on Sapphire, --# NETCDFHOME=/usr/local/usp/PETtools/CE/pkgs/netcdf-4.1.1-serial - # HDF5HOME=${PET_HOME}/pkgs/hdf5-1.8.5-serial/lib - ifeq ($(NETCDF),enable) - FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5_fortran -lhdf5_hl -lhdf5 -lz -@@ -514,7 +534,7 @@ ifeq ($(compiler),cray_xt4) - PFC := ftn - CC := pgcc - CCBE := cc -- FFLAGS1 := $(INCDIRS) -Mextend -Minform,inform -O2 -fastsse -+ FFLAGS1 := $(INCDIRS) -Mextend -Minform,inform -O2 -fastsse - ifeq ($(DEBUG),full) - FFLAGS1 := $(INCDIRS) -Mextend -g -O0 -traceback -Mbounds -Mchkfpstk -Mchkptr -Mchkstk -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK - endif -@@ -536,10 +556,8 @@ ifeq ($(compiler),cray_xt4) - # be linked in, so the user must specify HDF5HOME on the command line. - # On Jade, HDF5 was compiled with szip compression, so this library is - # required as well. --# jgf20101102: on Jade, NETCDFHOME=/usr/local/usp/PETtools/CE/pkgs/netcdf-4.0.1-serial - # jgf20101102: on Jade, HDF5HOME=${PET_HOME}/pkgs/hdf5-1.8.4-serial/lib - # jgf20101103: on Jade, SZIPHOME=/usr/local/usp/PETtools/CE/pkgs/szip-2.1/lib --# jgf20110728: on Garnet, NETCDFHOME=/opt/cray/netcdf/4.1.1.0/netcdf-pgi - ifeq ($(NETCDF),enable) - FLIBS := $(FLIBS) -L$(HDF5HOME) -L$(SZIPHOME) -lhdf5_fortran -lhdf5_hl -lhdf5 -lsz -lz - endif -@@ -572,7 +590,6 @@ ifeq ($(compiler),cray_xt5) - FLIBS := - # When compiling with netCDF support, the HDF5 libraries must also - # be linked in, so the user must specify HDF5HOME on the command line. --# jgf20090518: on Jade, NETCDFHOME=/usr/local/usp/PETtools/CE/pkgs/netcdf-4.0 - # jgf20090518: on Jade, HDF5HOME=${PET_HOME}/pkgs/hdf5-1.8.2/lib - ifeq ($(NETCDF),enable) - FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -lhdf5_fortran -@@ -606,7 +623,6 @@ ifeq ($(compiler),xtintel) - FLIBS := - # When compiling with netCDF support, the HDF5 libraries must also - # be linked in, so the user must specify HDF5HOME on the command line. --# jgf20090518: on Jade, NETCDFHOME=/usr/local/usp/PETtools/CE/pkgs/netcdf-4.0 - # jgf20090518: on Jade, HDF5HOME=${PET_HOME}/pkgs/hdf5-1.8.2/lib - ifeq ($(NETCDF),enable) - FLIBS := $(FLIBS) -L$(HDF5HOME) -lhdf5 -lhdf5_fortran -@@ -676,10 +692,8 @@ ifeq ($(compiler),utils) - # be linked in, so the user must specify HDF5HOME on the command line. - # On Jade, HDF5 was compiled with szip compression, so this library is - # required as well. --# jgf20101102: on Jade, NETCDFHOME=/usr/local/usp/PETtools/CE/pkgs/netcdf-4.0.1-serial - # jgf20101102: on Jade, HDF5HOME=${PET_HOME}/pkgs/hdf5-1.8.4-serial/lib - # jgf20101103: on Jade, SZIPHOME=/usr/local/usp/PETtools/CE/pkgs/szip-2.1/lib --# jgf20110728: on Garnet, NETCDFHOME=/opt/cray/netcdf/4.1.1.0/netcdf-pgi - ifeq ($(NETCDF),enable) - FLIBS := $(FLIBS) -L$(HDF5HOME) -L$(SZIPHOME) -lhdf5_fortran -lhdf5_hl -lhdf5 -lsz -lz - endif -@@ -751,7 +765,6 @@ ifeq ($(compiler),diamond) - LIBS := - # When compiling with netCDF support, the HDF5 libraries must also - # be linked in, so the user must specify HDF5HOME on the command line. --# jgf20101103: on Diamond, NETCDFHOME=/usr/local/usp/PETtools/CE/pkgs/netcdf-4.0.1-serial - # jgf20101103: on Diamond, HDF5HOME=${PET_HOME}/pkgs/hdf5-1.8.4-serial/lib - ifeq ($(NETCDF),enable) - NETCDFHOME :=/usr/local/usp/PETtools/CE/pkgs/netcdf-4.2.1.1-intel-serial -@@ -794,8 +807,7 @@ ifeq ($(compiler),garnet) - CFLAGS := $(INCDIRS) -DLINUX -g -O0 - endif - IMODS := -module -- FLIBS := --# jgf20110728: on Garnet, NETCDFHOME=/opt/cray/netcdf/4.1.1.0/netcdf-pgi -+ FLIBS := - # jgf20110815: on Garnet, HDF5HOME=/opt/cray/hdf5/default/hdf5-pgi - # jgf20130815: on Garnet, load module cray-netcdf, with the path to the - # installation being /opt/cray/netcdf/4.3.0 -@@ -855,7 +867,7 @@ ifeq ($(compiler),circleci) - IMODS := -I - CC := gcc - CCBE := $(CC) -- CFLAGS := $(INCDIRS) -O0 -g -mcmodel=medium -DLINUX -m64 -+ CFLAGS := $(INCDIRS) -O0 -g -mcmodel=medium -DLINUX -m64 - CLIBS := - LIBS := - MSGLIBS := -@@ -960,7 +972,7 @@ ifeq ($(compiler),gnu) - FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-132 -ftrace=full -fbounds-check -DNETCDF_TRACE -DFLUSH_MESSAGES -DFULL_STACK - endif - ifeq ($(DEBUG),valgrind) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-132 -+ FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-132 - endif - ifeq ($(SWAN),enable) - FFLAGS1 := $(FFLAGS1) -freal-loops -@@ -1007,9 +1019,9 @@ ifeq ($(compiler),gfortran) - PPFC := gfortran - FC := gfortran - PFC := mpif90 -- FFLAGS1 := $(INCDIRS) -O2 -ffixed-line-length-none -+ FFLAGS1 := $(INCDIRS) -O2 -ffixed-line-length-none - ifeq ($(PROFILE),enable) -- FFLAGS1 := $(INCDIRS) -pg -O0 -fprofile-arcs -ftest-coverage -ffixed-line-length-none -+ FFLAGS1 := $(INCDIRS) -pg -O0 -fprofile-arcs -ftest-coverage -ffixed-line-length-none - endif - ifeq ($(DEBUG),full) - FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -DDEBUG_WARN_ELEV -@@ -1018,7 +1030,7 @@ ifeq ($(compiler),gfortran) - FFLAGS1 := $(INCDIRS) -g -O0 -Wall -Wextra -ffixed-line-length-none -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK - endif - ifeq ($(DEBUG),full-not-warnelev) -- FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -+ FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -ffpe-trap=zero,invalid,overflow,denormal -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND - endif - ifeq ($(DEBUG),full-not-fpe) - FFLAGS1 := $(INCDIRS) -g -O0 -ffixed-line-length-none -fbacktrace -fbounds-check -DALL_TRACE -DFLUSH_MESSAGES -DFULL_STACK -DDEBUG_HOLLAND -@@ -1037,12 +1049,12 @@ ifeq ($(compiler),gfortran) - ifeq ($(SWAN),enable) - DPRE := -DREAL8 -DLINUX -DADCSWAN - endif -- FLIBS := -+ FLIBS := - ifeq ($(NETCDF),enable) - ifeq ($(MACHINENAME),jason-desktop) - NETCDFHOME := /usr - endif -- FLIBS := $(FLIBS) -lnetcdff -+ FLIBS := $(FLIBS) -lnetcdff - endif - IMODS := -I - CC := gcc -@@ -1221,7 +1233,6 @@ ifeq ($(IBM),p6) - MSGLIBS := -lm - # When compiling with netCDF support, the HDF5 libraries must also - # be linked in, so the user must specify HDF5HOME on the command line. --# yf20110301: on Cirrus/Stratus, NETCDFHOME=/usrx/local/bin/ - # yf20110301: on Cirrus/Stratus, HDF5HOME=/usrx/local/hdf5/lib - HDF5HOME=/usrx/local/hdf5/lib - ifeq ($(NETCDF),enable) diff --git a/patches/ADCIRC/v55-GLOBAL/about.txt b/patches/ADCIRC/v55-GLOBAL/about.txt deleted file mode 100644 index 11e4d8daa..000000000 --- a/patches/ADCIRC/v55-GLOBAL/about.txt +++ /dev/null @@ -1 +0,0 @@ -publicly available ADCIRC v55 (10.5281/zenodo.3911282) diff --git a/patches/ADCIRC/v55-GLOBAL/info.sh b/patches/ADCIRC/v55-GLOBAL/info.sh deleted file mode 100644 index a3978c347..000000000 --- a/patches/ADCIRC/v55-GLOBAL/info.sh +++ /dev/null @@ -1,7 +0,0 @@ -export ADCIRC_SRC_TYPE=remote-zip -export ADCIRC_BASE_URL=https://zenodo.org/record/3911282/files -export ADCIRC_SRC_FILE=adcirc-cg-GLOBAL.zip -export ADCIRC_EXTRACT_DIR=adcirc-cg-GLOBAL -export ADCIRC_ARCHIVE_URL=${ADCIRC_BASE_URL}/${ADCIRC_SRC_FILE} -export ADCIRC_EXTRACT_CMD=unzip -export SWANDIR=swan