From 7832f178626d1e8dddf5806341961accff434b67 Mon Sep 17 00:00:00 2001 From: michael Date: Sun, 29 Nov 2020 00:01:34 +0100 Subject: [PATCH] Replaced /2 by *0.5 --- .../Poisson3DCubeSkinEF/FiniteElements3DPoissonCubeSkin.py | 4 +--- .../Poisson3DSphereEF/FiniteElements3DPoissonSphere.py | 4 +--- .../scripts/Poisson3DTorusEF/FiniteElements3DPoissonTorus.py | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) mode change 100644 => 100755 CDMATH/tests/validation/scripts/Poisson3DCubeSkinEF/FiniteElements3DPoissonCubeSkin.py mode change 100644 => 100755 CDMATH/tests/validation/scripts/Poisson3DSphereEF/FiniteElements3DPoissonSphere.py mode change 100644 => 100755 CDMATH/tests/validation/scripts/Poisson3DTorusEF/FiniteElements3DPoissonTorus.py diff --git a/CDMATH/tests/validation/scripts/Poisson3DCubeSkinEF/FiniteElements3DPoissonCubeSkin.py b/CDMATH/tests/validation/scripts/Poisson3DCubeSkinEF/FiniteElements3DPoissonCubeSkin.py old mode 100644 new mode 100755 index 6f9e9c5..4593372 --- a/CDMATH/tests/validation/scripts/Poisson3DCubeSkinEF/FiniteElements3DPoissonCubeSkin.py +++ b/CDMATH/tests/validation/scripts/Poisson3DCubeSkinEF/FiniteElements3DPoissonCubeSkin.py @@ -129,7 +129,7 @@ def solve(filename,resolution,meshType, testColor): normalFace1[2]=Ci.getNormalVector(1,2) normalCell = normalFace0.crossProduct(normalFace1) - normalCell = normalCell/normalCell.norm() + normalCell = normalCell*(1/normalCell.norm()) cellMat=cdmath.Matrix(4) cellMat[0,0]=N0.x() @@ -179,7 +179,6 @@ def solve(filename,resolution,meshType, testColor): #================================= LS=cdmath.LinearSolver(Rigidite,RHS,100,1.E-6,"GMRES","ILU") LS.setMatrixIsSingular()#En raison de l'absence de bord - LS.setComputeConditionNumber() SolSyst=LS.solve() print("Preconditioner used : ", LS.getNameOfPc() ) @@ -193,7 +192,6 @@ def solve(filename,resolution,meshType, testColor): test_desc["Linear_solver_maximum_iterations"]=LS.getNumberMaxOfIter() test_desc["Linear_system_max_actual_iterations_number"]=LS.getNumberOfIter() test_desc["Linear_system_max_actual_error"]=LS.getResidu() - test_desc["Linear_system_max_actual_condition number"]=LS.getConditionNumber() # Création du champ résultat #=========================== diff --git a/CDMATH/tests/validation/scripts/Poisson3DSphereEF/FiniteElements3DPoissonSphere.py b/CDMATH/tests/validation/scripts/Poisson3DSphereEF/FiniteElements3DPoissonSphere.py old mode 100644 new mode 100755 index cc45a41..72cc017 --- a/CDMATH/tests/validation/scripts/Poisson3DSphereEF/FiniteElements3DPoissonSphere.py +++ b/CDMATH/tests/validation/scripts/Poisson3DSphereEF/FiniteElements3DPoissonSphere.py @@ -117,7 +117,7 @@ def solve(filename,resolution,meshType, testColor): normalFace1[2]=Ci.getNormalVector(1,2) normalCell = normalFace0.crossProduct(normalFace1) - normalCell = normalCell/normalCell.norm() + normalCell = normalCell*(1/normalCell.norm()) cellMat=cdmath.Matrix(4) cellMat[0,0]=N0.x() @@ -167,7 +167,6 @@ def solve(filename,resolution,meshType, testColor): #================================= LS=cdmath.LinearSolver(Rigidite,RHS,100,1.E-6,"GMRES","ILU") LS.setMatrixIsSingular()#En raison de l'absence de bord - LS.setComputeConditionNumber() SolSyst=LS.solve() print( "Preconditioner used : ", LS.getNameOfPc() ) @@ -181,7 +180,6 @@ def solve(filename,resolution,meshType, testColor): test_desc["Linear_solver_maximum_iterations"]=LS.getNumberMaxOfIter() test_desc["Linear_system_max_actual_iterations_number"]=LS.getNumberOfIter() test_desc["Linear_system_max_actual_error"]=LS.getResidu() - test_desc["Linear_system_max_actual_condition number"]=LS.getConditionNumber() # Création du champ résultat #=========================== diff --git a/CDMATH/tests/validation/scripts/Poisson3DTorusEF/FiniteElements3DPoissonTorus.py b/CDMATH/tests/validation/scripts/Poisson3DTorusEF/FiniteElements3DPoissonTorus.py old mode 100644 new mode 100755 index c2442a7..229b3f4 --- a/CDMATH/tests/validation/scripts/Poisson3DTorusEF/FiniteElements3DPoissonTorus.py +++ b/CDMATH/tests/validation/scripts/Poisson3DTorusEF/FiniteElements3DPoissonTorus.py @@ -126,7 +126,7 @@ def solve(filename,resolution,meshType, testColor): normalFace1[2]=Ci.getNormalVector(1,2) normalCell = normalFace0.crossProduct(normalFace1) - normalCell = normalCell/normalCell.norm() + normalCell = normalCell*(1/normalCell.norm()) cellMat=cdmath.Matrix(4) cellMat[0,0]=N0.x() @@ -176,7 +176,6 @@ def solve(filename,resolution,meshType, testColor): #================================= LS=cdmath.LinearSolver(Rigidite,RHS,100,1.E-6,"CG","CHOLESKY") LS.setMatrixIsSingular()#En raison de l'absence de bord - LS.setComputeConditionNumber() SolSyst=LS.solve() print( "Preconditioner used : ", LS.getNameOfPc() ) @@ -190,7 +189,6 @@ def solve(filename,resolution,meshType, testColor): test_desc["Linear_solver_maximum_iterations"]=LS.getNumberMaxOfIter() test_desc["Linear_system_max_actual_iterations_number"]=LS.getNumberOfIter() test_desc["Linear_system_max_actual_error"]=LS.getResidu() - test_desc["Linear_system_max_actual_condition number"]=LS.getConditionNumber() # Création du champ résultat #=========================== -- 2.39.2