Skip to content

Commit

Permalink
added faster eigensolver option
Browse files Browse the repository at this point in the history
Conveting to standard form and using zgeev rather than zggev is about 5 times faster.
  • Loading branch information
gmstaebler committed Oct 26, 2024
1 parent a662187 commit 6f94adb
Show file tree
Hide file tree
Showing 9 changed files with 9,496 additions and 6 deletions.
42 changes: 42 additions & 0 deletions platform/build/make.inc.GFORTRAN_OSX_MACPORTS_mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#---------------------------------------------------
# OSX,gfortran+openmpi from MacPorts
# sudo port install openmpi netcdf-fortran fann
# sudo port install fftw-3 +openmpi
#---------------------------------------------------
IDENTITY="OSX gfortran+openmpi from MacPorts"

MAKE = make

NETCDF_PATH=/opt/local
MF90 = mpif90-openmpi-mp

# Compilers and flags
#
#set up for diff mpif90s
#

FC = ${MF90} -std=f2008 -fall-intrinsics -I$(GACODE_ROOT)/modules -J$(GACODE_ROOT)/modules -I/opt/local/include -fPIC
#F77 = ${MF90} -w -fallow-argument-mismatch
F77 = ${MF90} -w

FOMP = -fopenmp
FMATH = -fdefault-real-8 -fdefault-double-8
FOPT = -O3 -m64 -framework Accelerate
FDEBUG = -Wall -g -fcheck=all -fbacktrace -fbounds-check -O0 -Wextra -finit-real=nan -Wunderflow -ffpe-trap=invalid,zero,overflow
#F2PY = f2py-2.7

# System math libraries

LMATH = -L/opt/local/lib -lfftw3

NETCDF = -L${NETCDF_PATH}/lib -lnetcdff -lnetcdf
NETCDF_INC =${NETCDF_PATH}/include

# Archive

ARCH = ar cr

ifdef FANN_ROOT
# neural net libraries
NN_LIB=-L$(GACODE_ROOT)/../neural/ -I$(GACODE_ROOT)/../neural/ -lbrainfuse -lfann
endif
53 changes: 53 additions & 0 deletions platform/build/make.inc.OSX_VENTURA
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
#---------------------------------------------------\
# OSX Ventura \
#\
# macport installation instructions for new Mac \
# running Ventura assuming OMFIT being installed as\
# well. YMMV \
#\
# 1) install OMFIT via macports- gets initial \
# dependencies\
# 2) sudo port install gcc12\
# 2) sudo port install openmpi-gcc12\
# 3) sudo port install netcdf-fortran\
# 4) determine local host name via uname -n\
# add following line to /etc/hosts\
# 127.0.0.1 <local host name>\
#\
#---------------------------------------------------\
\
# Compilers and flags\
\
MF90 = mpif90-openmpi-mp\
FC = $\{MF90\} -I$(GACODE_ROOT)/modules -J$(GACODE_ROOT)/modules -fPIC -framework Accelerate -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk\
F77 = mpif77 -std=legacy\
CC = $\{FC\}\
\
GOMPTEST := $(shell $\{CC\} -v 2>&1 | grep " version " | grep gcc >/dev/null; echo $$?)\
ifeq ($(GOMPTEST),0)\
FOMP =-fopenmp\
endif\
\
FMATH =-fdefault-real-8 -fdefault-double-8 \
FOPT =-O3 \
FDEBUG =-Wall -fcheck=all -ffpe-trap=invalid,zero,overflow -g -fbacktrace\
F2PY = f2py\
\
# System math libraries\
\
LMATH = /opt/local/lib/libfftw3.a\
FFTW_INC = /opt/local/include \
\
ifdef FANN_ROOT\
# neural net libraries\
NN_LIB=-L$(GACODE_ROOT)/../neural/ -I$(GACODE_ROOT)/../neural/ -lbrainfuse -lfann\
endif\
\
# NetCDF libraries\
\
NETCDF = -L/opt/local/lib -lnetcdff -L/opt/local/lib -Wl,-headerpad_max_install_names -lnetcdf -lnetcdf\
NETCDF_INC = /opt/local/include\
\
# Archive\
\
ARCH = ar cr}
Binary file added tglf/src/filter/TGLF_New_Filter_24_05_2024.pdf
Binary file not shown.
Loading

0 comments on commit 6f94adb

Please sign in to comment.