From 997409412138b6f0d0ce1331a7b386f3eb74aba0 Mon Sep 17 00:00:00 2001
From: Stephan Thober <stephan.thober@ufz.de>
Date: Wed, 3 Jun 2020 14:04:14 +0200
Subject: [PATCH] Compiler config

---
 make.config/stmac.alias   |  2 +-
 make.config/stmac.gnu71   | 90 ---------------------------------------
 make.config/stmac.gnu92   |  8 ++--
 pre-proc/create_latlon.py |  2 +-
 4 files changed, 6 insertions(+), 96 deletions(-)
 delete mode 100644 make.config/stmac.gnu71

diff --git a/make.config/stmac.alias b/make.config/stmac.alias
index 308563d2..ef47a5ea 100644
--- a/make.config/stmac.alias
+++ b/make.config/stmac.alias
@@ -1,6 +1,6 @@
 # Set aliases so that one can, for example, say ifort to invoke standard intel11 on eve
 ifneq (,$(findstring $(compiler),gnu gcc gfortran gcc49 gfortran49))
-    icompiler := gnu71
+    icompiler := gnu92
 endif
 ifneq (,$(findstring $(compiler),nag nagfor nag62))
     icompiler := nag62
diff --git a/make.config/stmac.gnu71 b/make.config/stmac.gnu71
deleted file mode 100644
index 56e88378..00000000
--- a/make.config/stmac.gnu71
+++ /dev/null
@@ -1,90 +0,0 @@
-# -*- Makefile -*-
-
-#
-# Setup file for Gnu compiler 4.6 at Stephan's UFZ Ubuntu
-#
-# LICENSE
-#    This file is part of the UFZ makefile project.
-#
-#    The UFZ makefile project is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Lesser General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    The UFZ makefile project is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#    GNU Lesser General Public License for more details.
-#
-#    You should have received a copy of the GNU Lesser General Public License
-#    along with the UFZ makefile project. If not, see <http://www.gnu.org/licenses/>.
-#
-#    Copyright 2012 Stephan Thober
-
-# The Makefile assumes the standard bin, include and lib directories
-# i.e. if SOMEDIR = /path/to/lib, the make file will define the two dirs
-#   SOMEINC ?= SOMEDIR/include
-#   SOMELIB ?= SOMEDIR/lib
-# Define subirectories if another structure
-
-# Paths
-GNUDIR := /usr/local
-GNULIB := $(GNUDIR)/lib
-GNUBIN := $(GNUDIR)/bin
-
-# Compiling
-F90 := $(GNUBIN)/gfortran
-FC  := $(F90)
-CC  := /usr/bin/gcc
-CPP := /usr/bin/cpp
-# GNU Fortran version >= 4.4
-ifeq ($(release),debug)
-    F90FLAGS += -pedantic-errors -Wall -W -O -g -Wno-maybe-uninitialized
-    FCFLAGS  += -pedantic-errors -Wall -W -O -g -Wno-maybe-uninitialized
-    CFLAGS   += -pedantic -Wall -W -O -g -Wno-maybe-uninitialized
-else
-    F90FLAGS += -O3
-    FCFLAGS  += -O3
-    CFLAGS   += -O3
-endif
-F90FLAGS += -cpp -ffree-form -ffixed-line-length-132
-FCFLAGS  += -ffixed-form -ffixed-line-length-132
-CFLAGS   +=
-MODFLAG  := -J# space significant
-DEFINES  += -DGFORTRAN -DgFortran
-
-# Linking
-LIBS  += -L$(GNULIB)
-RPATH += -Wl,-rpath,$(GNULIB)
-
-# IMSL
-IMSLDIR :=
-
-# MKL
-MKLDIR := 
-MKLINC := 
-MKLLIB := 
-MKL95DIR := 
-MKL95INC := 
-MKL95LIB := 
-
-# NETCDF
-NCDIR   := /usr/local/netcdf-fortran-4.4.4-gfortran
-SZLIB   := /usr/local/lib
-HDF5LIB := /usr/local/lib
-
-# PROJ
-PROJ4DIR := 
-FPROJDIR := 
-
-# LAPACK
-LAPACKDIR   := /usr/lib
-LAPACKLIB   := $(LAPACKDIR)/lapack
-GFORTRANDIR := $(GNUDIR)
-GFORTRANLIB := $(GNULIB)
-
-# Documentation
-DOXYGENDIR :=
-DOTDIR     :=
-TEXDIR     :=
-PERLDIR    :=
diff --git a/make.config/stmac.gnu92 b/make.config/stmac.gnu92
index b39b6739..e2e7ac30 100644
--- a/make.config/stmac.gnu92
+++ b/make.config/stmac.gnu92
@@ -28,7 +28,7 @@
 # Define subirectories if another structure
 
 # Paths
-GNUDIR := /Users/thober/homebrew_dev
+GNUDIR := /usr/local
 GNULIB := $(GNUDIR)/lib
 GNUBIN := $(GNUDIR)/bin
 
@@ -69,9 +69,9 @@ MKL95INC :=
 MKL95LIB := 
 
 # NETCDF
-NCDIR   := /Users/thober/lib/install_netcdf/test_install/netcdf-fortran-4.5.2-gfortran
-SZLIB   := /Users/thober/homebrew_dev/lib
-HDF5LIB := /Users/thober/homebrew_dev/lib
+NCDIR   := /usr/local/netcdf-fortran-4.5.2-gfortran
+SZLIB   := /usr/local/lib
+HDF5LIB := /usr/local/lib
 
 # PROJ
 PROJ4DIR := 
diff --git a/pre-proc/create_latlon.py b/pre-proc/create_latlon.py
index a321b2a7..118a23be 100755
--- a/pre-proc/create_latlon.py
+++ b/pre-proc/create_latlon.py
@@ -210,4 +210,4 @@ def latlon_to_nc(fhandle, lons, lats, xx, yy, missVal, suffix):
 #
 # close netcdf dataset
 fhandle.close()
-print outfile + " created."
+print(outfile + " created.")