From 96577b18fb82180d4617cc280312e14e203b9148 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 23 Jan 2013 18:33:46 +0000 Subject: [PATCH] introduced error code for run_test.py --- code/DAMASK_spectral_driver.f90 | 2 +- code/DAMASK_spectral_interface.f90 | 4 ++-- code/DAMASK_spectral_solverAL.f90 | 8 ++++---- code/DAMASK_spectral_solverBasic.f90 | 10 +++++----- code/DAMASK_spectral_solverBasicPETSc.f90 | 8 ++++---- lib/damask/test/test.py | 8 +++++--- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/code/DAMASK_spectral_driver.f90 b/code/DAMASK_spectral_driver.f90 index a203bd9e4..3d7ea1cb7 100644 --- a/code/DAMASK_spectral_driver.f90 +++ b/code/DAMASK_spectral_driver.f90 @@ -189,7 +189,7 @@ program DAMASK_spectral_Driver loadCases(currentLoadCase)%deformation%maskFloat = & ! float (1.0/0.0) mask in 3x3 notation merge(ones,zeros,loadCases(currentLoadCase)%deformation%maskLogical) loadCases(currentLoadCase)%deformation%values = math_plain9to33(temp_valueVector) ! values in 3x3 notation - case('p','pk1','piolakirchhoff','stress') + case('p','pk1','piolakirchhoff','stress', 's') temp_valueVector = 0.0_pReal forall (j = 1_pInt:9_pInt) temp_maskVector(j) = IO_stringValue(line,positions,i+j) /= '*' ! true if not a * do j = 1_pInt,9_pInt diff --git a/code/DAMASK_spectral_interface.f90 b/code/DAMASK_spectral_interface.f90 index bb6da46df..a2f826991 100644 --- a/code/DAMASK_spectral_interface.f90 +++ b/code/DAMASK_spectral_interface.f90 @@ -150,14 +150,14 @@ subroutine DAMASK_interface_init(loadCaseParameterIn,geometryParameterIn) write(6,'(a)') ' For further configuration place "numerics.config"' write(6,'(a)')' and "numerics.config" in that directory.' write(6,'(/,a)')' --restart XX' - write(6,'(a)') ' Reads in total increment No. XX-1 and continous to' + write(6,'(a)') ' Reads in total increment No. XX-1 and continues to' write(6,'(a)') ' calculate total increment No. XX.' write(6,'(a)') ' Appends to existing results file ' write(6,'(a)') ' "NameOfGeom_NameOfLoadFile.spectralOut".' write(6,'(a)') ' Works only if the restart information for total increment' write(6,'(a)') ' No. XX-1 is available in the working directory.' write(6,'(/,a)')' --regrid XX' - write(6,'(a)') ' Reads in total increment No. XX-1 and continous to' + write(6,'(a)') ' Reads in total increment No. XX-1 and continues to' write(6,'(a)') ' calculate total increment No. XX.' write(6,'(a)') ' Attention: Overwrites existing results file ' write(6,'(a)') ' "NameOfGeom_NameOfLoadFile.spectralOut".' diff --git a/code/DAMASK_spectral_solverAL.f90 b/code/DAMASK_spectral_solverAL.f90 index e1c7507dd..da612448b 100644 --- a/code/DAMASK_spectral_solverAL.f90 +++ b/code/DAMASK_spectral_solverAL.f90 @@ -174,14 +174,14 @@ subroutine AL_init(temperature) trim(getSolverJobName()),size(F_lambda_lastInc)) read (777,rec=1) F_lambda_lastInc close (777) - call IO_read_jobBinaryFile(777,'C_lastInc',trim(getSolverJobName()),size(C_lastInc)) - read (777,rec=1) C_lastInc + call IO_read_jobBinaryFile(777,'F_aimDot',trim(getSolverJobName()),size(f_aimDot)) + read (777,rec=1) f_aimDot close (777) call IO_read_jobBinaryFile(777,'C',trim(getSolverJobName()),size(C)) read (777,rec=1) C close (777) - call IO_read_jobBinaryFile(777,'F_aimDot',trim(getSolverJobName()),size(f_aimDot)) - read (777,rec=1) f_aimDot + call IO_read_jobBinaryFile(777,'C_lastInc',trim(getSolverJobName()),size(C_lastInc)) + read (777,rec=1) C_lastInc close (777) call IO_read_jobBinaryFile(777,'C_ref',trim(getSolverJobName()),size(temp3333_Real)) read (777,rec=1) temp3333_Real diff --git a/code/DAMASK_spectral_solverBasic.f90 b/code/DAMASK_spectral_solverBasic.f90 index 5329378c9..8f0594a1e 100644 --- a/code/DAMASK_spectral_solverBasic.f90 +++ b/code/DAMASK_spectral_solverBasic.f90 @@ -111,15 +111,15 @@ subroutine basic_init(temperature) F_aim = sum(sum(sum(F,dim=5),dim=4),dim=3) * wgt ! average of F F_aim_lastInc = sum(sum(sum(F_lastInc,dim=5),dim=4),dim=3) * wgt ! average of F_lastInc - - call IO_read_jobBinaryFile(777,'C_lastInc',trim(getSolverJobName()),size(C_lastInc)) - read (777,rec=1) C_lastInc + + call IO_read_jobBinaryFile(777,'F_aimDot',trim(getSolverJobName()),size(f_aimDot)) + read (777,rec=1) f_aimDot close (777) call IO_read_jobBinaryFile(777,'C',trim(getSolverJobName()),size(C)) read (777,rec=1) C close (777) - call IO_read_jobBinaryFile(777,'F_aimDot',trim(getSolverJobName()),size(f_aimDot)) - read (777,rec=1) f_aimDot + call IO_read_jobBinaryFile(777,'C_lastInc',trim(getSolverJobName()),size(C_lastInc)) + read (777,rec=1) C_lastInc close (777) call IO_read_jobBinaryFile(777,'C_ref',trim(getSolverJobName()),size(temp3333_Real)) read (777,rec=1) temp3333_Real diff --git a/code/DAMASK_spectral_solverBasicPETSc.f90 b/code/DAMASK_spectral_solverBasicPETSc.f90 index 4b16b0232..8ce362d4b 100644 --- a/code/DAMASK_spectral_solverBasicPETSc.f90 +++ b/code/DAMASK_spectral_solverBasicPETSc.f90 @@ -162,14 +162,14 @@ subroutine basicPETSc_init(temperature) F_aim = reshape(sum(sum(sum(F,dim=4),dim=3),dim=2) * wgt, [3,3]) ! average of F F_aim_lastInc = sum(sum(sum(F_lastInc,dim=5),dim=4),dim=3) * wgt ! average of F_lastInc - call IO_read_jobBinaryFile(777,'C_lastInc',trim(getSolverJobName()),size(C_lastInc)) - read (777,rec=1) C_lastInc + call IO_read_jobBinaryFile(777,'F_aimDot',trim(getSolverJobName()),size(f_aimDot)) + read (777,rec=1) f_aimDot close (777) call IO_read_jobBinaryFile(777,'C',trim(getSolverJobName()),size(C)) read (777,rec=1) C close (777) - call IO_read_jobBinaryFile(777,'F_aimDot',trim(getSolverJobName()),size(F_aimDot)) - read (777,rec=1) F_aimDot + call IO_read_jobBinaryFile(777,'C_lastInc',trim(getSolverJobName()),size(C_lastInc)) + read (777,rec=1) C_lastInc close (777) call IO_read_jobBinaryFile(777,'C_ref',trim(getSolverJobName()),size(temp3333_Real)) read (777,rec=1) temp3333_Real diff --git a/lib/damask/test/test.py b/lib/damask/test/test.py index e14535331..07f4696f7 100644 --- a/lib/damask/test/test.py +++ b/lib/damask/test/test.py @@ -340,7 +340,9 @@ class Test(): if culprit < 0: print '%s passed.'%({False: 'The test', True: 'All %i tests'%(len(self.variants))}[len(self.variants) > 1]) + print '\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n' + return 0 else: - print ' ********\n * Test %i failed...\n ********'%(culprit+1) - - print '\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n' + print ' ********\n * Test %i failed...\n ********'%(culprit+1) + print '\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n' + return culprit+1