Updated path

[tools/solverlab.git] / CoreFlows / examples / Python / Convergence / StationaryDiffusion / 2DFV_Neumann_DelaunayTriangles / convergence_StationaryDiffusion_2DFV_Neumann_DelaunayTriangles.py

diff --git a/CoreFlows/examples/Python/Convergence/StationaryDiffusion/2DFV_Neumann_DelaunayTriangles/convergence_StationaryDiffusion_2DFV_Neumann_DelaunayTriangles.py b/CoreFlows/examples/Python/Convergence/StationaryDiffusion/2DFV_Neumann_DelaunayTriangles/convergence_StationaryDiffusion_2DFV_Neumann_DelaunayTriangles.py
index c22b1f3cb9bf5402243fb38b9e15f43e387582d0..d549d509b0796be133e244bd117de1777a918e1e 100644 (file)
--- a/CoreFlows/examples/Python/Convergence/StationaryDiffusion/2DFV_Neumann_DelaunayTriangles/convergence_StationaryDiffusion_2DFV_Neumann_DelaunayTriangles.py
+++ b/CoreFlows/examples/Python/Convergence/StationaryDiffusion/2DFV_Neumann_DelaunayTriangles/convergence_StationaryDiffusion_2DFV_Neumann_DelaunayTriangles.py
@@ -16,7 +16,7 @@ def convergence_StationaryDiffusion_2DFV_Neumann_DelaunayTriangles():
     method = 'FV'
     BC = 'Neumann'
     meshList=['squareWithTriangles_1','squareWithTriangles_2','squareWithTriangles_3','squareWithTriangles_4','squareWithTriangles_5']
-    mesh_path=os.environ['CDMATH_INSTALL']+'/share/meshes//2DTriangles/'
+    mesh_path=os.environ['SOLVERLAB_INSTALL']+'/share/meshes//2DTriangles/'
     mesh_name='squareWithDelaunayTriangles'
     meshType="Unstructured_triangles"
     nbMeshes=len(meshList)
@@ -31,16 +31,16 @@ def convergence_StationaryDiffusion_2DFV_Neumann_DelaunayTriangles():
     testColor="Red"#Linear solver fails
     # Storing of numerical errors, mesh sizes and diagonal values
     for filename in meshList:
-               my_mesh=cm.Mesh(mesh_path+filename+".med")
-               error_tab[i], mesh_size_tab[i], diag_data[i], min_sol_num, max_sol_num, time_tab[i] =validationStationaryDiffusionEquation.SolveStationaryDiffusionEquation(my_mesh,resolution,meshType,method,BC)
+        my_mesh=cm.Mesh(mesh_path+filename+".med")
+        error_tab[i], mesh_size_tab[i], diag_data[i], min_sol_num, max_sol_num, time_tab[i] =validationStationaryDiffusionEquation.SolveStationaryDiffusionEquation(my_mesh,resolution,meshType,method,BC)
 
-               assert min_sol_num>-1 
-               assert max_sol_num<1.2
-               plt.plot(curv_abs, diag_data[i], label= str(mesh_size_tab[i]) + ' cells')
-               error_tab[i]=log10(error_tab[i])
-               time_tab[i]=log10(time_tab[i])
-               mesh_size_tab[i] = 0.5*log10(mesh_size_tab[i])
-               i=i+1
+        assert min_sol_num>-1 
+        assert max_sol_num<1.2
+        plt.plot(curv_abs, diag_data[i], label= str(mesh_size_tab[i]) + ' cells')
+        error_tab[i]=log10(error_tab[i])
+        time_tab[i]=log10(time_tab[i])
+        mesh_size_tab[i] = 0.5*log10(mesh_size_tab[i])
+        i=i+1
     end = time.time()
         
    
@@ -66,7 +66,7 @@ def convergence_StationaryDiffusion_2DFV_Neumann_DelaunayTriangles():
     a=( a3*b1-a2*b2)/det
     b=(-a2*b1+a1*b2)/det
     
-    print "FV for diffusion on 2D Delaunay triangle meshes: scheme order is ", -a
+    print( "FV for diffusion on 2D Delaunay triangle meshes: scheme order is ", -a)
     assert abs(a+0.6)<0.02
     
     # Plot of convergence curve