From cc6c5247407f5390ce6c8a973c70cbcb781c9b55 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 6 Aug 2013 09:48:57 +0000 Subject: [PATCH] updated test for spectral solver example and example files. changed marc job submission such that the marc version number is no longer expected at the end of the subroutine file --- examples/SpectralMethod/20grains16x16x16.geom | 7 ++++--- examples/SpectralMethod/20grains32x32x32.geom | 7 ++++--- examples/SpectralMethod/20grains64x64x64.geom | 7 ++++--- lib/damask/solver/marc.py | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/examples/SpectralMethod/20grains16x16x16.geom b/examples/SpectralMethod/20grains16x16x16.geom index 1a94c86f4..23fe46f8e 100644 --- a/examples/SpectralMethod/20grains16x16x16.geom +++ b/examples/SpectralMethod/20grains16x16x16.geom @@ -1,7 +1,8 @@ -4 header -resolution a 16 b 16 c 16 -dimension x 1.000000 y 1.000000 z 1.000000 +5 header +grid a 16 b 16 c 16 +size x 1.000000 y 1.000000 z 1.000000 origin x 0.000000 y 0.000000 z 0.000000 +microstructures 20 homogenization 1 2 2 2 4 4 4 4 1 1 15 15 15 15 15 19 19 19 4 4 4 4 4 1 1 1 15 15 15 15 15 15 19 diff --git a/examples/SpectralMethod/20grains32x32x32.geom b/examples/SpectralMethod/20grains32x32x32.geom index 944d73f8c..066d2a82a 100644 --- a/examples/SpectralMethod/20grains32x32x32.geom +++ b/examples/SpectralMethod/20grains32x32x32.geom @@ -1,7 +1,8 @@ -4 header -resolution a 32 b 32 c 32 -dimension x 1.000000 y 1.000000 z 1.000000 +5 header +grid a 32 b 32 c 32 +size x 1.000000 y 1.000000 z 1.000000 origin x 0.000000 y 0.000000 z 0.000000 +microstructures 20 homogenization 1 19 2 2 2 2 2 2 4 4 4 4 4 4 4 4 1 1 15 15 15 15 15 15 15 15 15 15 19 19 19 19 19 19 2 2 2 2 4 4 4 4 4 4 4 4 4 1 1 1 15 15 15 15 15 15 15 15 15 15 15 19 19 19 19 diff --git a/examples/SpectralMethod/20grains64x64x64.geom b/examples/SpectralMethod/20grains64x64x64.geom index 77145acda..c703104d6 100644 --- a/examples/SpectralMethod/20grains64x64x64.geom +++ b/examples/SpectralMethod/20grains64x64x64.geom @@ -1,7 +1,8 @@ -4 header -resolution a 64 b 64 c 64 -dimension x 1.000000 y 1.000000 z 1.000000 +5 header +grid a 64 b 64 c 64 +size x 1.000000 y 1.000000 z 1.000000 origin x 0.000000 y 0.000000 z 0.000000 +microstructures homogenization 1 19 19 2 2 2 2 2 2 2 2 2 2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 1 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 19 19 19 19 19 19 19 19 19 19 19 19 19 19 2 2 2 2 2 2 2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 1 1 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 15 19 19 19 19 19 19 19 19 19 19 diff --git a/lib/damask/solver/marc.py b/lib/damask/solver/marc.py index 428445a8d..d63365a69 100644 --- a/lib/damask/solver/marc.py +++ b/lib/damask/solver/marc.py @@ -86,7 +86,7 @@ class Marc(Solver): damaskEnv = damask.environment.Environment(rootRelation) - user = os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc%s'%release) + user = os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc') # Define options [see Marc Installation and Operation Guide, pp 23] cmd = os.path.join(self.toolsPath(rootRelation,release),'run_marc') + \