From 77b2eef2698c5189d7d61376e226bcdfdd31c653 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Sep 2012 12:20:00 +0000 Subject: [PATCH] corrected wrong compiler option for gfortran in setup and updated naming scheme --- ...al_ang2geom.py => spectral_geomFromAng.py} | 0 ....py => spectral_geomFromMinimalSurface.py} | 0 ...> spectral_geomFromVoronoiTessellation.py} | 0 ...fset.py => spectral_geomVicinityOffset.py} | 0 processing/setup/setup_processing.py | 28 +++++++++---------- 5 files changed, 14 insertions(+), 14 deletions(-) rename processing/pre/{spectral_ang2geom.py => spectral_geomFromAng.py} (100%) rename processing/pre/{spectral_minimalSurface.py => spectral_geomFromMinimalSurface.py} (100%) rename processing/pre/{spectral_voronoiTessellation.py => spectral_geomFromVoronoiTessellation.py} (100%) rename processing/pre/{spectral_vicinityOffset.py => spectral_geomVicinityOffset.py} (100%) diff --git a/processing/pre/spectral_ang2geom.py b/processing/pre/spectral_geomFromAng.py similarity index 100% rename from processing/pre/spectral_ang2geom.py rename to processing/pre/spectral_geomFromAng.py diff --git a/processing/pre/spectral_minimalSurface.py b/processing/pre/spectral_geomFromMinimalSurface.py similarity index 100% rename from processing/pre/spectral_minimalSurface.py rename to processing/pre/spectral_geomFromMinimalSurface.py diff --git a/processing/pre/spectral_voronoiTessellation.py b/processing/pre/spectral_geomFromVoronoiTessellation.py similarity index 100% rename from processing/pre/spectral_voronoiTessellation.py rename to processing/pre/spectral_geomFromVoronoiTessellation.py diff --git a/processing/pre/spectral_vicinityOffset.py b/processing/pre/spectral_geomVicinityOffset.py similarity index 100% rename from processing/pre/spectral_vicinityOffset.py rename to processing/pre/spectral_geomVicinityOffset.py diff --git a/processing/setup/setup_processing.py b/processing/setup/setup_processing.py index c52b0bb14..7c668dade 100755 --- a/processing/setup/setup_processing.py +++ b/processing/setup/setup_processing.py @@ -49,8 +49,8 @@ if options.compiler not in compilers: parser.error('compiler switch "--F90" has to be one out of: %s'%(', '.join(compilers))) f2py_compiler = { - 'gfortran': 'gnu95 --f90flags="-fno-range-check -xf95-cpp-input -std=f2008 -fall-intrinsics -DSpectral -fdefault-real-8 -fdefault-integer-4 -DFLOAT=8 -DINT=4 -I${DAMASK_ROOT}/lib"', - 'gnu95': 'gnu95 --f90flags="-fno-range-check -xf95-cpp-input -std=f2008 -fall-intrinsics -DSpectral -fdefault-real-8 -fdefault-integer-4 -DFLOAT=8 -DINT=4 -I${DAMASK_ROOT}/lib"', + 'gfortran': 'gnu95 --f90flags="-fno-range-check -xf95-cpp-input -std=f2008 -fall-intrinsics -DSpectral -fdefault-real-8 -fdefault-double-8 -DFLOAT=8 -DINT=4 -I${DAMASK_ROOT}/lib"', + 'gnu95': 'gnu95 --f90flags="-fno-range-check -xf95-cpp-input -std=f2008 -fall-intrinsics -DSpectral -fdefault-real-8 -fdefault-double-8 -DFLOAT=8 -DINT=4 -I${DAMASK_ROOT}/lib"', 'intel32': 'intel --f90flags="-fpp -stand f03 -diag-disable 5268 -assume byterecl -DSpectral -real-size 64 -integer-size 32 -DFLOAT=8 -DINT=4 -I${DAMASK_ROOT}/lib"', 'intel': 'intelem --f90flags="-fpp -stand f03 -diag-disable 5268 -assume byterecl -DSpectral -real-size 64 -integer-size 32 -DFLOAT=8 -DINT=4 -I${DAMASK_ROOT}/lib"', 'ifort': 'intelem --f90flags="-fpp -stand f03 -diag-disable 5268 -assume byterecl -DSpectral -real-size 64 -integer-size 32 -DFLOAT=8 -DINT=4 -I${DAMASK_ROOT}/lib"', @@ -80,19 +80,19 @@ bin_link = { \ 'marc_addUserOutput.py', 'mentat_pbcOnBoxMesh.py', 'mentat_spectralBox.py', - 'patchFromReconstructedBoundaries.py', - 'spectral_geomCheck.py', - 'spectral_geomMultiply.py', - 'spectral_geomCanvas.py', - 'spectral_minimalSurface.py', - 'spectral_vicinityOffset.py', - 'spectral_ang2geom.py', - 'spectral_randomSeeding.py', - 'spectral_geomPack.py', - 'spectral_geomUnpack.py', - 'spectral_geomTranslate.py', - 'spectral_voronoiTessellation.py', 'OIMang_hex2cub.py', + 'patchFromReconstructedBoundaries.py', + 'spectral_geomCanvas.py', + 'spectral_geomCheck.py', + 'spectral_geomFromAng.py', + 'spectral_geomFromMinimalSurface.py', + 'spectral_geomFromVoronoiTessellation.py', + 'spectral_geomMultiply.py', + 'spectral_geomPack.py', + 'spectral_geomTranslate.py', + 'spectral_geomUnpack.py', + 'spectral_geomVicinityOffset.py', + 'spectral_randomSeeding.py', ], 'post' : [ '3Dvisualize.py',