Corrected errors in make test

diff --git a/CDMATH/tests/examples/Poisson3DSphereEF/CMakeLists.txt b/CDMATH/tests/examples/Poisson3DSphereEF/CMakeLists.txt
index 4d64cd12341ef4c94c343418ecbdaf65f6e5d1a8..1d8b478ad4f67c720d07707c293caf2964aeb368 100755 (executable)
--- a/CDMATH/tests/examples/Poisson3DSphereEF/CMakeLists.txt
+++ b/CDMATH/tests/examples/Poisson3DSphereEF/CMakeLists.txt
@@ -3,7 +3,7 @@ SET(MESH_MED
   ../../ressources/meshSphere.med
   )
 
-file(COPY ${MESH_MED} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tests/examples/Poisson3DSphereEF)
+file(COPY ${MESH_MED} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 install(FILES ${MESH_MED} DESTINATION share/examples/Poisson3DSphereEF)
 
 if (CDMATH_WITH_PYTHON AND CDMATH_WITH_PETSC AND CDMATH_WITH_POSTPRO)

diff --git a/CDMATH/tests/examples/WaveSystem1DStaggered_RiemannProblem/WaveSystem1DStaggered_RiemannProblem.py b/CDMATH/tests/examples/WaveSystem1DStaggered_RiemannProblem/WaveSystem1DStaggered_RiemannProblem.py
index 363c0e075eee0a999c90a809918055d01b1941e9..675f3dd25bbc29e636ab23df0d9b51b726d3f475 100755 (executable)
--- a/CDMATH/tests/examples/WaveSystem1DStaggered_RiemannProblem/WaveSystem1DStaggered_RiemannProblem.py
+++ b/CDMATH/tests/examples/WaveSystem1DStaggered_RiemannProblem/WaveSystem1DStaggered_RiemannProblem.py
@@ -52,17 +52,17 @@ def computeStaggeredDivergenceMatrix(a,b,nx,nbVoisinsMax,dt,scaling):
     S1,S2 = staggeredMatrices(dt/dx,scaling)
     for k in range(nbCells):#On parcourt les cellules
         if ( k==0) :
-                       implMat.addValue(k*nbComp, (k+1)*nbComp, S1)
-                       implMat.addValue(k*nbComp,  k   *nbComp, S1*(-1.))
+            implMat.addValue(k*nbComp, (k+1)*nbComp, S1)
+            implMat.addValue(k*nbComp,  k   *nbComp, S1*(-1.))
         elif ( k==nbCells-1) :
-                       implMat.addValue(k*nbComp,  k   *nbComp, S2)
-                       implMat.addValue(k*nbComp, (k-1)*nbComp, S2*(-1.))
+            implMat.addValue(k*nbComp,  k   *nbComp, S2)
+            implMat.addValue(k*nbComp, (k-1)*nbComp, S2*(-1.))
         else :
-                       implMat.addValue(k*nbComp, (k+1)*nbComp, S1)
-                       implMat.addValue(k*nbComp,  k   *nbComp, S1*(-1.))
+            implMat.addValue(k*nbComp, (k+1)*nbComp, S1)
+            implMat.addValue(k*nbComp,  k   *nbComp, S1*(-1.))
 
-                       implMat.addValue(k*nbComp,  k   *nbComp, S2)
-                       implMat.addValue(k*nbComp, (k-1)*nbComp, S2*(-1.))
+            implMat.addValue(k*nbComp,  k   *nbComp, S2)
+            implMat.addValue(k*nbComp, (k-1)*nbComp, S2*(-1.))
         
     return implMat
 

diff --git a/CDMATH/tests/examples/WaveSystem1DUpwind/WaveSystem1DUpwind.py b/CDMATH/tests/examples/WaveSystem1DUpwind/WaveSystem1DUpwind.py
index 1adc62aa5c6c922d9294e6fc2a9152a226c0f7e6..00cbdec989551d0444bb3b608a9735e29c45ba45 100755 (executable)
--- a/CDMATH/tests/examples/WaveSystem1DUpwind/WaveSystem1DUpwind.py
+++ b/CDMATH/tests/examples/WaveSystem1DUpwind/WaveSystem1DUpwind.py
@@ -100,7 +100,7 @@ def computeFluxes(U, SumFluxes):
         Fr=numericalFlux(Uj,Ujp1,absA)
         Fl=numericalFlux(Ujm1,Uj,absA)
 
-        sumFluxCourant = (Fr - Fl)*0.5/Cj.getMeasure()
+        sumFluxCourant = (Fr - Fl)*0.5*(1./Cj.getMeasure())
             
         #On divise par le volume de la cellule la contribution des flux au snd membre
         for i in range(nbComp):

diff --git a/CDMATH/tests/examples/WaveSystem1DUpwind_RiemannProblem/WaveSystem1DUpwind_RiemannProblem.py b/CDMATH/tests/examples/WaveSystem1DUpwind_RiemannProblem/WaveSystem1DUpwind_RiemannProblem.py
index 9ae483ba8427ff4fe5157f27cf1a5ded405ec3a0..7fcb86de150ef8b723f472a81cabcaf83821cc34 100755 (executable)
--- a/CDMATH/tests/examples/WaveSystem1DUpwind_RiemannProblem/WaveSystem1DUpwind_RiemannProblem.py
+++ b/CDMATH/tests/examples/WaveSystem1DUpwind_RiemannProblem/WaveSystem1DUpwind_RiemannProblem.py
@@ -59,17 +59,17 @@ def computeUpwindDivergenceMatrix(a,b,nx,nbVoisinsMax,dt,scaling):
     A,absA= jacobianMatrices(dt/dx,scaling)
     for j in range(nbCells):#On parcourt les cellules
         if ( j==0) :
-            implMat.addValue(j*nbComp,(j+1)*nbComp,(A-absA)/2)
-            implMat.addValue(j*nbComp,    j*nbComp,(A-absA)/2*(-1.))
+            implMat.addValue(j*nbComp,(j+1)*nbComp,(A-absA)*(1./2))
+            implMat.addValue(j*nbComp,    j*nbComp,(A-absA)*(-1./2))
         elif ( j==nbCells-1) :
-            implMat.addValue(j*nbComp,    j*nbComp,(A+absA)/2)
-            implMat.addValue(j*nbComp,(j-1)*nbComp,(A+absA)/2*(-1.))
+            implMat.addValue(j*nbComp,    j*nbComp,(A+absA)*(1./2))
+            implMat.addValue(j*nbComp,(j-1)*nbComp,(A+absA)*(-1./2))
         else :
-            implMat.addValue(j*nbComp,(j+1)*nbComp,(A-absA)/2)
-            implMat.addValue(j*nbComp,    j*nbComp,(A-absA)/2*(-1.))
+            implMat.addValue(j*nbComp,(j+1)*nbComp,(A-absA)*(1./2))
+            implMat.addValue(j*nbComp,    j*nbComp,(A-absA)*(-1./2))
 
-            implMat.addValue(j*nbComp,    j*nbComp,(A+absA)/2)
-            implMat.addValue(j*nbComp,(j-1)*nbComp,(A+absA)/2*(-1.))
+            implMat.addValue(j*nbComp,    j*nbComp,(A+absA)*(1./2))
+            implMat.addValue(j*nbComp,(j-1)*nbComp,(A+absA)*(-1./2))
                 
     return implMat
 

diff --git a/CDMATH/tests/examples/WaveSystem2DUpwind_RiemannProblem/WaveSystemUpwind.py b/CDMATH/tests/examples/WaveSystem2DUpwind_RiemannProblem/WaveSystemUpwind.py
index 964aeff911b00235785321c8aa2f0361d920a527..db1a42606655a8065edc9b02d2616e36d59b04d9 100755 (executable)
--- a/CDMATH/tests/examples/WaveSystem2DUpwind_RiemannProblem/WaveSystemUpwind.py
+++ b/CDMATH/tests/examples/WaveSystem2DUpwind_RiemannProblem/WaveSystemUpwind.py
@@ -65,7 +65,7 @@ def jacobianMatrices(normal,coeff):
         for j in range(dim):
             absA[i+1,j+1]=c0*normal[i]*normal[j]*coeff
     
-    return (A - absA)/2
+    return (A - absA)*(1./2)
     
 def computeDivergenceMatrix(my_mesh,nbVoisinsMax,dt):
     nbCells = my_mesh.getNumberOfCells()

diff --git a/CDMATH/tests/examples/WaveSystem_Shock/WaveSystemCentered/WaveSystemCentered.py b/CDMATH/tests/examples/WaveSystem_Shock/WaveSystemCentered/WaveSystemCentered.py
index bed88160141d6eec6630b54de1025716410790d6..d541fe928397bafd81f7e5c4bf82f72a8a7e2bc2 100755 (executable)
--- a/CDMATH/tests/examples/WaveSystem_Shock/WaveSystemCentered/WaveSystemCentered.py
+++ b/CDMATH/tests/examples/WaveSystem_Shock/WaveSystemCentered/WaveSystemCentered.py
@@ -84,7 +84,7 @@ def jacobianMatrices(normal, coeff, signun):
         A[i+1,0]=normal[i]*coeff
         A[0,i+1]=c0*c0*normal[i]*coeff
     
-    return A/2
+    return A*(1./2)
     
     
 def computeDivergenceMatrix(my_mesh,nbVoisinsMax,dt):

diff --git a/CDMATH/tests/examples/WaveSystem_Shock/WaveSystemPStag/WaveSystemPStag.py b/CDMATH/tests/examples/WaveSystem_Shock/WaveSystemPStag/WaveSystemPStag.py
index 593997b631eabf5820653aa28c6e44d9d34b8e37..ea333350b2fc8fdf3c4041e15a3dfbe943806a50 100755 (executable)
--- a/CDMATH/tests/examples/WaveSystem_Shock/WaveSystemPStag/WaveSystemPStag.py
+++ b/CDMATH/tests/examples/WaveSystem_Shock/WaveSystemPStag/WaveSystemPStag.py
@@ -87,7 +87,7 @@ def jacobianMatrices(normal, coeff, signun):
         A[0,i+1]=c0*c0*normal[i]*coeff
         absA[0,i+1]=signun*A[0,i+1]
     
-    return (A-absA)/2
+    return (A-absA)*(1./2)
     
     
 def computeDivergenceMatrix(my_mesh,nbVoisinsMax,dt):

diff --git a/CDMATH/tests/examples/WaveSystem_Shock/WaveSystemUpwind/WaveSystemUpwind.py b/CDMATH/tests/examples/WaveSystem_Shock/WaveSystemUpwind/WaveSystemUpwind.py
index 85691970ca6530aa41754c3f2bcfdcd5b0fb3090..fdf741684a842b1b3024b6adbe21552bdfeef6a8 100755 (executable)
--- a/CDMATH/tests/examples/WaveSystem_Shock/WaveSystemUpwind/WaveSystemUpwind.py
+++ b/CDMATH/tests/examples/WaveSystem_Shock/WaveSystemUpwind/WaveSystemUpwind.py
@@ -87,7 +87,7 @@ def jacobianMatrices(normal,coeff):
         for j in range(dim):
             absA[i+1,j+1]=c0*normal[i]*normal[j]*coeff
     
-    return (A - absA)/2
+    return (A - absA)*(1./2)
     
 def computeDivergenceMatrix(my_mesh,nbVoisinsMax,dt):
     nbCells = my_mesh.getNumberOfCells()

diff --git a/CDMATH/tests/examples/WaveSystem_Stationary/WaveSystemCentered/WaveSystemCentered.py b/CDMATH/tests/examples/WaveSystem_Stationary/WaveSystemCentered/WaveSystemCentered.py
index 76c67b1a88ffb789f50c8984d5df422879750bce..f1ad05b6b0d704d44568524646f98e6391002c8e 100755 (executable)
--- a/CDMATH/tests/examples/WaveSystem_Stationary/WaveSystemCentered/WaveSystemCentered.py
+++ b/CDMATH/tests/examples/WaveSystem_Stationary/WaveSystemCentered/WaveSystemCentered.py
@@ -87,7 +87,7 @@ def jacobianMatrices(normal, coeff, signun):
         A[i+1,0]=normal[i]*coeff
         A[0,i+1]=c0*c0*normal[i]*coeff
     
-    return A/2
+    return A*(1./2)
     
     
 def computeDivergenceMatrix(my_mesh,nbVoisinsMax,dt):

diff --git a/CDMATH/tests/examples/WaveSystem_Stationary/WaveSystemPStag/WaveSystemPStag.py b/CDMATH/tests/examples/WaveSystem_Stationary/WaveSystemPStag/WaveSystemPStag.py
index 318943394c370ba895dac40023a76c3c4297081d..a86f0f7ff38a22c7869492d68681e732d311e736 100755 (executable)
--- a/CDMATH/tests/examples/WaveSystem_Stationary/WaveSystemPStag/WaveSystemPStag.py
+++ b/CDMATH/tests/examples/WaveSystem_Stationary/WaveSystemPStag/WaveSystemPStag.py
@@ -90,7 +90,7 @@ def jacobianMatrices(normal, coeff, signun):
         A[0,i+1]=c0*c0*normal[i]*coeff
         absA[0,i+1]=signun*A[0,i+1]
     
-    return (A-absA)/2
+    return (A-absA)*(1./2)
     
     
 def computeDivergenceMatrix(my_mesh,nbVoisinsMax,dt):

diff --git a/CDMATH/tests/examples/WaveSystem_Stationary/WaveSystemUpwind/WaveSystemUpwind.py b/CDMATH/tests/examples/WaveSystem_Stationary/WaveSystemUpwind/WaveSystemUpwind.py
index 7cff68ba13f862979951b4b38edd52c5bb1ac874..3cd402105c6623b4238b622f43f5f45ded95cdf0 100755 (executable)
--- a/CDMATH/tests/examples/WaveSystem_Stationary/WaveSystemUpwind/WaveSystemUpwind.py
+++ b/CDMATH/tests/examples/WaveSystem_Stationary/WaveSystemUpwind/WaveSystemUpwind.py
@@ -90,7 +90,7 @@ def jacobianMatrices(normal,coeff):
         for j in range(dim):
             absA[i+1,j+1]=c0*normal[i]*normal[j]*coeff
     
-    return (A - absA)/2
+    return (A - absA)*(1./2)
     
 def computeDivergenceMatrix(my_mesh,nbVoisinsMax,dt):
     nbCells = my_mesh.getNumberOfCells()