From 5f20c86905484ac4810f322a32e195f212dba56c Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 28 Jun 2013 18:59:21 +0000 Subject: [PATCH] small documentation and output fixes --- code/DAMASK_spectral_utilities.f90 | 4 ++-- code/libs.f90 | 5 +++-- code/material.f90 | 10 +++++----- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/code/DAMASK_spectral_utilities.f90 b/code/DAMASK_spectral_utilities.f90 index 9358ad944..f949c835e 100644 --- a/code/DAMASK_spectral_utilities.f90 +++ b/code/DAMASK_spectral_utilities.f90 @@ -360,7 +360,7 @@ end subroutine utilities_updateGamma !-------------------------------------------------------------------------------------------------- !> @brief forward FFT of data in field_real to field_fourier with highest freqs. removed -!> @detailed Does an unweighted FFT transform from real to complex. +!> @details Does an unweighted FFT transform from real to complex. !> In case of debugging the FFT, also one component of the tensor (specified by row and column) !> is independetly transformed complex to complex and compared to the whole tensor transform !-------------------------------------------------------------------------------------------------- @@ -423,7 +423,7 @@ end subroutine utilities_FFTforward !-------------------------------------------------------------------------------------------------- !> @brief backward FFT of data in field_fourier to field_real -!> @detailed Does an inverse FFT transform from complex to real +!> @details Does an inverse FFT transform from complex to real !> In case of debugging the FFT, also one component of the tensor (specified by row and column) !> is independetly transformed complex to complex and compared to the whole tensor transform !> results is weighted by number of points stored in wgt diff --git a/code/libs.f90 b/code/libs.f90 index 17c79d8d1..72ae1f71e 100644 --- a/code/libs.f90 +++ b/code/libs.f90 @@ -22,6 +22,9 @@ !> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH !> @brief dummy source for inclusion of Library files !-------------------------------------------------------------------------------------------------- +module libs +!nothing in here +end module libs #ifdef Spectral #include "../lib/kdtree2.f90" @@ -29,5 +32,3 @@ #include "../lib/IR_Precision.f90" #include "../lib/Lib_VTK_IO.f90" -module libs -end module libs diff --git a/code/material.f90 b/code/material.f90 index 4519ec5ff..1fb88b995 100644 --- a/code/material.f90 +++ b/code/material.f90 @@ -291,7 +291,7 @@ subroutine material_parseHomogenization(myFile,myPart) line = IO_read(myFile) if (IO_isBlank(line)) cycle ! skip empty lines if (IO_getTag(line,'<','>') /= '') exit ! stop at next part - if (echo) write(6,*) trim(line) ! echo back read lines + if (echo) write(6,'(a)',advance='no') trim(line) ! echo back read lines if (IO_getTag(line,'[',']') /= '') then ! next section section = section + 1_pInt homogenization_name(section) = IO_getTag(line,'[',']') @@ -377,7 +377,7 @@ subroutine material_parseMicrostructure(myFile,myPart) line = IO_read(myFile) if (IO_isBlank(line)) cycle ! skip empty lines if (IO_getTag(line,'<','>') /= '') exit ! stop at next part - if (echo) write(6,*) trim(line) ! echo back read lines + if (echo) write(6,'(a)',advance='no') trim(line) ! echo back read lines if (IO_getTag(line,'[',']') /= '') then ! next section section = section + 1_pInt constituent = 0_pInt @@ -456,7 +456,7 @@ subroutine material_parseCrystallite(myFile,myPart) line = IO_read(myFile) if (IO_isBlank(line)) cycle ! skip empty lines if (IO_getTag(line,'<','>') /= '') exit ! stop at next part - if (echo) write(6,*) trim(line) ! echo back read lines + if (echo) write(6,'(a)',advance='no') trim(line) ! echo back read lines if (IO_getTag(line,'[',']') /= '') then ! next section section = section + 1_pInt crystallite_name(section) = IO_getTag(line,'[',']') @@ -525,7 +525,7 @@ subroutine material_parsePhase(myFile,myPart) line = IO_read(myFile) if (IO_isBlank(line)) cycle ! skip empty lines if (IO_getTag(line,'<','>') /= '') exit ! stop at next part - if (echo) write(6,'(/,a)') trim(line) ! echo back read lines + if (echo) write(6,'(a)',advance='no') trim(line) ! echo back read lines if (IO_getTag(line,'[',']') /= '') then ! next section section = section + 1_pInt phase_name(section) = IO_getTag(line,'[',']') @@ -627,7 +627,7 @@ subroutine material_parseTexture(myFile,myPart) line = IO_read(myFile) if (IO_isBlank(line)) cycle ! skip empty lines if (IO_getTag(line,'<','>') /= '') exit ! stop at next part - if (echo) write(6,'(a)') trim(line) ! echo back read lines + if (echo) write(6,'(a)',advance='no') trim(line) ! echo back read lines if (IO_getTag(line,'[',']') /= '') then ! next section section = section + 1_pInt gauss = 0_pInt