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

Merge branch '37-include-hdf5-routines' into 'development' 

Resolve "Include HDF5 routines"

Closes #37

See merge request damask/DAMASK!37
This commit is contained in:
Philip Eisenlohr 2018-09-07 19:18:07 +02:00
parent a16454f1f9 51b4ef319a
commit 7e330f1249
3 changed files with 1347 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitlab-ci.yml
View File

@ -52,6 +52,7 @@ variables:
# =============================================================================================== # ===============================================================================================
# ++++++++++++ Compiler ++++++++++++++++++++++++++++++++++++++++++++++ # ++++++++++++ Compiler ++++++++++++++++++++++++++++++++++++++++++++++
IntelCompiler16_0: "Compiler/Intel/16.0 Libraries/IMKL/2016" IntelCompiler16_0: "Compiler/Intel/16.0 Libraries/IMKL/2016"
IntelCompiler16_4: "Compiler/Intel/16.4 Libraries/IMKL/2016-4"
IntelCompiler17_0: "Compiler/Intel/17.0 Libraries/IMKL/2017" IntelCompiler17_0: "Compiler/Intel/17.0 Libraries/IMKL/2017"
IntelCompiler18_1: "Compiler/Intel/18.1 Libraries/IMKL/2018" IntelCompiler18_1: "Compiler/Intel/18.1 Libraries/IMKL/2018"
GNUCompiler7_3: "Compiler/GNU/7.3" GNUCompiler7_3: "Compiler/GNU/7.3"
@ -352,7 +353,7 @@ TextureComponents:
Marc_compileIfort2017: Marc_compileIfort2017:
stage: compileMarc2017 stage: compileMarc2017
script: script:
- module load $IntelCompiler17_0 $MSC2017 - module load $IntelCompiler16_4 $MSC2017
- Marc_compileIfort/test.py -m 2017 - Marc_compileIfort/test.py -m 2017
except: except:
- master - master
@ -362,7 +363,7 @@ Marc_compileIfort2017:
Hex_elastic: Hex_elastic:
stage: marc stage: marc
script: script:
- module load $IntelCompiler17_0 $MSC - module load $IntelCompiler16_4 $MSC
- Hex_elastic/test.py - Hex_elastic/test.py
except: except:
- master - master
@ -371,7 +372,7 @@ Hex_elastic:
CubicFCC_elastic: CubicFCC_elastic:
stage: marc stage: marc
script: script:
- module load $IntelCompiler17_0 $MSC - module load $IntelCompiler16_4 $MSC
- CubicFCC_elastic/test.py - CubicFCC_elastic/test.py
except: except:
- master - master
@ -380,7 +381,7 @@ CubicFCC_elastic:
CubicBCC_elastic: CubicBCC_elastic:
stage: marc stage: marc
script: script:
- module load $IntelCompiler17_0 $MSC - module load $IntelCompiler16_4 $MSC
- CubicBCC_elastic/test.py - CubicBCC_elastic/test.py
except: except:
- master - master
@ -389,7 +390,7 @@ CubicBCC_elastic:
J2_plasticBehavior: J2_plasticBehavior:
stage: marc stage: marc
script: script:
- module load $IntelCompiler17_0 $MSC - module load $IntelCompiler16_4 $MSC
- J2_plasticBehavior/test.py - J2_plasticBehavior/test.py
except: except:
- master - master
@ -399,7 +400,7 @@ J2_plasticBehavior:
Abaqus_compile2017: Abaqus_compile2017:
stage: compileAbaqus2017 stage: compileAbaqus2017
script: script:
- module load $IntelCompiler16_0 $Abaqus2017 - module load $IntelCompiler16_4 $Abaqus2017
- Abaqus_compileIfort/test.py -a 2017 - Abaqus_compileIfort/test.py -a 2017
except: except:
- master - master
@ -415,7 +416,7 @@ SpectralExample:
AbaqusExample: AbaqusExample:
stage: example stage: example
script: script:
- module load $IntelCompiler16_0 $Abaqus - module load $IntelCompiler16_4 $Abaqus
- Abaqus_example/test.py - Abaqus_example/test.py
only: only:
- development - development

6
src/CMakeLists.txt
View File

@ -25,8 +25,12 @@ add_library(IO OBJECT "IO.f90")
add_dependencies(IO DAMASK_INTERFACE) add_dependencies(IO DAMASK_INTERFACE)
list(APPEND OBJECTFILES $<TARGET_OBJECTS:IO>) list(APPEND OBJECTFILES $<TARGET_OBJECTS:IO>)
add_library(HDF5_UTILITIES OBJECT "HDF5_utilities.f90")
add_dependencies(HDF5_UTILITIES IO)
list(APPEND OBJECTFILES $<TARGET_OBJECTS:HDF5_UTILITIES>)
add_library(NUMERICS OBJECT "numerics.f90") add_library(NUMERICS OBJECT "numerics.f90")
add_dependencies(NUMERICS IO) add_dependencies(NUMERICS HDF5_UTILITIES)
list(APPEND OBJECTFILES $<TARGET_OBJECTS:NUMERICS>) list(APPEND OBJECTFILES $<TARGET_OBJECTS:NUMERICS>)
add_library(DEBUG OBJECT "debug.f90") add_library(DEBUG OBJECT "debug.f90")

1334
src/HDF5_utilities.f90 Normal file
View File

File diff suppressed because it is too large Load Diff