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

clearer logic for preprocessor statements

This commit is contained in:
Martin Diehl 2019-02-16 10:43:02 +01:00
parent af83427e8c
commit efe9823e62
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/IO.f90
View File

@ -45,20 +45,19 @@ module IO
IO_timeStamp IO_timeStamp
#if defined(Marc4DAMASK) || defined(Abaqus) #if defined(Marc4DAMASK) || defined(Abaqus)
public :: & public :: &
#ifdef Abaqus
IO_extractValue, &
IO_countDataLines, &
#endif
#ifdef Marc4DAMASK
IO_skipChunks, &
IO_fixedNoEFloatValue, &
IO_fixedIntValue, &
IO_countNumericalDataLines, &
#endif
IO_open_inputFile, & IO_open_inputFile, &
IO_open_logFile, & IO_open_logFile, &
IO_countContinuousIntValues, & IO_countContinuousIntValues, &
IO_continuousIntValues IO_continuousIntValues, &
#if defined(Abaqus)
IO_extractValue, &
IO_countDataLines
#elif defined(Marc4DAMASK)
IO_skipChunks, &
IO_fixedNoEFloatValue, &
IO_fixedIntValue, &
IO_countNumericalDataLines
#endif
#endif #endif
private :: & private :: &
IO_verifyFloatValue, & IO_verifyFloatValue, &
@ -356,7 +355,7 @@ subroutine IO_open_inputFile(fileUnit,modelName)
integer(pInt) :: myStat integer(pInt) :: myStat
character(len=1024) :: path character(len=1024) :: path
#ifdef Abaqus #if defined(Abaqus)
integer(pInt) :: fileType integer(pInt) :: fileType
fileType = 1_pInt ! assume .pes fileType = 1_pInt ! assume .pes
@ -427,8 +426,7 @@ recursive function abaqus_assembleInputFile(unit1,unit2) result(createSuccess)
200 createSuccess =.false. 200 createSuccess =.false.
end function abaqus_assembleInputFile end function abaqus_assembleInputFile
#endif #elif defined(Marc4DAMASK)
#ifdef Marc4DAMASK
path = trim(modelName)//inputFileExtension path = trim(modelName)//inputFileExtension
open(fileUnit,status='old',iostat=myStat,file=path) open(fileUnit,status='old',iostat=myStat,file=path)
if (myStat /= 0_pInt) call IO_error(100_pInt,el=myStat,ext_msg=path) if (myStat /= 0_pInt) call IO_error(100_pInt,el=myStat,ext_msg=path)