From 3b6c97edb00624b4a1b6b86733be5ae580e04177 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 26 Mar 2021 17:37:38 +0100 Subject: [PATCH] adjusting names --- examples/config/debug.yaml | 11 +++++------ examples/config/numerics.yaml | 2 -- src/CPFEM.f90 | 2 +- src/phase.f90 | 16 ++++++++-------- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/examples/config/debug.yaml b/examples/config/debug.yaml index 94de168f4..900873b25 100644 --- a/examples/config/debug.yaml +++ b/examples/config/debug.yaml @@ -1,13 +1,12 @@ -material: [basic, extensive] # material.f90, possible values: basic, extensive -constitutive: [basic, extensive, selective] # constitutive_*.f90 possible values: basic, extensive, selective -cpfem: [basic, extensive, selective] # CPFEM.f90 possible values: basic, extensive, selective +phase: [basic, extensive, selective] +CPFEM: [basic, extensive, selective] # options for selective debugging -element: 1 +element: 1 integrationpoint: 1 -grain: 1 +constituent: 1 # solver-specific -mesh: [basic] +mesh: [PETSc] grid: [basic, rotation, PETSc] Marc: [basic] diff --git a/examples/config/numerics.yaml b/examples/config/numerics.yaml index e25c86f5a..68a74e13c 100644 --- a/examples/config/numerics.yaml +++ b/examples/config/numerics.yaml @@ -42,12 +42,10 @@ grid: fftw_plan_mode: FFTW_PATIENT # reads the planing-rigor flag, see manual on www.fftw.org, Default FFTW_PATIENT: use patient planner flag maxCutBack: 3 # maximum cut back level (0: 1, 1: 0.5, 2: 0.25, etc) maxStaggeredIter: 10 # max number of field level staggered iterations - memory_efficient: 1 # Precalculate Gamma-operator (81 double per point) update_gamma: false # Update Gamma-operator with current dPdF (not possible if memory_efficient=1) divergence_correction: 2 # Use size-independent divergence criterion derivative: continuous # Approximation used for derivatives in Fourier space - solver: Basic # Type of spectral solver (BasicPETSc/Polarisation/FEM) petsc_options: -snes_type ngmres -snes_ngmres_anderson # PetSc solver options alpha: 1.0 # polarization scheme parameter 0.0 < alpha < 2.0. alpha = 1.0 ==> AL scheme, alpha = 2.0 ==> accelerated scheme beta: 1.0 # polarization scheme parameter 0.0 < beta < 2.0. beta = 1.0 ==> AL scheme, beta = 2.0 ==> accelerated scheme diff --git a/src/CPFEM.f90 b/src/CPFEM.f90 index 01b4c034d..4961b99d4 100644 --- a/src/CPFEM.f90 +++ b/src/CPFEM.f90 @@ -111,7 +111,7 @@ subroutine CPFEM_init !------------------------------------------------------------------------------ ! read debug options - debug_CPFEM => config_debug%get('cpfem',defaultVal=emptyList) + debug_CPFEM => config_debug%get('CPFEM',defaultVal=emptyList) debugCPFEM%basic = debug_CPFEM%contains('basic') debugCPFEM%extensive = debug_CPFEM%contains('extensive') debugCPFEM%selective = debug_CPFEM%contains('selective') diff --git a/src/phase.f90 b/src/phase.f90 index 5a9eaa518..9470ab8af 100644 --- a/src/phase.f90 +++ b/src/phase.f90 @@ -346,17 +346,17 @@ subroutine phase_init print'(/,a)', ' <<<+- phase init -+>>>'; flush(IO_STDOUT) - debug_constitutive => config_debug%get('constitutive', defaultVal=emptyList) - debugConstitutive%basic = debug_constitutive%contains('basic') - debugConstitutive%extensive = debug_constitutive%contains('extensive') - debugConstitutive%selective = debug_constitutive%contains('selective') - debugConstitutive%element = config_debug%get_asInt('element',defaultVal = 1) - debugConstitutive%ip = config_debug%get_asInt('integrationpoint',defaultVal = 1) - debugConstitutive%grain = config_debug%get_asInt('grain',defaultVal = 1) + debug_constitutive => config_debug%get('phase', defaultVal=emptyList) + debugConstitutive%basic = debug_constitutive%contains('basic') + debugConstitutive%extensive = debug_constitutive%contains('extensive') + debugConstitutive%selective = debug_constitutive%contains('selective') + debugConstitutive%element = config_debug%get_asInt('element', defaultVal = 1) + debugConstitutive%ip = config_debug%get_asInt('integrationpoint',defaultVal = 1) + debugConstitutive%grain = config_debug%get_asInt('constituent', defaultVal = 1) materials => config_material%get('material') - phases => config_material%get('phase') + phases => config_material%get('phase') call mechanical_init(materials,phases) call damage_init