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

removed #define Marc and substituted #ifdef Marc by #ifdef Marc4DAMASK which is defined by either the submit scripts or DAMASK_marcXXXX.f90

This commit is contained in:
Martin Diehl 2013-04-30 09:49:30 +00:00
parent e912c74da5
commit 2a5dfbbfa0
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/DAMASK_marc.f90
View File

@ -55,8 +55,6 @@
#define FLOAT 8 #define FLOAT 8
#endif #endif
#define Marc
#include "prec.f90" #include "prec.f90"
module DAMASK_interface module DAMASK_interface

2
code/FEsolving.f90
View File

@ -146,7 +146,7 @@ subroutine FE_init
100 close(fileunit) 100 close(fileunit)
if (restartRead) then if (restartRead) then
#ifdef Marc #ifdef Marc4DAMASK
call IO_open_logFile(fileunit) call IO_open_logFile(fileunit)
rewind(fileunit) rewind(fileunit)
do do

2
code/IO.f90
View File

@ -248,7 +248,7 @@ subroutine IO_open_inputFile(myUnit,model)
if (.not.abaqus_assembleInputFile(myUnit,myUnit+1_pInt)) call IO_error(103_pInt) ! strip comments and concatenate any "include"s if (.not.abaqus_assembleInputFile(myUnit,myUnit+1_pInt)) call IO_error(103_pInt) ! strip comments and concatenate any "include"s
close(myUnit+1_pInt) close(myUnit+1_pInt)
#endif #endif
#ifdef Marc #ifdef Marc4DAMASK
path = trim(getSolverWorkingDirectoryName())//trim(model)//inputFileExtension path = trim(getSolverWorkingDirectoryName())//trim(model)//inputFileExtension
open(myUnit,status='old',iostat=myStat,file=path) open(myUnit,status='old',iostat=myStat,file=path)
if (myStat /= 0_pInt) call IO_error(100_pInt,ext_msg=path) if (myStat /= 0_pInt) call IO_error(100_pInt,ext_msg=path)

16
code/mesh.f90
View File

@ -76,7 +76,7 @@ module mesh
logical, dimension(3), public, protected :: mesh_periodicSurface !< flag indicating periodic outer surfaces (used for fluxes) logical, dimension(3), public, protected :: mesh_periodicSurface !< flag indicating periodic outer surfaces (used for fluxes)
#ifdef Marc #ifdef Marc4DAMASK
integer(pInt), private :: & integer(pInt), private :: &
hypoelasticTableStyle, & !< Table style (Marc only) hypoelasticTableStyle, & !< Table style (Marc only)
initialcondTableStyle !< Table style (Marc only) initialcondTableStyle !< Table style (Marc only)
@ -446,7 +446,7 @@ module mesh
mesh_spectral_build_elements, & mesh_spectral_build_elements, &
mesh_spectral_build_ipNeighborhood, & mesh_spectral_build_ipNeighborhood, &
#endif #endif
#ifdef Marc #ifdef Marc4DAMASK
mesh_marc_get_tableStyles, & mesh_marc_get_tableStyles, &
mesh_marc_count_nodesAndElements, & mesh_marc_count_nodesAndElements, &
mesh_marc_count_elementSets, & mesh_marc_count_elementSets, &
@ -592,7 +592,7 @@ subroutine mesh_init(ip,el)
call mesh_build_ipAreas call mesh_build_ipAreas
call mesh_spectral_build_ipNeighborhood call mesh_spectral_build_ipNeighborhood
#endif #endif
#ifdef Marc #ifdef Marc4DAMASK
call IO_open_inputFile(fileUnit,modelName) ! parse info from input file... call IO_open_inputFile(fileUnit,modelName) ! parse info from input file...
call mesh_marc_get_tableStyles(fileUnit) call mesh_marc_get_tableStyles(fileUnit)
call mesh_marc_count_nodesAndElements(fileUnit) call mesh_marc_count_nodesAndElements(fileUnit)
@ -2456,7 +2456,7 @@ end function mesh_shapeMismatch
#endif #endif
#ifdef Marc #ifdef Marc4DAMASK
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief Figures out table styles (Marc only) and stores to 'initialcondTableStyle' and !> @brief Figures out table styles (Marc only) and stores to 'initialcondTableStyle' and
!! 'hypoelasticTableStyle' !! 'hypoelasticTableStyle'
@ -3063,11 +3063,9 @@ end subroutine mesh_abaqus_count_elementSets
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!********************************************************************
! count overall number of solid sections sets in mesh (Abaqus only) ! count overall number of solid sections sets in mesh (Abaqus only)
! !
! mesh_Nmaterials ! mesh_Nmaterials
!********************************************************************
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine mesh_abaqus_count_materials(myUnit) subroutine mesh_abaqus_count_materials(myUnit)
@ -3109,11 +3107,9 @@ end subroutine mesh_abaqus_count_materials
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!********************************************************************
! Build element set mapping ! Build element set mapping
! !
! allocate globals: mesh_nameElemSet, mesh_mapElemSet ! allocate globals: mesh_nameElemSet, mesh_mapElemSet
!********************************************************************
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine mesh_abaqus_map_elementSets(myUnit) subroutine mesh_abaqus_map_elementSets(myUnit)
@ -3163,11 +3159,9 @@ end subroutine mesh_abaqus_map_elementSets
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!********************************************************************
! map solid section (Abaqus only) ! map solid section (Abaqus only)
! !
! allocate globals: mesh_nameMaterial, mesh_mapMaterial ! allocate globals: mesh_nameMaterial, mesh_mapMaterial
!********************************************************************
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine mesh_abaqus_map_materials(myUnit) subroutine mesh_abaqus_map_materials(myUnit)
@ -3682,7 +3676,7 @@ use IO, only: &
mesh_periodicSurface = .true. mesh_periodicSurface = .true.
#else #else
mesh_periodicSurface = .false. mesh_periodicSurface = .false.
#ifdef Marc #ifdef Marc4DAMASK
keyword = '$damask' keyword = '$damask'
#endif #endif
#ifdef Abaqus #ifdef Abaqus