some minor changes in mac version

.gitignore

@@ -4,3 +4,6 @@
 *.o
 *.so
 *.dylib
+./vis
+./lib
+./include

amatos2d/3rdparty/LAPACK95/make.inc_cen_thunder

+#
+#  -- LAPACK95 interface driver routine (version 2.0) --
+#     UNI-C, Denmark; Univ. of Tennessee, USA; NAG Ltd., UK
+#     August 5, 2000
+#
+FC       = gfortran -ffree-form
+FC1      = gfortran -ffixed-form
+# -dcfuns  Enable recognition of non-standard double
+#          precision  complex intrinsic functions
+# -dusty   Allows the compilation and execution of "legacy"
+#          software by downgrading the category  of  common
+#          errors  found  in  such software from "Error" to
+# -ieee=full enables all IEEE arithmetic facilities
+#          including non-stop arithmetic.
+
+# SET MAIN DIRECTORY PATH
+# !! This has to be alterd by user !!
+ROOTDIR     = $(HOME)/Transport-20/tracertransportsoftware/amatos2d
+LAPACK95DIR = $(ROOTDIR)/3rdparty/LAPACK95
+
+OPTS0    = -O3 -u -V
+LAPACK95MOD = $(LAPACK95DIR)/lapack95_modules
+OPTS1    = -c $(OPTS0)
+OPTS3    = $(OPTS1) -I$(LAPACK95MOD)
+OPTL     = -o
+OPTLIB   =
+
+# SET atlas/blas DIRECTORY PATH
+# !! This has to be alterd by user !!
+BLASLIB = -L/usr/lib -lblas
+
+# SET LAPACK DIRECTORY PATH
+# !! This has to be alterd by user !!
+LAPACKLIB = -L/usr/lib -llapack -lpthread -lc
+
+LAPACK95LIB = -L$(LAPACK95DIR) -llapack95
+LAPACK95    = liblapack95.a
+
+TMG77       = /usr/lib64/tmglib.a
+
+# LIBS     = $(LAPACK95LIB) $(TMG77) $(LAPACKLIB) $(BLASLIB)
+LIBS     = $(LAPACK95LIB) $(LAPACKLIB) $(BLASLIB)
+SUF      = f90
+
+XX = 'rm' -f $@; \
+        'rm' -f $@.res; \
+	$(FC) $(OPTS0) -o $@ -I$(LAPACK95MOD) $@.$(SUF) $(OPTLIB) $(LIBS); \
+        $@ < $@.dat > $@.res; \
+        'rm' -f $@
+
+YY = $(FC) $(OPTS0) -o $@ -I$(LAPACK95MOD) $@.$(SUF) $(OPTLIB) $(LIBS)
+
+.SUFFIXES: .f90 .f .o
+
+.$(SUF).o:
+	$(FC) $(OPTS3) $<
+
+.f.o:
+	$(FC1) $(OPTS3) $<

amatos2d/3rdparty/LAPACK95/make.inc_macosx_gfortran

+#
+#  -- LAPACK95 interface driver routine (version 2.0) --
+#     UNI-C, Denmark; Univ. of Tennessee, USA; NAG Ltd., UK
+#     August 5, 2000
+#
+FC       = gfortran -ffree-form
+FC1      = gfortran -ffixed-form
+# -dcfuns  Enable recognition of non-standard double
+#          precision  complex intrinsic functions
+# -dusty   Allows the compilation and execution of "legacy"
+#          software by downgrading the category  of  common
+#          errors  found  in  such software from "Error" to
+# -ieee=full enables all IEEE arithmetic facilities
+#          including non-stop arithmetic.
+
+# SET MAIN DIRECTORY PATH
+# !! This has to be alterd by user !!
+ROOTDIR     = $(HOME)/Documents/Teaching/WS2021/Transport-20/tracertransportsoftware/amatos2d
+LAPACK95DIR = $(ROOTDIR)/3rdparty/LAPACK95
+
+OPTS0    = -O3 -u -V
+LAPACK95MOD = $(LAPACK95DIR)/lapack95_modules
+OPTS1    = -c $(OPTS0)
+OPTS3    = $(OPTS1) -I$(LAPACK95MOD)
+OPTL     = -o
+OPTLIB   =
+
+# SET atlas/blas DIRECTORY PATH
+# !! This has to be alterd by user !!
+BLASLIB = -L/opt/local/lib/lapack -lblas
+
+# SET LAPACK DIRECTORY PATH
+# !! This has to be alterd by user !!
+LAPACKLIB = -L/opt/local/lib/lapack -llapack -lpthread -lc
+
+LAPACK95LIB = -L$(LAPACK95DIR) -llapack95
+LAPACK95    = liblapack95.a
+
+TMG77       = /usr/lib64/tmglib.a
+
+# LIBS     = $(LAPACK95LIB) $(TMG77) $(LAPACKLIB) $(BLASLIB)
+LIBS     = $(LAPACK95LIB) $(LAPACKLIB) $(BLASLIB)
+SUF      = f90
+
+XX = 'rm' -f $@; \
+        'rm' -f $@.res; \
+	$(FC) $(OPTS0) -o $@ -I$(LAPACK95MOD) $@.$(SUF) $(OPTLIB) $(LIBS); \
+        $@ < $@.dat > $@.res; \
+        'rm' -f $@
+
+YY = $(FC) $(OPTS0) -o $@ -I$(LAPACK95MOD) $@.$(SUF) $(OPTLIB) $(LIBS)
+
+.SUFFIXES: .f90 .f .o
+
+.$(SUF).o:
+	$(FC) $(OPTS3) $<
+
+.f.o:
+	$(FC1) $(OPTS3) $<

amatos2d/compile/macosx_gfortran/Makefile

@@ -26,7 +26,7 @@ SAVETHING= SAVETEST
 MODE := debug
 
 # CREATE SHARED LIBRARIES
-CREATE_SHARED := yes
+CREATE_SHARED := no #yes
 
 # FURTHER OPTIONS
 DBL_DBL    := yes
@@ -49,15 +49,16 @@ MACROS =
 
 # SET MAIN DIRECTORY PATH
 # !! This has to be alterd by user !!
-ROOTDIR = $(HOME)/Documents/Development/amatos
+ROOTDIR = $(HOME)/Documents/Teaching/WS2021/Transport-20/tracertransportsoftware
 
 # SET atlas/blas DIRECTORY PATH
 # !! This has to be alterd by user !!
-BLASLIB = 
+BLASLIB = -L/opt/local/lib/lapack -lblas
 
 # SET LAPACK DIRECTORY PATH
 # !! This has to be alterd by user !!
-LAPACKLIB = -framework Accelerate
+LAPACKLIB = -L/opt/local/lib/lapack -llapack \
+                        -L/$(ROOTDIR)/amatos2d/3rdparty/LAPACK95 -llapack95
 
 # SET IO_EMIT LIBRARY PATH
 # !! This has to be alterd by user !!
@@ -71,8 +72,8 @@ endif
 BITMAPLIB =
 BITMAPINC =
 ifeq ($(strip $(IO_PGM)),yes)
-  BITMAPLIB = -L/sw2/lib -lnetpbm
-  BITMAPINC = -I/sw2/include
+  BITMAPLIB = -L/opt/local/lib -lnetpbm
+  BITMAPINC = -I/opt/local/include
 endif
 
 # SET NETCDF PATHS
@@ -81,17 +82,17 @@ NETCDFLIB =
 NETCDFINC =
 NCUGRIDLIB =
 ifneq ($(strip $(NO_NETCDF)), yes)
-  NETCDFLIB = -L/sw2/lib -lnetcdff -lnetcdf
-  NETCDFINC = -I/sw2/include
+  NETCDFLIB = -L/opt/local/lib -lnetcdff -lnetcdf
+  NETCDFINC = -I/opt/local/include
   NCUGRIDLIB = -lncugrid
 endif
 
 # SET MORE DIRECTORY PATHS
-MAINDIR = $(ROOTDIR)/amatos2d/trunk
+MAINDIR = $(ROOTDIR)/amatos2d
 
 BUILDIR = $(MAINDIR)/compile/$(MACHINE)
-LIBDIR  = $(MAINDIR)/lib/$(MACHINE)
-INCDIR  = $(MAINDIR)/include/$(MACHINE)
+LIBDIR  = $(ROOTDIR)/lib/$(MACHINE)
+INCDIR  = $(ROOTDIR)/include/$(MACHINE)
 DATDIR  = $(MAINDIR)/data
 SRCDIR  = $(MAINDIR)/src
 
@@ -133,7 +134,7 @@ MF = -D
 # --------------------- next are for debugging ------------------#
 ifeq ($(strip $(MODE)),debug)
   FFLAGS  = -fbounds-check -ggdb -fpic -funderscoring # -C
-  CFLAGS  = -ggdb -fpic
+  CFLAGS  = -ggdb -fpic -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include
   LDFLAGS = -ggdb -mmacosx-version-min=10.11
   SHFLAGS = -fpic -dynamiclib -mmacosx-version-min=10.11
 endif