From 905b9f8f421116db671f11e0f2973a0eb75e892e Mon Sep 17 00:00:00 2001 From: Pratheek Shanthraj Date: Tue, 4 Aug 2015 15:04:53 +0000 Subject: [PATCH] petsc update (now v3.6.1) --- code/DAMASK_spectral_driver.f90 | 2 +- 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 | 2 +- code/mesh.f90 | 2 +- code/numerics.f90 | 2 +- code/prec.f90 | 2 +- code/spectral_damage.f90 | 2 +- code/spectral_thermal.f90 | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/DAMASK_spectral_driver.f90 b/code/DAMASK_spectral_driver.f90 index c01a806a0..49ad3e9ca 100644 --- a/code/DAMASK_spectral_driver.f90 +++ b/code/DAMASK_spectral_driver.f90 @@ -84,7 +84,7 @@ program DAMASK_spectral_Driver implicit none -#include +#include !-------------------------------------------------------------------------------------------------- ! variables related to information from load case and geom file diff --git a/code/DAMASK_spectral_interface.f90 b/code/DAMASK_spectral_interface.f90 index 3f9c795fa..8b5ef3dbb 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 dcd674cb0..6eea15bd9 100644 --- a/code/DAMASK_spectral_solverAL.f90 +++ b/code/DAMASK_spectral_solverAL.f90 @@ -18,7 +18,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 39f6493a6..5651ff00e 100644 --- a/code/DAMASK_spectral_solverBasicPETSc.f90 +++ b/code/DAMASK_spectral_solverBasicPETSc.f90 @@ -18,7 +18,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 c07c51190..4ae57842c 100644 --- a/code/DAMASK_spectral_solverPolarisation.f90 +++ b/code/DAMASK_spectral_solverPolarisation.f90 @@ -18,7 +18,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 851203d19..a399736f0 100644 --- a/code/DAMASK_spectral_utilities.f90 +++ b/code/DAMASK_spectral_utilities.f90 @@ -17,7 +17,7 @@ module DAMASK_spectral_utilities implicit none private #ifdef PETSc -#include +#include #endif include 'fftw3-mpi.f03' diff --git a/code/IO.f90 b/code/IO.f90 index 78a3d2b60..0da82adc6 100644 --- a/code/IO.f90 +++ b/code/IO.f90 @@ -102,7 +102,7 @@ subroutine IO_init implicit none integer(pInt) :: worldrank = 0_pInt #ifdef PETSc -#include +#include PetscErrorCode :: ierr #endif external :: & diff --git a/code/Makefile b/code/Makefile index dd5793a8c..26658ca1c 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)/lib/petsc-conf/variables +include $(PETSC_DIR)/lib/petsc/conf/variables INCLUDE_DIRS := $(PETSC_FC_INCLUDES) -DPETSc -I../lib LIBRARIES := $(PETSC_WITH_EXTERNAL_LIB) COMPILERNAME ?= $(FC) diff --git a/code/mesh.f90 b/code/mesh.f90 index 4a6f791d7..925452285 100644 --- a/code/mesh.f90 +++ b/code/mesh.f90 @@ -117,7 +117,7 @@ module mesh #ifdef Spectral #ifdef PETSc -#include +#include include 'fftw3-mpi.f03' #else include 'fftw3.f03' diff --git a/code/numerics.f90 b/code/numerics.f90 index ac98d1761..e935e63a8 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 fac90015b..02ef627bb 100644 --- a/code/prec.f90 +++ b/code/prec.f90 @@ -141,7 +141,7 @@ subroutine prec_init implicit none integer(pInt) :: worldrank = 0_pInt #ifdef PETSc -#include +#include PetscErrorCode :: ierr #endif external :: & diff --git a/code/spectral_damage.f90 b/code/spectral_damage.f90 index 851571186..6e90e6aaf 100644 --- a/code/spectral_damage.f90 +++ b/code/spectral_damage.f90 @@ -20,7 +20,7 @@ module spectral_damage implicit none private -#include +#include character (len=*), parameter, public :: & spectral_damage_label = 'spectraldamage' diff --git a/code/spectral_thermal.f90 b/code/spectral_thermal.f90 index d9e06c834..59df82baa 100644 --- a/code/spectral_thermal.f90 +++ b/code/spectral_thermal.f90 @@ -20,7 +20,7 @@ module spectral_thermal implicit none private -#include +#include character (len=*), parameter, public :: & spectral_thermal_label = 'spectralthermal'