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

updated petsc

This commit is contained in:
Pratheek Shanthraj 2015-03-18 17:18:43 +00:00
parent 8b04854c23
commit c5a8543f17
9 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_interface.f90
View File

@ -17,7 +17,7 @@ module DAMASK_interface
implicit none implicit none
private private
#ifdef PETSc #ifdef PETSc
#include <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

@ -17,7 +17,7 @@ module DAMASK_spectral_solverAL
implicit none implicit none
private private
#include <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

@ -17,7 +17,7 @@ module DAMASK_spectral_SolverBasicPETSc
implicit none implicit none
private private
#include <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

@ -17,7 +17,7 @@ module DAMASK_spectral_solverPolarisation
implicit none implicit none
private private
#include <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

@ -15,7 +15,7 @@ module DAMASK_spectral_utilities
implicit none implicit none
private private
#ifdef PETSc #ifdef PETSc
#include <finclude/petscsys.h> #include <petsc-finclude/petscsys.h>
#endif #endif
logical, public :: cutBack =.false. !< cut back of BVP solver in case convergence is not achieved or a material point is terminally ill 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 integer(pInt), public, parameter :: maxPhaseFields = 2_pInt

2
code/IO.f90
View File

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

10
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)/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)
@ -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) #-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 =$(OPENMP_FLAG_$(F90)) $(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_MAXOPTI =$(OPENMP_FLAG_$(F90)) $(COMPILE_OPTIONS_$(F90)) $(STANDARD_CHECK_$(F90)) $(OPTIMIZATION_$(MAXOPTI)_$(F90)) $(INCLUDE_DIRS) $(PRECISION_$(F90))
################################################################################################### ###################################################################################################
DAMAGE_FILES = \ DAMAGE_FILES = \
damage_none.o damage_isoBrittle.o damage_isoDuctile.o damage_gurson.o damage_anisoBrittle.o damage_anisoDuctile.o damage_phaseField.o 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 # Spectral Solver
##################### #####################
DAMASK_spectral.exe: IGNORE := \# DAMASK_spectral.exe: IGNORE := \#
DAMASK_spectral.exe: COMPILE += $(OPENMP_FLAG_$(F90)) -DSpectral DAMASK_spectral.exe: COMPILE += -DSpectral
DAMASK_spectral.exe: COMPILE_MAXOPTI += $(OPENMP_FLAG_$(F90)) -DSpectral DAMASK_spectral.exe: COMPILE_MAXOPTI += -DSpectral
DAMASK_spectral.exe: MESHNAME := mesh.f90 DAMASK_spectral.exe: MESHNAME := mesh.f90
DAMASK_spectral.exe: INTERFACENAME := DAMASK_spectral_interface.f90 DAMASK_spectral.exe: INTERFACENAME := DAMASK_spectral_interface.f90

2
code/numerics.f90
View File

@ -13,7 +13,7 @@ module numerics
implicit none implicit none
private private
#ifdef PETSc #ifdef PETSc
#include <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

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