Merge branch 'development' into miscImprovements

2016-07-29 16:26:44 +02:00 · 2016-07-29 16:26:44 +02:00 · 136d01cdfc
parent f411405da6 f992e420e3
commit 136d01cdfc
2 changed files with 2 additions and 13 deletions
--- a/code/math.f90
+++ b/code/math.f90
@ -158,7 +158,8 @@ module math
   math_areaTriangle, &
   math_rotate_forward33, &
   math_rotate_backward33, &
-   math_rotate_forward3333
+   math_rotate_forward3333, &
+   math_limit
 private :: &
   math_partition, &
   halton, &
--- a/examples/SpectralMethod/Makefile
+++ b/examples/SpectralMethod/Makefile
@ -1,12 +0,0 @@
-include ${PETSC_DIR}/${PETSC_ARCH}/lib/petsc/conf/variables
-include ${PETSC_DIR}/${PETSC_ARCH}/lib/petsc/conf/rules
-
-
-run16x16x16:
-	-@${MPIEXEC} -n 2 DAMASK_spectral -l tensionX.load -g 20grains16x16x16.geom
-
-run32x32x32:
-	-@${MPIEXEC} -n 4 DAMASK_spectral -l tensionX.load -g 20grains32x32x32.geom
-
-run64x64x64:
-	-@${MPIEXEC} -n 8 DAMASK_spectral -l tensionX.load -g 20grains64x64x64.geom