From e5c2382f73610cda2b7701dbe1a7226c82c69b58 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Sun, 13 Sep 2020 11:17:49 +0200
Subject: [PATCH] missing renames ...

---
 src/mesh/DAMASK_mesh.f90         |  2 +-
 src/mesh/FEM_utilities.f90       | 12 +++++-------
 src/mesh/discretization_mesh.f90 |  8 ++++----
 src/mesh/mesh_mech_FEM.f90       |  4 ++--
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/mesh/DAMASK_mesh.f90 b/src/mesh/DAMASK_mesh.f90
index cacf5f248..86ff63b5d 100644
--- a/src/mesh/DAMASK_mesh.f90
+++ b/src/mesh/DAMASK_mesh.f90
@@ -82,7 +82,7 @@ program DAMASK_mesh
 
 !--------------------------------------------------------------------- 
 ! reading field information from numerics file and do sanity checks
-  num_mesh => numerics_root%get('mesh', defaultVal=emptyDict)
+  num_mesh => config_numerics%get('mesh', defaultVal=emptyDict)
   stagItMax  = num_mesh%get_asInt('maxStaggeredIter',defaultVal=10)
   maxCutBack = num_mesh%get_asInt('maxCutBack',defaultVal=3)
 
diff --git a/src/mesh/FEM_utilities.f90 b/src/mesh/FEM_utilities.f90
index b850c20e9..551a863b6 100644
--- a/src/mesh/FEM_utilities.f90
+++ b/src/mesh/FEM_utilities.f90
@@ -110,15 +110,13 @@ subroutine FEM_utilities_init
 
   PetscErrorCode            :: ierr
 
-  write(6,'(/,a)')   ' <<<+-  DAMASK_FEM_utilities init  -+>>>'
+  write(6,'(/,a)')   ' <<<+-  FEM_utilities init  -+>>>'
  
-  num_mesh => numerics_root%get('mesh',defaultVal=emptyDict)
-  structOrder = num_mesh%get_asInt('structOrder', defaultVal = 2)
+  num_mesh    => config_numerics%get('mesh',defaultVal=emptyDict)
+  structOrder =  num_mesh%get_asInt('structOrder', defaultVal = 2)
 
-!--------------------------------------------------------------------------------------------------
-! set debugging parameters
-  debug_mesh      => debug_root%get('mesh',defaultVal=emptyList)
-  debugPETSc      =  debug_mesh%contains('petsc')
+  debug_mesh  => config_debug%get('mesh',defaultVal=emptyList)
+  debugPETSc  =  debug_mesh%contains('petsc')
 
   if(debugPETSc) write(6,'(3(/,a),/)') &
                  ' Initializing PETSc with debug options: ', &
diff --git a/src/mesh/discretization_mesh.f90 b/src/mesh/discretization_mesh.f90
index 84e0b75e6..54854ce68 100644
--- a/src/mesh/discretization_mesh.f90
+++ b/src/mesh/discretization_mesh.f90
@@ -83,17 +83,17 @@ subroutine discretization_mesh_init(restart)
     num_mesh
   integer :: integrationOrder                                                                       !< order of quadrature rule required
 
-  write(6,'(/,a)')   ' <<<+-  mesh init  -+>>>'
+  write(6,'(/,a)')   ' <<<+-  discretization_mesh init  -+>>>'
 
 !--------------------------------------------------------------------------------
 ! read numerics parameter
-  num_mesh => numerics_root%get('mesh',defaultVal=emptyDict)
+  num_mesh => config_numerics%get('mesh',defaultVal=emptyDict)
   integrationOrder = num_mesh%get_asInt('integrationorder',defaultVal = 2)
 
 !---------------------------------------------------------------------------------
 ! read debug parameters
-  debug_element = debug_root%get_asInt('element',defaultVal=1)
-  debug_ip      = debug_root%get_asInt('integrationpoint',defaultVal=1)
+  debug_element = config_debug%get_asInt('element',defaultVal=1)
+  debug_ip      = config_debug%get_asInt('integrationpoint',defaultVal=1)
 
 
   call DMPlexCreateFromFile(PETSC_COMM_WORLD,interface_geomFile,PETSC_TRUE,globalMesh,ierr)
diff --git a/src/mesh/mesh_mech_FEM.f90 b/src/mesh/mesh_mech_FEM.f90
index 4d843b7a0..546897c5b 100644
--- a/src/mesh/mesh_mech_FEM.f90
+++ b/src/mesh/mesh_mech_FEM.f90
@@ -114,7 +114,7 @@ subroutine FEM_mech_init(fieldBC)
 
 !-----------------------------------------------------------------------------
 ! read numerical parametes and do sanity checks
-  num_mesh => numerics_root%get('mesh',defaultVal=emptyDict)
+  num_mesh => config_numerics%get('mesh',defaultVal=emptyDict)
   num%integrationOrder  = num_mesh%get_asInt('integrationorder',defaultVal = 2)
   num%itmax             = num_mesh%get_asInt('itmax',defaultVal=250)
   num%BBarStabilisation = num_mesh%get_asBool('bbarstabilisation',defaultVal = .false.)
@@ -574,7 +574,7 @@ subroutine FEM_mech_formJacobian(dm_local,xx_local,Jac_pre,Jac,dummy,ierr)
     else
       K_e = K_eA
     endif
-    K_e = (K_e + eps*math_identity2nd(cellDof)) * abs(detJ)
+    K_e = (K_e + eps*math_eye(cellDof)) * abs(detJ)
 #ifndef __INTEL_COMPILER
     pK_e(1:cellDOF**2) => K_e
 #else