Merge branch 'fix-Intel2021' into 'development'

circumvent bug in Intel compiler 2021.2

See merge request damask/DAMASK!388

installation/mods_MarcMentat/2020/Marc_tools/include_linux64

@@ -503,7 +503,7 @@ then
 PROFILE=" $PROFILE -pg"
 fi
 
-FORT_OPT="-c -implicitnone -stand f08 -standard-semantics -assume nostd_mod_proc_name  -safe_cray_ptr -mp1 -WB -fp-model source"
+FORT_OPT="-c -implicitnone -stand f18 -standard-semantics -assume nostd_mod_proc_name  -safe_cray_ptr -mp1 -WB -fp-model source"
 if test "$MTHREAD" = "OPENMP"
 then
   FORT_OPT=" $FORT_OPT -qopenmp"
@@ -541,15 +541,15 @@ fi
 
 
 # DAMASK compiler calls: additional flags are in line 2 OpenMP flags in line 3
-DFORTLOWMP="$FCOMP -c -O0 -qno-offload -implicitnone -stand f08 -standard-semantics -assume nostd_mod_proc_name -safe_cray_ptr $PROFILE -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
+DFORTLOWMP="$FCOMP -c -O0 -qno-offload -implicitnone -stand f18 -standard-semantics -assume nostd_mod_proc_name -safe_cray_ptr $PROFILE -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
  -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2020 -DDAMASKVERSION=$DAMASKVERSION \
  -qopenmp -qopenmp-threadprivate=compat\
   $MUMPS_INCLUDE $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS -I$KDTREE2_MOD"
-DFORTRANMP="$FCOMP -c -O1 -qno-offload -implicitnone -stand f08 -standard-semantics -assume nostd_mod_proc_name -safe_cray_ptr $PROFILE -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
+DFORTRANMP="$FCOMP -c -O1 -qno-offload -implicitnone -stand f18 -standard-semantics -assume nostd_mod_proc_name -safe_cray_ptr $PROFILE -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
  -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2020 -DDAMASKVERSION=$DAMASKVERSION \
  -qopenmp -qopenmp-threadprivate=compat\
   $MUMPS_INCLUDE $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS -I$KDTREE2_MOD"
-DFORTHIGHMP="$FCOMP -c -O3 -qno-offload -implicitnone -stand f08 -standard-semantics -assume nostd_mod_proc_name -safe_cray_ptr $PROFILE -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
+DFORTHIGHMP="$FCOMP -c -O3 -qno-offload -implicitnone -stand f18 -standard-semantics -assume nostd_mod_proc_name -safe_cray_ptr $PROFILE -zero -mp1 -WB $I8FFLAGS -I$MARC_SOURCE/common \
  -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2020 -DDAMASKVERSION=$DAMASKVERSION \
  -qopenmp -qopenmp-threadprivate=compat\
   $MUMPS_INCLUDE $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS -I$KDTREE2_MOD"

src/phase_mechanical_plastic_nonlocal.f90

@@ -1767,22 +1767,22 @@ end subroutine kinetics
 !> @brief returns copy of current dislocation densities from state
 !> @details raw values is rectified
 !--------------------------------------------------------------------------------------------------
-pure function getRho(ph,en)
+pure function getRho(ph,en) result(rho)
 
   integer, intent(in) :: ph, en
-  real(pReal), dimension(param(ph)%sum_N_sl,10) :: getRho
+  real(pReal), dimension(param(ph)%sum_N_sl,10) :: rho
 
 
   associate(prm => param(ph))
 
-    getRho = reshape(state(ph)%rho(:,en),[prm%sum_N_sl,10])
+    rho = reshape(state(ph)%rho(:,en),[prm%sum_N_sl,10])
 
     ! ensure positive densities (not for imm, they have a sign)
-    getRho(:,mob) = max(getRho(:,mob),0.0_pReal)
+    rho(:,mob) = max(rho(:,mob),0.0_pReal)
-    getRho(:,dip) = max(getRho(:,dip),0.0_pReal)
+    rho(:,dip) = max(rho(:,dip),0.0_pReal)
 
-    where(abs(getRho) < max(prm%rho_min/geom(ph)%V_0(en)**(2.0_pReal/3.0_pReal),prm%rho_significant)) &
+    where(abs(rho) < max(prm%rho_min/geom(ph)%V_0(en)**(2.0_pReal/3.0_pReal),prm%rho_significant)) &
-      getRho = 0.0_pReal
+      rho = 0.0_pReal
 
   end associate
 
@@ -1793,22 +1793,22 @@ end function getRho
 !> @brief returns copy of current dislocation densities from state
 !> @details raw values is rectified
 !--------------------------------------------------------------------------------------------------
-pure function getRho0(ph,en)
+pure function getRho0(ph,en) result(rho0)
 
   integer, intent(in) :: ph, en
-  real(pReal), dimension(param(ph)%sum_N_sl,10) :: getRho0
+  real(pReal), dimension(param(ph)%sum_N_sl,10) :: rho0
 
 
   associate(prm => param(ph))
 
-    getRho0 = reshape(state0(ph)%rho(:,en),[prm%sum_N_sl,10])
+    rho0 = reshape(state0(ph)%rho(:,en),[prm%sum_N_sl,10])
 
     ! ensure positive densities (not for imm, they have a sign)
-    getRho0(:,mob) = max(getRho0(:,mob),0.0_pReal)
+    rho0(:,mob) = max(rho0(:,mob),0.0_pReal)
-    getRho0(:,dip) = max(getRho0(:,dip),0.0_pReal)
+    rho0(:,dip) = max(rho0(:,dip),0.0_pReal)
 
-    where (abs(getRho0) < max(prm%rho_min/geom(ph)%V_0(en)**(2.0_pReal/3.0_pReal),prm%rho_significant)) &
+    where (abs(rho0) < max(prm%rho_min/geom(ph)%V_0(en)**(2.0_pReal/3.0_pReal),prm%rho_significant)) &
-      getRho0 = 0.0_pReal
+      rho0 = 0.0_pReal
 
   end associate