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

more renames: spectral -> grid

This commit is contained in:
Martin Diehl 2019-03-26 09:27:55 +01:00
parent ef10ac59d6
commit c09669f27a
3 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
.gitlab-ci.yml
View File

@ -4,8 +4,8 @@ stages:
- preprocessing - preprocessing
- postprocessing - postprocessing
- compilePETSc - compilePETSc
- prepareSpectral - prepareGrid
- spectral - grid
- compileMarc - compileMarc
- marc - marc
- compileAbaqus - compileAbaqus
@ -172,7 +172,7 @@ Post_General:
Post_GeometryReconstruction: Post_GeometryReconstruction:
stage: postprocessing stage: postprocessing
script: Spectral_geometryReconstruction/test.py script: spectral_geometryReconstruction/test.py
except: except:
- master - master
- release - release
@ -257,104 +257,104 @@ Compile_FEM_GNU:
################################################################################################### ###################################################################################################
Compile_Intel_Prepare: Compile_Intel_Prepare:
stage: prepareSpectral stage: prepareGrid
script: script:
- module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel
- cd $DAMASKROOT - cd $DAMASKROOT
- make clean spectral processing - make clean grid processing
except: except:
- master - master
- release - release
################################################################################################### ###################################################################################################
Thermal: Thermal:
stage: spectral stage: grid
script: Thermal/test.py script: Thermal/test.py
except: except:
- master - master
- release - release
Spectral_PackedGeometry: grid_packedGeometry:
stage: spectral stage: grid
script: Spectral_PackedGeometry/test.py script: grid_packedGeometry/test.py
except: except:
- master - master
- release - release
grid_parsingArguments: grid_parsingArguments:
stage: spectral stage: grid
script: grid_parsingArguments/test.py script: grid_parsingArguments/test.py
except: except:
- master - master
- release - release
StateIntegration_compareVariants: StateIntegration_compareVariants:
stage: spectral stage: grid
script: StateIntegration_compareVariants/test.py script: StateIntegration_compareVariants/test.py
except: except:
- master - master
- release - release
nonlocal_densityConservation: nonlocal_densityConservation:
stage: spectral stage: grid
script: nonlocal_densityConservation/test.py script: nonlocal_densityConservation/test.py
except: except:
- master - master
- release - release
Spectral_ipNeighborhood: Spectral_ipNeighborhood:
stage: spectral stage: grid
script: Spectral_ipNeighborhood/test.py script: Spectral_ipNeighborhood/test.py
except: except:
- master - master
- release - release
RGC_DetectChanges: RGC_DetectChanges:
stage: spectral stage: grid
script: RGC_DetectChanges/test.py script: RGC_DetectChanges/test.py
except: except:
- master - master
- release - release
Nonlocal_Damage_DetectChanges: Nonlocal_Damage_DetectChanges:
stage: spectral stage: grid
script: Nonlocal_Damage_DetectChanges/test.py script: Nonlocal_Damage_DetectChanges/test.py
except: except:
- master - master
- release - release
grid_all_restart: grid_all_restart:
stage: spectral stage: grid
script: grid_all_restart/test.py script: grid_all_restart/test.py
except: except:
- master - master
- release - release
SpectralAll_parsingLoadCase: grid_parsingLoadCase:
stage: spectral stage: grid
script: SpectralAll_parsingLoadCase/test.py script: grid_parsingLoadCase/test.py
except: except:
- master - master
- release - release
grid_all_loadCaseRotation: grid_all_loadCaseRotation:
stage: spectral stage: grid
script: grid_all_loadCaseRotation/test.py script: grid_all_loadCaseRotation/test.py
except: except:
- master - master
- release - release
Spectral_MPI: grid_mech_MPI:
stage: spectral stage: grid
script: script:
- module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel
- Spectral_MPI/test.py - grid_mech_MPI/test.py
except: except:
- master - master
- release - release
grid_all_restartMPI: grid_all_restartMPI:
stage: spectral stage: grid
script: script:
- module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel
- grid_all_restartMPI/test.py - grid_all_restartMPI/test.py
@ -363,28 +363,28 @@ grid_all_restartMPI:
- release - release
Plasticity_DetectChanges: Plasticity_DetectChanges:
stage: spectral stage: grid
script: Plasticity_DetectChanges/test.py script: Plasticity_DetectChanges/test.py
except: except:
- master - master
- release - release
Homogenization: Homogenization:
stage: spectral stage: grid
script: Homogenization/test.py script: Homogenization/test.py
except: except:
- master - master
- release - release
Phenopowerlaw_singleSlip: Phenopowerlaw_singleSlip:
stage: spectral stage: grid
script: Phenopowerlaw_singleSlip/test.py script: Phenopowerlaw_singleSlip/test.py
except: except:
- master - master
- release - release
TextureComponents: TextureComponents:
stage: spectral stage: grid
script: TextureComponents/test.py script: TextureComponents/test.py
except: except:
- master - master
@ -463,7 +463,7 @@ SpectralRuntime:
script: script:
- module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel
- cd $DAMASKROOT - cd $DAMASKROOT
- make clean spectral processing OPTIMIZATION=AGGRESSIVE - make clean grid processing OPTIMIZATION=AGGRESSIVE
- cd $TESTROOT/performance # location of old results - cd $TESTROOT/performance # location of old results
- git checkout . # undo any changes (i.e. run time data from non-development branch) - git checkout . # undo any changes (i.e. run time data from non-development branch)
- cd $DAMASKROOT/PRIVATE/testing - cd $DAMASKROOT/PRIVATE/testing
@ -501,7 +501,7 @@ Marc:
- master - master
- release - release
Spectral: GridSolver:
stage: createDocumentation stage: createDocumentation
script: script:
- module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel $Doxygen - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel $Doxygen

6
Makefile
View File

@ -3,7 +3,11 @@ SHELL = /bin/sh
# Makefile for the installation of DAMASK # Makefile for the installation of DAMASK
######################################################################################## ########################################################################################
.PHONY: all .PHONY: all
all: spectral FEM processing all: grid FEM processing
.PHONY: grid
grid: build/grid
@(cd build/grid;make -j4 --no-print-directory -ws all install;)
.PHONY: spectral .PHONY: spectral
spectral: build/grid spectral: build/grid

2
PRIVATE

@ -1 +1 @@
Subproject commit 104dfef06c4e7f5047d8956dbe0e706779cb3f97 Subproject commit ca6f50d447d9c713a109ec7e14e707d12e8526e9