From 091b72c3ff21f78c814b73c84383257724db73c2 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 13 Jul 2016 16:25:27 +0200 Subject: [PATCH] commenting --- code/Makefile | 2 +- code/material.f90 | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/Makefile b/code/Makefile index a0f419ce0..7e5a130b1 100644 --- a/code/Makefile +++ b/code/Makefile @@ -7,7 +7,7 @@ SHELL = /bin/sh # OPTIONS = standard (alternative): meaning #------------------------------------------------------------- # F90 = ifort (gfortran): compiler type, choose Intel or GNU -# FCOMPILERNAME = name of the compiler executable (if not the same as the ype), e.g. using mpich-g90 instead of ifort +# FCOMPILERNAME = name of the compiler executable (if not the same as the type), e.g. using mpich-g90 instead of ifort # PORTABLE = TRUE (FALSE): decision, if executable is optimized for the machine on which it was built. # OPTIMIZATION = DEFENSIVE (OFF,AGGRESSIVE,ULTRA): Optimization mode: O2, O0, O3 + further options for most files, O3 + further options for all files # OPENMP = TRUE (FALSE): OpenMP multiprocessor support diff --git a/code/material.f90 b/code/material.f90 index 37d5741dd..e1a48bc1c 100644 --- a/code/material.f90 +++ b/code/material.f90 @@ -499,12 +499,12 @@ subroutine material_init() allocate(HomogenizationPosition(material_Nhomogenization),source=0_pInt) allocate(CrystallitePosition (material_Nphase), source=0_pInt) - ElemLoop:do e = 1_pInt,mesh_NcpElems ! loop over elements + ElemLoop:do e = 1_pInt,mesh_NcpElems myHomog = mesh_element(3,e) - IPloop:do i = 1_pInt,FE_Nips(FE_geomtype(mesh_element(2,e))) ! loop over IPs + IPloop:do i = 1_pInt,FE_Nips(FE_geomtype(mesh_element(2,e))) HomogenizationPosition(myHomog) = HomogenizationPosition(myHomog) + 1_pInt mappingHomogenization(1:2,i,e) = [HomogenizationPosition(myHomog),myHomog] - GrainLoop:do g = 1_pInt,homogenization_Ngrains(mesh_element(3,e)) ! loop over grains + GrainLoop:do g = 1_pInt,homogenization_Ngrains(mesh_element(3,e)) phase = material_phase(g,i,e) ConstitutivePosition(phase) = ConstitutivePosition(phase)+1_pInt ! not distinguishing between instances of same phase phaseAt(g,i,e) = phase @@ -1344,10 +1344,10 @@ subroutine material_populateGrains write(6,'(a32,1x,a32,1x,a6)') 'homogenization_name','microstructure_name','grain#' !$OMP END CRITICAL (write2out) endif - do homog = 1_pInt,material_Nhomogenization ! loop over homogenizations + homogenizationLoop: do homog = 1_pInt,material_Nhomogenization dGrains = homogenization_Ngrains(homog) ! grain number per material point - do micro = 1_pInt,material_Nmicrostructure ! all pairs of homog and micro - if (Ngrains(homog,micro) > 0_pInt) then ! an active pair of homog and micro + microstructureLoop: do micro = 1_pInt,material_Nmicrostructure ! all pairs of homog and micro + activePair: if (Ngrains(homog,micro) > 0_pInt) then myNgrains = Ngrains(homog,micro) ! assign short name for total number of grains to populate myNconstituents = microstructure_Nconstituents(micro) ! assign short name for number of constituents if (iand(myDebug,debug_levelBasic) /= 0_pInt) then @@ -1578,9 +1578,9 @@ subroutine material_populateGrains enddo enddo - endif ! active homog,micro pair - enddo - enddo + endif activePair + enddo microstructureLoop + enddo homogenizationLoop deallocate(volumeOfGrain) deallocate(phaseOfGrain)