Merge branch 'MiscImprovements' of magit1.mpie.de:/damask/DAMASK into MiscImprovements
This commit is contained in:
commit
47fe5b9c15
|
@ -69,12 +69,10 @@ variables:
|
|||
PETSc_MPICH_Intel: "$PETSc3_10_3IMPI2018Intel18_4"
|
||||
PETSc_MPICH_GNU: "$PETSc3_10_3MPICH3_3GNU8_2"
|
||||
# ++++++++++++ commercial FEM ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
Abaqus2019: "FEM/Abaqus/2019"
|
||||
MSC2018_1: "FEM/MSC/2018.1"
|
||||
MSC2018: "FEM/MSC/2018"
|
||||
MSC2019: "FEM/MSC/2019"
|
||||
# ------------ Defaults ----------------------------------------------
|
||||
Abaqus: "$Abaqus2019"
|
||||
MSC: "$MSC2019"
|
||||
MSC: "$MSC2018"
|
||||
IntelMarc: "$IntelCompiler17_8"
|
||||
IntelAbaqus: "$IntelCompiler16_4"
|
||||
HDF5Marc: "HDF5/1.10.4/Intel-17.8"
|
||||
|
@ -391,7 +389,6 @@ Phenopowerlaw_singleSlip:
|
|||
- master
|
||||
- release
|
||||
|
||||
|
||||
###################################################################################################
|
||||
Marc_compileIfort:
|
||||
stage: compileMarc
|
||||
|
@ -403,12 +400,12 @@ Marc_compileIfort:
|
|||
- master
|
||||
- release
|
||||
|
||||
|
||||
###################################################################################################
|
||||
Hex_elastic:
|
||||
stage: marc
|
||||
script:
|
||||
- module load $IntelMarc $HDF5Marc $MSC
|
||||
- export DAMASK_HDF5=ON
|
||||
- Hex_elastic/test.py
|
||||
except:
|
||||
- master
|
||||
|
@ -418,6 +415,7 @@ CubicFCC_elastic:
|
|||
stage: marc
|
||||
script:
|
||||
- module load $IntelMarc $HDF5Marc $MSC
|
||||
- export DAMASK_HDF5=ON
|
||||
- CubicFCC_elastic/test.py
|
||||
except:
|
||||
- master
|
||||
|
@ -427,6 +425,7 @@ CubicBCC_elastic:
|
|||
stage: marc
|
||||
script:
|
||||
- module load $IntelMarc $HDF5Marc $MSC
|
||||
- export DAMASK_HDF5=ON
|
||||
- CubicBCC_elastic/test.py
|
||||
except:
|
||||
- master
|
||||
|
@ -436,6 +435,7 @@ J2_plasticBehavior:
|
|||
stage: marc
|
||||
script:
|
||||
- module load $IntelMarc $HDF5Marc $MSC
|
||||
- export DAMASK_HDF5=ON
|
||||
- J2_plasticBehavior/test.py
|
||||
except:
|
||||
- master
|
||||
|
|
2
CONFIG
2
CONFIG
|
@ -4,7 +4,7 @@
|
|||
set DAMASK_NUM_THREADS = 4
|
||||
|
||||
set MSC_ROOT = /opt/msc
|
||||
set MARC_VERSION = 2019
|
||||
set MARC_VERSION = 2018
|
||||
|
||||
set ABAQUS_VERSION = 2019
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ The Intel Fortran compiler needs to be installed.
|
|||
|
||||
1) Install Marc, Mentat and Documentation as usual
|
||||
Run the test example including subroutines to confirm that the installation of both Marc/Mentat and the Intel Fortran Compiler is ok!
|
||||
2) Run the apply_DAMASK_modifications script from this directory.
|
||||
2) Run the apply_DAMASK_modifications.sh script from this directory.
|
||||
|
||||
|
||||
APPENDIX:
|
||||
|
@ -19,7 +19,7 @@ APPENDIX:
|
|||
The structure of this directory should be (VERSION = 20XX or 20XX.Y)
|
||||
|
||||
./installation.txt this text
|
||||
./apply_MPIE_modifications script file to apply modifications to the installation
|
||||
./apply_DAMASK_modifications.sh script file to apply modifications to the installation
|
||||
./VERSION/Marc_tools/comp_user.original original file from installation
|
||||
./VERSION/Marc_tools/comp_damask_mp modified version using -O1 optimization and OpenMP
|
||||
./VERSION/Marc_tools/comp_damask_lmp modified version using -O0 optimization and OpenMP
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
DAMASK_marc.f90
|
Loading…
Reference in New Issue