Commit 7a912492 authored by Robert Schweppe's avatar Robert Schweppe
Browse files

Merge branch 'develop' into 'master'

Creating version 0.1

See merge request !10
parents fdf8b286 0cecfaab
File deleted
......@@ -264,6 +264,11 @@ mpr_flex
mpr_flex_dummy
*.release*
*.debug*
wrfinput.nc
*wrfinput.nc
wrfinput_125.nc
wrfinput_25.nc
.idea/misc.xml
.idea/modules.xml
.idea/mpr_flex.iml
.idea/codeStyles/
*.f90.new
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="TestRunnerService">
<option name="PROJECT_TEST_RUNNER" value="Unittests" />
</component>
</module>
\ No newline at end of file
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
</code_scheme>
</component>
\ No newline at end of file
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
</state>
</component>
\ No newline at end of file
<component name="ProjectDictionaryState">
<dictionary name="ottor" />
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (playground)" project-jdk-type="Python SDK" />
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/20180205_mpr_playground.iml" filepath="$PROJECT_DIR$/.idea/20180205_mpr_playground.iml" />
</modules>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
This diff is collapsed.
project: MPR
src_dir: ./src/
output_dir: ./doc
project_download: https://git.ufz.de/chs/MPR.git
website: http://www.ufz.de/index.php?en=40114
summary: MPR as a flexible standalone tool.
author: CHS
email: robert.schweppe@ufz.de
media_dir: ./media
docmark: !
predocmark: >
media_dir: ./media
docmark_alt: #
predocmark_alt: <
coloured_edges: true
display: public
protected
private
source: true
graph: true
search: true
warn: false
MPR project description
@note
lorem ipsum
@endnote
@warning
@todo
@bug
......@@ -101,7 +101,7 @@ MAKEDPATH := $(CONFIGPATH) # where is the make.d.sh script
CHECKPATH := test # path for $(CHECKPATH)/test* and $(CHECKPATH)/check* directories if target is check
DOXCONFIG := ./doxygen.config # the doxygen config file
#
PROGNAME := mpr_flex # Name of executable
PROGNAME := mpr # Name of executable
LIBNAME := #libminpack.a # Name of library
#
# Options
......
# Set aliases so that one can, for example, say ifort to invoke standard intel11 on eve
ifneq (,$(findstring $(compiler),gnu gfortran gcc gfortran49 gcc49))
icompiler := gnu61
icompiler := gnu81
endif
ifneq (,$(findstring $(compiler),nag nag60 nagfor))
icompiler := nag61
icompiler := nag62
endif
......@@ -53,7 +53,7 @@ ifeq ($(release),debug)
# Ordinary assignment of pointer function fname reference to pointer variable vname
# Last statement of DO loop body is an unconditional jump
# Array constructor has a polymorphic element but the constructor value will not be polymorphic
F90FLAGS += -C -C=dangling -g -nan -O0 -strict95 # -w=ques -g90
F90FLAGS += -C=all -g -nan -O0 -strict95 # -w=ques -g90
ifneq ($(openmp),true)
F90FLAGS += -gline
endif
......@@ -88,7 +88,7 @@ ifeq ($(netcdf),netcdf3)
NCDIR :=
else
NCDIR := /usr/local
NCFDIR := /usr/local/netcdf-fortran-4.4.3-nagfor
NCFDIR := /usr/local/netcdf-fortran-4.4.4-nagfor
CURLLIB := /usr/lib
SZLIB := /usr/local/lib
HDF5LIB := /usr/local/lib
......
......@@ -2,11 +2,11 @@
ifneq (,$(findstring $(compiler),gnu gfortran gcc))
icompiler := gnu48
endif
ifneq (,$(findstring $(compiler),intel ifort ifort13))
icompiler := intel13
ifneq (,$(findstring $(compiler),intel ifort ifort13 ifort18))
icompiler := intel18
endif
ifneq (,$(findstring $(compiler),nag nagfor))
icompiler := nag60
icompiler := nag62
endif
ifneq (,$(findstring $(compiler),pgi pgfortran pgfortran159))
icompiler := pgi159
......
# -*- Makefile -*-
#
# Setup file for Intel compiler 13.1.0 at eve.ufz.de
#
# 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 Matthias Cuntz
# 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
# INTEL := /opt/intel/composer_xe_2013.1.117
# INTELDIR := /usr/local/intel/13.0.1
INTEL := /software/intel/parallel-studio/2018_u2-1/compilers_and_libraries_2018.2.199/linux
INTELDIR := /software/intel/parallel-studio/2018_u2-1/compilers_and_libraries_2018.2.199/linux
INTELLIB := $(INTELDIR)/compiler/lib/intel64_lin
INTELBIN := $(INTEL)/bin/intel64
GNUDIR := /usr/local/gcc/4.8.1-3_CentOS6/
OPENSSLLIB := /usr/local/openssl/1.0.2-1/usr/lib
# Compiling
F90 := $(INTELBIN)/ifort
FC := $(F90)
CC := $(INTELBIN)/icc
CPP := /usr/bin/cpp
ifeq ($(release),debug)
F90FLAGS += -warn all -g -debug -traceback -fp-stack-check -O0 -debug -gxx-name=/usr/local/gcc/6.2.0-1/bin/g++
F90FLAGS += -check all
# F90FLAGS += -check all,noarg_temp_created
FCFLAGS += -g -debug -traceback -fp-stack-check -O0 -debug -gxx-name=/usr/local/gcc/6.2.0-1/bin/g++
CFLAGS += -g -debug -traceback -fp-stack-check -O0 -debug -Wall -Wcheck
else
# -fast (=-ipo -O3 -static) Multifile interprocedure optimization
# -vec-report1 to see vectorized loops; -vec-report2 to see also non-vectorized loops
F90FLAGS += -O3 -qoverride-limits -gxx-name=/usr/local/gcc/6.2.0-1/bin/g++
FCFLAGS += -O3 -qoverride-limits -gxx-name=/usr/local/gcc/6.2.0-1/bin/g++
CFLAGS += -O3
endif
F90FLAGS += -nofixed -assume byterecl -cpp -fp-model source -m64 -assume realloc-lhs # precise -> source: suppress warning, computation identical
MODFLAG := -module # space significant
FCFLAGS += -assume byterecl -cpp -fp-model source -m64 -fixed
CFLAGS += -m64 -std=c99
DEFINES += -DINTEL -DINTEL_COMPILER
LDFLAGS += -gxx-name=/usr/local/gcc/4.8.1-3_CentOS6/bin/g++
# Linking
ifeq ($(istatic),static)
LIBS += -static-intel
endif
LIBS += -L$(INTELLIB) -limf -lm -lsvml
ifneq ($(istatic),static)
LIBS += -lintlc
endif
RPATH += -Wl,-rpath,$(INTELLIB) -Wl,-rpath,$(OPENSSLLIB)
iLDPATH = $(GNUDIR)/lib64:/usr/local/cloog/0.18.0-2/lib:/usr/local/isl/0.11.1-2/lib:/usr/local/mpc/1.0.1-3/lib:/usr/local/mpfr/3.1.2-2/lib:/usr/local/gmp/5.1.2-1/lib
ifneq ($(LDPATH),)
LDPATH += :$(iLDPATH)
else
LDPATH := $(iLDPATH)
endif
# IMSL
IMSLDIR := /usr/local/imsl/imsl/fnl700/rdhin111e64
# MKL
MKLDIR := $(INTEL)/mkl
MKLINC := $(MKLDIR)/include/intel64/lp64
MKLLIB := $(INTELDIR)/mkl/lib/intel64
MKL95DIR := $(MKLDIR)
MKL95INC := $(MKL95DIR)/include/intel64/lp64
MKL95LIB := $(MKL95DIR)/lib/intel64
# NETCDF
ifeq ($(netcdf),netcdf3)
NCDIR :=
else
ZLIB := /usr/local/zlib/1.2.11-1_intel_18.0.2-1/lib
SZLIB := /usr/local/szip/2.1.1-1_intel_18.0.2-1/lib
HDF5LIB := /usr/local/hdf5/1.10.1-1_intel_18.0.2-1/lib
NCDIR := /usr/local/netcdf/4.6.1-1_intel_18.0.2-1/
NCFDIR := /usr/local/netcdf-fortran/4.4.4-1_intel_18.0.2-1/
endif
# PROJ
PROJ4DIR :=
FPROJDIR :=
# LAPACK
LAPACKDIR := /usr/local/lapack/3.5.0-1_gcc_4.8.1_CentOS6
GFORTRANDIR := /usr/local/gcc/4.8.1-3_CentOS6/
GFORTRANLIB := $(GFORTRANDIR)/lib64
# MPI
MPIDIR := /usr/local/openmpi/intel/1.8.4-2
# Documentation
DOXYGENDIR := /usr/local/doxygen/1.8.7-1_gcc_4.8.1_CentOS6/bin
DOTDIR := /usr/bin
TEXDIR := /usr/local/texlive/2011/bin/x86_64-linux
PERLDIR := /usr/bin
iiLDPATH := /usr/local/flex/2.5.39-1_gcc_4.8.1_CentOS6/lib:/usr/local/bison/3.0.2-1_gcc_4.8.1_CentOS6/lib
ifneq ($(LDPATH),)
LDPATH += :$(iiLDPATH)
else
LDPATH := $(iiLDPATH)
endif
# Check some dependices, e.g. IMSL needs intel11 on eve
ifneq (,$(findstring $(system),eve))
ifneq (,$(findstring $(imsl),vendor imsl))
ifneq ($(icompiler),intel11)
$(error Error: IMSL needs intel11.0.075, set 'compiler=intel11')
endif
ifeq ($(imsl),vendor)
ifeq (,$(findstring $(mkl),mkl mkl95))
$(error Error: IMSL vendor needs MKL, set 'mkl=mkl' or 'mkl=mkl95')
endif
endif
endif
endif
# Lapack on Eve needs libgfortran
ifeq ($(lapack),true)
ifneq (exists, $(shell if [ -d "$(GFORTRANDIR)" ] ; then echo 'exists' ; fi))
$(error Error: GFORTRAN path '$(GFORTRANDIR)' not found.)
endif
GFORTRANLIB ?= $(GFORTRANDIR)/lib
iLIBS += -L$(GFORTRANLIB) -lgfortran
RPATH += -Wl,-rpath,$(GFORTRANLIB)
endif
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment