adjusting names

examples/config/debug.yaml

@@ -1,13 +1,12 @@
-material:       [basic, extensive]                  # material.f90,        possible values: basic, extensive
+phase: [basic, extensive, selective]
-constitutive:   [basic, extensive, selective]       # constitutive_*.f90   possible values: basic, extensive, selective
+CPFEM: [basic, extensive, selective]
-cpfem:          [basic, extensive, selective]       # CPFEM.f90            possible values: 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]

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

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')

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)
+  debug_constitutive => config_debug%get('phase', defaultVal=emptyList)
-  debugConstitutive%basic      =  debug_constitutive%contains('basic')
+  debugConstitutive%basic     = debug_constitutive%contains('basic')
-  debugConstitutive%extensive  =  debug_constitutive%contains('extensive')
+  debugConstitutive%extensive = debug_constitutive%contains('extensive')
-  debugConstitutive%selective  =  debug_constitutive%contains('selective')
+  debugConstitutive%selective = debug_constitutive%contains('selective')
-  debugConstitutive%element    =  config_debug%get_asInt('element',defaultVal = 1)
+  debugConstitutive%element   = config_debug%get_asInt('element',         defaultVal = 1)
-  debugConstitutive%ip         =  config_debug%get_asInt('integrationpoint',defaultVal = 1)
+  debugConstitutive%ip        = config_debug%get_asInt('integrationpoint',defaultVal = 1)
-  debugConstitutive%grain      =  config_debug%get_asInt('grain',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