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
This commit is contained in:
parent
ebabf207cf
commit
cc6c524740
|
@ -1,7 +1,8 @@
|
||||||
4 header
|
5 header
|
||||||
resolution a 16 b 16 c 16
|
grid a 16 b 16 c 16
|
||||||
dimension x 1.000000 y 1.000000 z 1.000000
|
size x 1.000000 y 1.000000 z 1.000000
|
||||||
origin x 0.000000 y 0.000000 z 0.000000
|
origin x 0.000000 y 0.000000 z 0.000000
|
||||||
|
microstructures 20
|
||||||
homogenization 1
|
homogenization 1
|
||||||
2 2 2 4 4 4 4 1 1 15 15 15 15 15 19 19
|
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
|
19 4 4 4 4 4 1 1 1 15 15 15 15 15 15 19
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
4 header
|
5 header
|
||||||
resolution a 32 b 32 c 32
|
grid a 32 b 32 c 32
|
||||||
dimension x 1.000000 y 1.000000 z 1.000000
|
size x 1.000000 y 1.000000 z 1.000000
|
||||||
origin x 0.000000 y 0.000000 z 0.000000
|
origin x 0.000000 y 0.000000 z 0.000000
|
||||||
|
microstructures 20
|
||||||
homogenization 1
|
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 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
|
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
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
4 header
|
5 header
|
||||||
resolution a 64 b 64 c 64
|
grid a 64 b 64 c 64
|
||||||
dimension x 1.000000 y 1.000000 z 1.000000
|
size x 1.000000 y 1.000000 z 1.000000
|
||||||
origin x 0.000000 y 0.000000 z 0.000000
|
origin x 0.000000 y 0.000000 z 0.000000
|
||||||
|
microstructures
|
||||||
homogenization 1
|
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 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
|
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
|
||||||
|
|
|
@ -86,7 +86,7 @@ class Marc(Solver):
|
||||||
|
|
||||||
damaskEnv = damask.environment.Environment(rootRelation)
|
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]
|
# Define options [see Marc Installation and Operation Guide, pp 23]
|
||||||
cmd = os.path.join(self.toolsPath(rootRelation,release),'run_marc') + \
|
cmd = os.path.join(self.toolsPath(rootRelation,release),'run_marc') + \
|
||||||
|
|
Loading…
Reference in New Issue