From c93373a4ac1ae4605b572f0916f69a585aeedc73 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 8 Aug 2013 19:33:21 +0000 Subject: [PATCH] removed long lines --- code/constitutive_dislotwin.f90 | 4 ++-- code/constitutive_nonlocal.f90 | 16 ++++++++-------- code/crystallite.f90 | 4 ++-- code/debug.f90 | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/code/constitutive_dislotwin.f90 b/code/constitutive_dislotwin.f90 index 54a5875c7..171d0c0d6 100644 --- a/code/constitutive_dislotwin.f90 +++ b/code/constitutive_dislotwin.f90 @@ -300,11 +300,11 @@ allocate(constitutive_dislotwin_sbSv(6,6,homogenization_maxNgrains,mesh_maxNips, !* Readout data from material.config file rewind(file) - do while (trim(line) /= '#EOF#' .and. IO_lc(IO_getTag(line,'<','>')) /= 'phase') ! wind forward to + do while (trim(line) /= '#EOF#' .and. IO_lc(IO_getTag(line,'<','>')) /= 'phase') ! wind forward to line = IO_read(file) enddo - do while (trim(line) /= '#EOF#') ! read thru sections of phase part + do while (trim(line) /= '#EOF#') ! read thru sections of phase part line = IO_read(file) if (IO_isBlank(line)) cycle ! skip empty lines if (IO_getTag(line,'<','>') /= '') exit ! stop at next part diff --git a/code/constitutive_nonlocal.f90 b/code/constitutive_nonlocal.f90 index eaf54ea31..32e3e3275 100644 --- a/code/constitutive_nonlocal.f90 +++ b/code/constitutive_nonlocal.f90 @@ -421,23 +421,23 @@ nonSchmidCoeff = 0.0_pReal !*** readout data from material.config file rewind(myFile) -do while (trim(line) /= '#EOF#' .and. IO_lc(IO_getTag(line,'<','>')) /= 'phase') ! wind forward to +do while (trim(line) /= '#EOF#' .and. IO_lc(IO_getTag(line,'<','>')) /= 'phase') ! wind forward to line = IO_read(myFile) enddo -do while (trim(line) /= '#EOF#') ! read thru sections of phase part +do while (trim(line) /= '#EOF#') ! read thru sections of phase part line = IO_read(myFile) - if (IO_isBlank(line)) cycle ! skip empty lines - if (IO_getTag(line,'<','>') /= '') exit ! stop at next part - if (IO_getTag(line,'[',']') /= '') then ! next section - section = section + 1_pInt ! advance section counter + if (IO_isBlank(line)) cycle ! skip empty lines + if (IO_getTag(line,'<','>') /= '') exit ! stop at next part + if (IO_getTag(line,'[',']') /= '') then ! next section + section = section + 1_pInt ! advance section counter cycle endif if (section > 0_pInt ) then ! do not short-circuit here (.and. with next if statemen). It's not safe in Fortran if (phase_plasticity(section) == CONSTITUTIVE_NONLOCAL_LABEL) then ! one of my sections - i = phase_plasticityInstance(section) ! which instance of my plasticity is present phase + i = phase_plasticityInstance(section) ! which instance of my plasticity is present phase positions = IO_stringPos(line,maxNchunks) - tag = IO_lc(IO_stringValue(line,positions,1_pInt)) ! extract key + tag = IO_lc(IO_stringValue(line,positions,1_pInt)) ! extract key select case(tag) case('plasticity','elasticity','/nonlocal/') cycle diff --git a/code/crystallite.f90 b/code/crystallite.f90 index b36c93139..daa3d0556 100644 --- a/code/crystallite.f90 +++ b/code/crystallite.f90 @@ -272,11 +272,11 @@ subroutine crystallite_init(Temperature) line = '' section = 0_pInt - do while (trim(line) /= '#EOF#' .and. IO_lc(IO_getTag(line,'<','>')) /= material_partCrystallite) ! wind forward to + do while (trim(line) /= '#EOF#' .and. IO_lc(IO_getTag(line,'<','>')) /= material_partCrystallite) ! wind forward to line = IO_read(myFile) enddo - do while (trim(line) /= '#EOF#') ! read thru sections of phase part + do while (trim(line) /= '#EOF#') ! read thru sections of phase part line = IO_read(myFile) if (IO_isBlank(line)) cycle ! skip empty lines if (IO_getTag(line,'<','>') /= '') exit ! stop at next part diff --git a/code/debug.f90 b/code/debug.f90 index 5e1b49114..d77673d42 100644 --- a/code/debug.f90 +++ b/code/debug.f90 @@ -179,7 +179,7 @@ subroutine debug_init fileExists: if(IO_open_file_stat(fileunit,debug_configFile)) then - do while (trim(line) /= '#EOF#') ! read thru sections of phase part + do while (trim(line) /= '#EOF#') ! read thru sections of phase part line = IO_read(fileunit) if (IO_isBlank(line)) cycle ! skip empty lines positions = IO_stringPos(line,maxNchunks)