Updated path

[tools/solverlab.git] / CoreFlows / examples / Python / Convergence / StationaryDiffusion / 2DFV_Dirichlet_Hexagons / convergence_StationaryDiffusion_2DFV_Dirichlet_Hexagons.py

diff --git a/CoreFlows/examples/Python/Convergence/StationaryDiffusion/2DFV_Dirichlet_Hexagons/convergence_StationaryDiffusion_2DFV_Dirichlet_Hexagons.py b/CoreFlows/examples/Python/Convergence/StationaryDiffusion/2DFV_Dirichlet_Hexagons/convergence_StationaryDiffusion_2DFV_Dirichlet_Hexagons.py
index 06cfd1f59699524775477ebf5463d31e9b518596..379afdefdaebfc1b6f3b25370dfa8931b1c0085a 100644 (file)
--- a/CoreFlows/examples/Python/Convergence/StationaryDiffusion/2DFV_Dirichlet_Hexagons/convergence_StationaryDiffusion_2DFV_Dirichlet_Hexagons.py
+++ b/CoreFlows/examples/Python/Convergence/StationaryDiffusion/2DFV_Dirichlet_Hexagons/convergence_StationaryDiffusion_2DFV_Dirichlet_Hexagons.py
@@ -16,7 +16,7 @@ def convergence_StationaryDiffusion_2DFV_Dirichlet_Hexagons():
     method = 'FV'
     BC = 'Dirichlet'
     meshList=['squareWithHexagons_1','squareWithHexagons_2','squareWithHexagons_3','squareWithHexagons_4','squareWithHexagons_5']
-    mesh_path=os.environ['CDMATH_INSTALL']+'/share/meshes//2DHexagons/'
+    mesh_path=os.environ['SOLVERLAB_INSTALL']+'/share/meshes//2DHexagons/'
     mesh_name='squareWithHexagons'
     meshType="Structured_hexagons"
     nbMeshes=len(meshList)
@@ -31,16 +31,16 @@ def convergence_StationaryDiffusion_2DFV_Dirichlet_Hexagons():
     testColor="Green"
     # 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_Dirichlet_Hexagons():
     a=( a3*b1-a2*b2)/det
     b=(-a2*b1+a1*b2)/det
     
-    print "FV for diffusion on 2D  hexagon meshes: scheme order is ", -a
+    print( "FV for diffusion on 2D  hexagon meshes: scheme order is ", -a)
     assert abs(a+1.94)<0.01
     
     # Plot of convergence curve