From 3ffd6499b1aa0384a65b67424b09f64d0a482754 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 28 Jan 2013 15:30:51 +0000 Subject: [PATCH] change bash-only "let" to "`expr`", abaqus_v6.env now suppresses warnings about long lines (there are only comments anyway) --- code/DAMASK_spectral_utilities.f90 | 2 +- code/crystallite.f90 | 7 +++---- installation/mods_Abaqus/abaqus_v6.env | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/DAMASK_spectral_utilities.f90 b/code/DAMASK_spectral_utilities.f90 index f34026d21..aa66b59b7 100644 --- a/code/DAMASK_spectral_utilities.f90 +++ b/code/DAMASK_spectral_utilities.f90 @@ -230,7 +230,7 @@ subroutine utilities_init() if(j > res(2)/2_pInt + 1_pInt) k_s(2) = k_s(2) - res(2) ! running from 0,1,...,N/2,N/2+1,-N/2,-N/2+1,...,-1 do i = 1_pInt, res1_red k_s(1) = i - 1_pInt ! symmetry, junst running from 0,1,...,N/2,N/2+1 - xi(1:3,i,j,k) = real(k_s, pReal)/scaledDim ! if divergence_correction is set, frequencies are calculated on unit length + xi(1:3,i,j,k) = real(k_s, pReal)/scaledDim ! if divergence_correction is set, frequencies are calculated on unit length enddo; enddo; enddo if(memory_efficient) then ! allocate just single fourth order tensor diff --git a/code/crystallite.f90 b/code/crystallite.f90 index 0598a27f7..a7aff5254 100644 --- a/code/crystallite.f90 +++ b/code/crystallite.f90 @@ -1121,7 +1121,7 @@ if(updateJaco) then ! --- STIFFNESS ACCORDING TO PERTURBATION METHOD AND CONVERGENCE --- - do e = FEsolving_execElem(1),FEsolving_execElem(2) + elementLooping: do e = FEsolving_execElem(1),FEsolving_execElem(2) myNgrains = homogenization_Ngrains(mesh_element(3,e)) select case(pert_method) case(1_pInt) @@ -1139,10 +1139,9 @@ if(updateJaco) then + dPdF_perturbation2(1:3,1:3,1:3,1:3,g,i,e)) end select forall (i = FEsolving_execIP(1,e):FEsolving_execIP(2,e), g = 1:myNgrains, & - crystallite_requested(g,i,e) .and. .not. convergenceFlag_backup(g,i,e)) ! for any pertubation mode: if central solution did not converge... + crystallite_requested(g,i,e) .and. .not. convergenceFlag_backup(g,i,e)) & ! for any pertubation mode: if central solution did not converge... crystallite_dPdF(1:3,1:3,1:3,1:3,g,i,e) = crystallite_fallbackdPdF(1:3,1:3,1:3,1:3,g,i,e) ! ...use (elastic) fallback - endforall - enddo + enddo elementLooping ! --- RESTORE --- diff --git a/installation/mods_Abaqus/abaqus_v6.env b/installation/mods_Abaqus/abaqus_v6.env index 2c05cc753..acc76e93c 100644 --- a/installation/mods_Abaqus/abaqus_v6.env +++ b/installation/mods_Abaqus/abaqus_v6.env @@ -24,6 +24,7 @@ fortCmd = "ifort" # -WB turn a compile-time bounts check into a warning (previous version of abaqus_v6.env only) # -mP2OPT_hpo_vec_divbyzero=F inofficial compiler switch, proposed by abaqus but highly dubios (previous version of abaqus_v6.env only) # -ftz flush underflow to zero +# -diag-disable 5268 disable warnings about line length > 132 (only comments there anyway) # -implicitnone assume no implicit types (e.g. i for integer) # -assume byterecl count record length in bytes # -real-size 64 -DFLOAT=8 assume size of real to be 8 bytes, matches our definition of pReal @@ -31,7 +32,7 @@ fortCmd = "ifort" compile_fortran = (fortCmd + " -c -fPIC -auto " + "-I%I -free -O1 -fpp -openmp " + - "-ftz " + + "-ftz -diag-disable 5268 " + "-implicitnone -assume byterecl " + "-real-size 64 -integer-size 32 -DFLOAT=8 -DINT=4")