dfn_transport update the test cases

fwforest · Jun 7, 2019 · dfd1124 · dfd1124
1 parent 04574a2
commit dfd1124
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/examples/papers/dfn_transport/example3/main.py b/examples/papers/dfn_transport/example3/main.py
@@ -57,7 +57,7 @@ def bc_different(g, domain, tol):
 def main():
 
     input_folder = "../geometries/"
-    file_name = input_folder + "example3.fab"
+    file_name = input_folder + "example3_connected.fab"
 
     # define the discretizations for the Darcy part
     discretizations = compute.get_discr()

diff --git a/examples/papers/dfn_transport/example3/post_process.py b/examples/papers/dfn_transport/example3/post_process.py
@@ -100,7 +100,8 @@ def cot_domain(file_in, step, field, num_frac, padding=6):
             cot_min[i, frac_id] = np.amin(c[is_loc])
             cot_max[i, frac_id] = np.amax(c[is_loc])
 
-    return cot_avg, cot_min, cot_max
+    zero = 273.15
+    return cot_avg + zero, cot_min + zero, cot_max + zero
 
 #------------------------------------------------------------------------------#
 
@@ -109,11 +110,11 @@ def main():
     field = "scalar"
     n_step = 200
     time_step = 3.154e+7/200
-    num_frac = 89
+    num_frac = 89-7
 
     grids = ["different", "same"]
 
-    folder_master = "/home/elle/tmp/tipetut++/new/"
+    folder_master = "/home/elle/tmp/tipetut++/example3/"
     #folder_master = "./"
     folder_master_out = "./CSV/"
     methods = ["MVEM", "Tpfa", "RT0"]

diff --git a/examples/papers/dfn_transport/example3/pot.py b/examples/papers/dfn_transport/example3/pot.py
@@ -75,17 +75,16 @@ def save_multiple(filename, num_frac, folder):
 
 def main():
 
-    num_frac = 86
+    num_frac = 86-7
 
     master_folder = "/home/elle/Dropbox/Work/PresentazioniArticoli/2019/Articles/tipetut++/Results/example3/"
 
-    methods_stefano = ["OPTfem"] #["OPTxfem", , "GCmfem"]
+    methods_stefano = ["OPTfem", "OPTxfem", "GCmfem"]
     methods_alessio = ["MVEM_UPWIND", "Tpfa_UPWIND", "RT0_UPWIND"]
     methods_andrea = [] #["MVEM_VEMSUPG"]
 
-    cases = {"case_0": ("different", "different", "0.005"), "case_1": ("same", "2600", "0.001")}
+    cases = {"case_0": ("different", "different", "0.005"), "case_1": ("same", "same", "0.001")}
     cases_label = {"case_0": "different", "case_1": "same"}
-    cases_label = {"case_0": "different"}
 
     for case_name, case in cases.items():
         case_label = cases_label[case_name]