223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

petsc update (now v3.6.1)

This commit is contained in:
Pratheek Shanthraj 2015-08-04 15:04:53 +00:00
parent 5b57ea7d16
commit 905b9f8f42
13 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/DAMASK_spectral_driver.f90
View File

@ -84,7 +84,7 @@ program DAMASK_spectral_Driver
implicit none implicit none
#include <petsc-finclude/petscsys.h> #include <petsc/finclude/petscsys.h>
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! variables related to information from load case and geom file ! variables related to information from load case and geom file

2
code/DAMASK_spectral_interface.f90
View File

@ -17,7 +17,7 @@ module DAMASK_interface
implicit none implicit none
private private
#ifdef PETSc #ifdef PETSc
#include <petsc-finclude/petscsys.h> #include <petsc/finclude/petscsys.h>
#endif #endif
logical, public, protected :: appendToOutFile = .false. !< Append to existing spectralOut file (in case of restart, not in case of regridding) 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 integer(pInt), public, protected :: spectralRestartInc = 1_pInt !< Increment at which calculation starts

2
code/DAMASK_spectral_solverAL.f90
View File

@ -18,7 +18,7 @@ module DAMASK_spectral_solverAL
implicit none implicit none
private private
#include <petsc-finclude/petsc.h90> #include <petsc/finclude/petsc.h90>
character (len=*), parameter, public :: & character (len=*), parameter, public :: &
DAMASK_spectral_solverAL_label = 'al' DAMASK_spectral_solverAL_label = 'al'

2
code/DAMASK_spectral_solverBasicPETSc.f90
View File

@ -18,7 +18,7 @@ module DAMASK_spectral_SolverBasicPETSc
implicit none implicit none
private private
#include <petsc-finclude/petsc.h90> #include <petsc/finclude/petsc.h90>
character (len=*), parameter, public :: & character (len=*), parameter, public :: &
DAMASK_spectral_SolverBasicPETSC_label = 'basicpetsc' DAMASK_spectral_SolverBasicPETSC_label = 'basicpetsc'

2
code/DAMASK_spectral_solverPolarisation.f90
View File

@ -18,7 +18,7 @@ module DAMASK_spectral_solverPolarisation
implicit none implicit none
private private
#include <petsc-finclude/petsc.h90> #include <petsc/finclude/petsc.h90>
character (len=*), parameter, public :: & character (len=*), parameter, public :: &
DAMASK_spectral_solverPolarisation_label = 'polarisation' DAMASK_spectral_solverPolarisation_label = 'polarisation'

2
code/DAMASK_spectral_utilities.f90
View File

@ -17,7 +17,7 @@ module DAMASK_spectral_utilities
implicit none implicit none
private private
#ifdef PETSc #ifdef PETSc
#include <petsc-finclude/petscsys.h> #include <petsc/finclude/petscsys.h>
#endif #endif
include 'fftw3-mpi.f03' include 'fftw3-mpi.f03'

2
code/IO.f90
View File

@ -102,7 +102,7 @@ subroutine IO_init
implicit none implicit none
integer(pInt) :: worldrank = 0_pInt integer(pInt) :: worldrank = 0_pInt
#ifdef PETSc #ifdef PETSc
#include <petsc-finclude/petscsys.h> #include <petsc/finclude/petscsys.h>
PetscErrorCode :: ierr PetscErrorCode :: ierr
#endif #endif
external :: & external :: &

2
code/Makefile
View File

@ -17,7 +17,7 @@ SHELL = /bin/sh
# STANDARD_CHECK = checking for Fortran 2008, compiler dependend # 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 INCLUDE_DIRS := $(PETSC_FC_INCLUDES) -DPETSc -I../lib
LIBRARIES := $(PETSC_WITH_EXTERNAL_LIB) LIBRARIES := $(PETSC_WITH_EXTERNAL_LIB)
COMPILERNAME ?= $(FC) COMPILERNAME ?= $(FC)

2
code/mesh.f90
View File

@ -117,7 +117,7 @@ module mesh
#ifdef Spectral #ifdef Spectral
#ifdef PETSc #ifdef PETSc
#include <petsc-finclude/petscsys.h> #include <petsc/finclude/petscsys.h>
include 'fftw3-mpi.f03' include 'fftw3-mpi.f03'
#else #else
include 'fftw3.f03' include 'fftw3.f03'

2
code/numerics.f90
View File

@ -13,7 +13,7 @@ module numerics
implicit none implicit none
private private
#ifdef PETSc #ifdef PETSc
#include <petsc-finclude/petsc.h90> #include <petsc/finclude/petsc.h90>
#endif #endif
character(len=64), parameter, private :: & character(len=64), parameter, private :: &
numerics_CONFIGFILE = 'numerics.config' !< name of configuration file numerics_CONFIGFILE = 'numerics.config' !< name of configuration file

2
code/prec.f90
View File

@ -141,7 +141,7 @@ subroutine prec_init
implicit none implicit none
integer(pInt) :: worldrank = 0_pInt integer(pInt) :: worldrank = 0_pInt
#ifdef PETSc #ifdef PETSc
#include <petsc-finclude/petscsys.h> #include <petsc/finclude/petscsys.h>
PetscErrorCode :: ierr PetscErrorCode :: ierr
#endif #endif
external :: & external :: &

2
code/spectral_damage.f90
View File

@ -20,7 +20,7 @@ module spectral_damage
implicit none implicit none
private private
#include <petsc-finclude/petsc.h90> #include <petsc/finclude/petsc.h90>
character (len=*), parameter, public :: & character (len=*), parameter, public :: &
spectral_damage_label = 'spectraldamage' spectral_damage_label = 'spectraldamage'

2
code/spectral_thermal.f90
View File

@ -20,7 +20,7 @@ module spectral_thermal
implicit none implicit none
private private
#include <petsc-finclude/petsc.h90> #include <petsc/finclude/petsc.h90>
character (len=*), parameter, public :: & character (len=*), parameter, public :: &
spectral_thermal_label = 'spectralthermal' spectral_thermal_label = 'spectralthermal'