From a7b6093edc619f85db477b47aa761580441d8469 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 11 Jun 2013 07:28:08 +0000 Subject: [PATCH] fixed bug in include_linux64 for Marc 2012, tests should run again after updating the copy in /msc/.... polished two other versions of this file unified output format for /echo/ in material.f90 --- code/material.f90 | 15 ++++++++------- .../2010/Marc_tools/include_linux64 | 6 +++--- .../2011/Marc_tools/include_linux64 | 6 +++--- .../2012/Marc_tools/include_linux64 | 4 ++-- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/code/material.f90 b/code/material.f90 index dfb9c0178..eb1970430 100644 --- a/code/material.f90 +++ b/code/material.f90 @@ -284,7 +284,7 @@ subroutine material_parseHomogenization(myFile,myPart) do while (IO_lc(IO_getTag(line,'<','>')) /= myPart) ! wind forward to myPart read(myFile,'(a1024)',END=100) line enddo - if (echo) write(6,'(a)') trim(line) ! echo part header + if (echo) write(6,'(/,a)') trim(line) ! echo part header do read(myFile,'(a1024)',END=100) line @@ -370,7 +370,7 @@ subroutine material_parseMicrostructure(myFile,myPart) do while (IO_lc(IO_getTag(line,'<','>')) /= myPart) ! wind forward to myPart read(myFile,'(a1024)',END=100) line enddo - if (echo) write(6,*) trim(line) ! echo part header + if (echo) write(6,'(/,a)') trim(line) ! echo part header do read(myFile,'(a1024)',END=100) line @@ -448,7 +448,7 @@ subroutine material_parseCrystallite(myFile,myPart) do while (IO_lc(IO_getTag(line,'<','>')) /= myPart) ! wind forward to myPart read(myFile,'(a1024)',END=100) line enddo - if (echo) write(6,*) trim(line) ! echo part header + if (echo) write(6,'(/,a)') trim(line) ! echo part header do read(myFile,'(a1024)',END=100) line @@ -522,7 +522,7 @@ subroutine material_parsePhase(myFile,myPart) read(myFile,'(a1024)',END=100) line 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)') trim(line) ! echo back read lines if (IO_getTag(line,'[',']') /= '') then ! next section section = section + 1_pInt phase_name(section) = IO_getTag(line,'[',']') @@ -617,7 +617,7 @@ subroutine material_parseTexture(myFile,myPart) do while (IO_lc(IO_getTag(line,'<','>')) /= myPart) ! wind forward to myPart read(myFile,'(a1024)',END=100) line enddo - if (echo) write(6,'(a)') trim(line) ! echo part header + if (echo) write(6,'(/,a)') trim(line) ! echo part header do read(myFile,'(a1024)',END=100) line @@ -1009,8 +1009,9 @@ subroutine material_populateGrains enddo texture -!-------------------------------------------------------------------------------------------------- -!>@ToDo calc fraction after weighing with volumePerGrain, exchange in MC steps to improve result (humbug at the moment) +!< @todo calc fraction after weighing with volumePerGrain, exchange in MC steps to improve result (humbug at the moment) + + !-------------------------------------------------------------------------------------------------- ! distribute grains of all constituents as accurately as possible to given constituent fractions diff --git a/installation/mods_MarcMentat/2010/Marc_tools/include_linux64 b/installation/mods_MarcMentat/2010/Marc_tools/include_linux64 index ab217c10c..e43923d13 100644 --- a/installation/mods_MarcMentat/2010/Marc_tools/include_linux64 +++ b/installation/mods_MarcMentat/2010/Marc_tools/include_linux64 @@ -386,17 +386,17 @@ then FORTLOW="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \ - -openmp -openmp_report2 $I8FFLAGS \ + -openmp -openmp_report2 \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp -WB -w90 $I8FFLAGS -I$MARC_SOURCE/common \ - -openmp -openmp_report2 $I8FFLAGS \ + -openmp -openmp_report2 \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp -WB -w90 -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp -WB -w90 -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \ - -openmp -openmp_report2 $I8FFLAGS \ + -openmp -openmp_report2 \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTNA="$FCOMP -c -assume byterecl -safe_cray_ptr -save -fpp -zero -mp -WB -w90 -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2010 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM" diff --git a/installation/mods_MarcMentat/2011/Marc_tools/include_linux64 b/installation/mods_MarcMentat/2011/Marc_tools/include_linux64 index ded4faf70..b3798ef1b 100644 --- a/installation/mods_MarcMentat/2011/Marc_tools/include_linux64 +++ b/installation/mods_MarcMentat/2011/Marc_tools/include_linux64 @@ -419,12 +419,12 @@ then -openmp -openmp_report2 \ -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2011 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTHIGH="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp1 -WB -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \ - -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DMarc4DAMASK=2011 -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" + -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2011 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp1 -WB -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \ -openmp -openmp_report2 \ - -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DMarc4DAMASK=2011 -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" + -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2011 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTNA="$FCOMP -c -assume byterecl -safe_cray_ptr -save -fpp -zero -mp1 -WB -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \ - -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DLinux -DMarc4DAMASK=2011 -DLINUX -DLinux_intel $FDEFINES $DDM" + -I$MARC_SOURCE/bcssolver/common -I$MARC_SOURCE/mumpssolver/include $I8FFLAGS -DMarc4DAMASK=2011 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM" fi FORTLOWT="$FORTLOW" diff --git a/installation/mods_MarcMentat/2012/Marc_tools/include_linux64 b/installation/mods_MarcMentat/2012/Marc_tools/include_linux64 index 08fe5e6c0..e920a8cc4 100644 --- a/installation/mods_MarcMentat/2012/Marc_tools/include_linux64 +++ b/installation/mods_MarcMentat/2012/Marc_tools/include_linux64 @@ -388,7 +388,7 @@ FORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp1 -W -openmp -openmp_report2 \ -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTRAN="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -save -fpp -zero -mp1 -WB -O1 $I8FFLAGS -I$MARC_SOURCE/common \ - -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" + -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp1 -WB -O1 $I8FFLAGS -I$MARC_SOURCE/common \ -openmp -openmp_report2 \ -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" @@ -398,7 +398,7 @@ FORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -fpp -zero -mp1 - -openmp -openmp_report2 \ -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS" FORTNA="$FCOMP -c -assume byterecl -safe_cray_ptr -save -fpp -zero -mp1 -WB -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \ - -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM" + -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DMarc4DAMASK=2012 -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM" if test "$MARCDEBUG" = "ON" then