From c5a8543f1707afd574534ed0a65c64b6cb175bf4 Mon Sep 17 00:00:00 2001
From: Pratheek Shanthraj
Date: Wed, 18 Mar 2015 17:18:43 +0000
Subject: [PATCH] updated petsc
---
code/DAMASK_spectral_interface.f90 | 2 +-
code/DAMASK_spectral_solverAL.f90 | 2 +-
code/DAMASK_spectral_solverBasicPETSc.f90 | 2 +-
code/DAMASK_spectral_solverPolarisation.f90 | 2 +-
code/DAMASK_spectral_utilities.f90 | 2 +-
code/IO.f90 | 2 +-
code/Makefile | 10 +++++-----
code/numerics.f90 | 2 +-
code/prec.f90 | 2 +-
9 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/code/DAMASK_spectral_interface.f90 b/code/DAMASK_spectral_interface.f90
index 9575f5d33..8de94cbf3 100644
--- a/code/DAMASK_spectral_interface.f90
+++ b/code/DAMASK_spectral_interface.f90
@@ -17,7 +17,7 @@ module DAMASK_interface
implicit none
private
#ifdef PETSc
-#include
+#include
#endif
logical, public, protected :: appendToOutFile = .false. !< Append to existing spectralOut file (in case of restart, not in case of regridding)
integer(pInt), public, protected :: spectralRestartInc = 1_pInt !< Increment at which calculation starts
diff --git a/code/DAMASK_spectral_solverAL.f90 b/code/DAMASK_spectral_solverAL.f90
index 7081a0448..b81472dc9 100644
--- a/code/DAMASK_spectral_solverAL.f90
+++ b/code/DAMASK_spectral_solverAL.f90
@@ -17,7 +17,7 @@ module DAMASK_spectral_solverAL
implicit none
private
-#include
+#include
character (len=*), parameter, public :: &
DAMASK_spectral_solverAL_label = 'al'
diff --git a/code/DAMASK_spectral_solverBasicPETSc.f90 b/code/DAMASK_spectral_solverBasicPETSc.f90
index 451d953e5..3c56c8138 100644
--- a/code/DAMASK_spectral_solverBasicPETSc.f90
+++ b/code/DAMASK_spectral_solverBasicPETSc.f90
@@ -17,7 +17,7 @@ module DAMASK_spectral_SolverBasicPETSc
implicit none
private
-#include
+#include
character (len=*), parameter, public :: &
DAMASK_spectral_SolverBasicPETSC_label = 'basicpetsc'
diff --git a/code/DAMASK_spectral_solverPolarisation.f90 b/code/DAMASK_spectral_solverPolarisation.f90
index 7930fd12d..508332bf9 100644
--- a/code/DAMASK_spectral_solverPolarisation.f90
+++ b/code/DAMASK_spectral_solverPolarisation.f90
@@ -17,7 +17,7 @@ module DAMASK_spectral_solverPolarisation
implicit none
private
-#include
+#include
character (len=*), parameter, public :: &
DAMASK_spectral_solverPolarisation_label = 'polarisation'
diff --git a/code/DAMASK_spectral_utilities.f90 b/code/DAMASK_spectral_utilities.f90
index a48c1b888..80ed4f999 100644
--- a/code/DAMASK_spectral_utilities.f90
+++ b/code/DAMASK_spectral_utilities.f90
@@ -15,7 +15,7 @@ module DAMASK_spectral_utilities
implicit none
private
#ifdef PETSc
-#include
+#include
#endif
logical, public :: cutBack =.false. !< cut back of BVP solver in case convergence is not achieved or a material point is terminally ill
integer(pInt), public, parameter :: maxPhaseFields = 2_pInt
diff --git a/code/IO.f90 b/code/IO.f90
index 45780efa7..30b1b4b0a 100644
--- a/code/IO.f90
+++ b/code/IO.f90
@@ -104,7 +104,7 @@ subroutine IO_init
implicit none
integer(pInt) :: worldrank = 0_pInt
#ifdef PETSc
-#include
+#include
PetscErrorCode :: ierr
#endif
diff --git a/code/Makefile b/code/Makefile
index bb80a360e..563031e89 100644
--- a/code/Makefile
+++ b/code/Makefile
@@ -17,7 +17,7 @@ SHELL = /bin/sh
# STANDARD_CHECK = checking for Fortran 2008, compiler dependend
########################################################################################
-include $(PETSC_DIR)/conf/variables
+include $(PETSC_DIR)/lib/petsc-conf/variables
INCLUDE_DIRS := $(PETSC_FC_INCLUDES) -DPETSc -I../lib
LIBRARIES := $(PETSC_WITH_EXTERNAL_LIB)
COMPILERNAME ?= $(FC)
@@ -302,8 +302,8 @@ PRECISION_gfortran :=-fdefault-real-8 -fdefault-double-8 -DFLOAT=8 -DINT=4
#-fdefault-integer-8: Use it to set precision to 8 bytes for integer, don't use it for the standard case of pInt=4 (there is no -fdefault-integer-4)
###################################################################################################
-COMPILE =$(COMPILE_OPTIONS_$(F90)) $(STANDARD_CHECK_$(F90)) $(OPTIMIZATION_$(OPTI)_$(F90)) $(INCLUDE_DIRS) $(PRECISION_$(F90))
-COMPILE_MAXOPTI =$(COMPILE_OPTIONS_$(F90)) $(STANDARD_CHECK_$(F90)) $(OPTIMIZATION_$(MAXOPTI)_$(F90)) $(INCLUDE_DIRS) $(PRECISION_$(F90))
+COMPILE =$(OPENMP_FLAG_$(F90)) $(COMPILE_OPTIONS_$(F90)) $(STANDARD_CHECK_$(F90)) $(OPTIMIZATION_$(OPTI)_$(F90)) $(INCLUDE_DIRS) $(PRECISION_$(F90))
+COMPILE_MAXOPTI =$(OPENMP_FLAG_$(F90)) $(COMPILE_OPTIONS_$(F90)) $(STANDARD_CHECK_$(F90)) $(OPTIMIZATION_$(MAXOPTI)_$(F90)) $(INCLUDE_DIRS) $(PRECISION_$(F90))
###################################################################################################
DAMAGE_FILES = \
damage_none.o damage_isoBrittle.o damage_isoDuctile.o damage_gurson.o damage_anisoBrittle.o damage_anisoDuctile.o damage_phaseField.o
@@ -326,8 +326,8 @@ HOMOGENIZATION_FILES = \
# Spectral Solver
#####################
DAMASK_spectral.exe: IGNORE := \#
-DAMASK_spectral.exe: COMPILE += $(OPENMP_FLAG_$(F90)) -DSpectral
-DAMASK_spectral.exe: COMPILE_MAXOPTI += $(OPENMP_FLAG_$(F90)) -DSpectral
+DAMASK_spectral.exe: COMPILE += -DSpectral
+DAMASK_spectral.exe: COMPILE_MAXOPTI += -DSpectral
DAMASK_spectral.exe: MESHNAME := mesh.f90
DAMASK_spectral.exe: INTERFACENAME := DAMASK_spectral_interface.f90
diff --git a/code/numerics.f90 b/code/numerics.f90
index e3a7db8b7..2f77d20ea 100644
--- a/code/numerics.f90
+++ b/code/numerics.f90
@@ -13,7 +13,7 @@ module numerics
implicit none
private
#ifdef PETSc
-#include
+#include
#endif
character(len=64), parameter, private :: &
numerics_CONFIGFILE = 'numerics.config' !< name of configuration file
diff --git a/code/prec.f90 b/code/prec.f90
index 5c0c19e95..a10fae65b 100644
--- a/code/prec.f90
+++ b/code/prec.f90
@@ -115,7 +115,7 @@ subroutine prec_init
implicit none
integer(pInt) :: worldrank = 0_pInt
#ifdef PETSc
-#include
+#include
PetscErrorCode :: ierr
#endif
external :: &