From adebbcf5dfee76420af7c07c4895dbfbe3440016 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 5 Apr 2019 20:14:01 +0200 Subject: [PATCH] preprocessor statements confuse cmake --- .gitlab-ci.yml | 2 -- PRIVATE | 2 +- src/plastic_isotropic.f90 | 7 ++++--- src/plastic_kinematichardening.f90 | 7 ++++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45fb4e4f4..1e1b8fe49 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -444,8 +444,6 @@ J2_plasticBehavior: grid_all_example: stage: example script: grid_all_example/test.py - only: - - development ################################################################################################### SpectralRuntime: diff --git a/PRIVATE b/PRIVATE index c7bc54a26..1d1dc5c20 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit c7bc54a26c8b6ed404aabec4653227e93fa028e2 +Subproject commit 1d1dc5c200e4723f501c3cb7a09ce74f5d6fe6b2 diff --git a/src/plastic_isotropic.f90 b/src/plastic_isotropic.f90 index 05a31ab75..d7b071baa 100644 --- a/src/plastic_isotropic.f90 +++ b/src/plastic_isotropic.f90 @@ -92,9 +92,6 @@ subroutine plastic_isotropic_init use IO, only: & IO_error use material, only: & -#ifdef DEBUG - phasememberAt, & -#endif phase_plasticity, & phase_plasticityInstance, & phase_Noutput, & @@ -103,6 +100,10 @@ subroutine plastic_isotropic_init PLASTICITY_ISOTROPIC_ID, & material_phase, & plasticState +#ifdef DEBUG + use material, only: & + phasememberAt +#endif use config, only: & config_phase use lattice diff --git a/src/plastic_kinematichardening.f90 b/src/plastic_kinematichardening.f90 index 0a4a6b3bc..ed21b09f7 100644 --- a/src/plastic_kinematichardening.f90 +++ b/src/plastic_kinematichardening.f90 @@ -113,9 +113,6 @@ subroutine plastic_kinehardening_init use IO, only: & IO_error use material, only: & -#ifdef DEBUG - phasememberAt, & -#endif phase_plasticity, & phase_plasticityInstance, & phase_Noutput, & @@ -124,6 +121,10 @@ subroutine plastic_kinehardening_init PLASTICITY_kinehardening_ID, & material_phase, & plasticState +#ifdef DEBUG + use material, only: & + phasememberAt +#endif use config, only: & config_phase use lattice