preprocessor statements confuse cmake
This commit is contained in:
parent
598e8034b4
commit
adebbcf5df
|
@ -444,8 +444,6 @@ J2_plasticBehavior:
|
||||||
grid_all_example:
|
grid_all_example:
|
||||||
stage: example
|
stage: example
|
||||||
script: grid_all_example/test.py
|
script: grid_all_example/test.py
|
||||||
only:
|
|
||||||
- development
|
|
||||||
|
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
SpectralRuntime:
|
SpectralRuntime:
|
||||||
|
|
2
PRIVATE
2
PRIVATE
|
@ -1 +1 @@
|
||||||
Subproject commit c7bc54a26c8b6ed404aabec4653227e93fa028e2
|
Subproject commit 1d1dc5c200e4723f501c3cb7a09ce74f5d6fe6b2
|
|
@ -92,9 +92,6 @@ subroutine plastic_isotropic_init
|
||||||
use IO, only: &
|
use IO, only: &
|
||||||
IO_error
|
IO_error
|
||||||
use material, only: &
|
use material, only: &
|
||||||
#ifdef DEBUG
|
|
||||||
phasememberAt, &
|
|
||||||
#endif
|
|
||||||
phase_plasticity, &
|
phase_plasticity, &
|
||||||
phase_plasticityInstance, &
|
phase_plasticityInstance, &
|
||||||
phase_Noutput, &
|
phase_Noutput, &
|
||||||
|
@ -103,6 +100,10 @@ subroutine plastic_isotropic_init
|
||||||
PLASTICITY_ISOTROPIC_ID, &
|
PLASTICITY_ISOTROPIC_ID, &
|
||||||
material_phase, &
|
material_phase, &
|
||||||
plasticState
|
plasticState
|
||||||
|
#ifdef DEBUG
|
||||||
|
use material, only: &
|
||||||
|
phasememberAt
|
||||||
|
#endif
|
||||||
use config, only: &
|
use config, only: &
|
||||||
config_phase
|
config_phase
|
||||||
use lattice
|
use lattice
|
||||||
|
|
|
@ -113,9 +113,6 @@ subroutine plastic_kinehardening_init
|
||||||
use IO, only: &
|
use IO, only: &
|
||||||
IO_error
|
IO_error
|
||||||
use material, only: &
|
use material, only: &
|
||||||
#ifdef DEBUG
|
|
||||||
phasememberAt, &
|
|
||||||
#endif
|
|
||||||
phase_plasticity, &
|
phase_plasticity, &
|
||||||
phase_plasticityInstance, &
|
phase_plasticityInstance, &
|
||||||
phase_Noutput, &
|
phase_Noutput, &
|
||||||
|
@ -124,6 +121,10 @@ subroutine plastic_kinehardening_init
|
||||||
PLASTICITY_kinehardening_ID, &
|
PLASTICITY_kinehardening_ID, &
|
||||||
material_phase, &
|
material_phase, &
|
||||||
plasticState
|
plasticState
|
||||||
|
#ifdef DEBUG
|
||||||
|
use material, only: &
|
||||||
|
phasememberAt
|
||||||
|
#endif
|
||||||
use config, only: &
|
use config, only: &
|
||||||
config_phase
|
config_phase
|
||||||
use lattice
|
use lattice
|
||||||
|
|
Loading…
Reference in New Issue