Extended weak zone to the surface.

tduretz · Jun 20, 2024 · 24295cc · 24295cc
1 parent 5424366
commit 24295cc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 25 deletions.
diff --git a/FindSuiteSparse.cmake b/FindSuiteSparse.cmake
@@ -177,7 +177,7 @@ macro(SuiteSparse_FIND_COMPONENTS )
 						/usr/local/include/suitesparse
 						/usr/include/${suitesparseComp}
 						/usr/local/include/${suitesparseComp}
-						/opt/homebrew/Cellar/suite-sparse/7.6.1/include/suitesparse
+						$ENV{brew_SuiteSparse_path}/include/suitesparse
 						${SuiteSparse_DIR}/include
 						${SuiteSparse_DIR}/include/suitesparse
 						${SuiteSparse_DIR}/suitesparse/include

diff --git a/JuliaVisualisation/Main_Visualisation_Makie_MD7.jl b/JuliaVisualisation/Main_Visualisation_Makie_MD7.jl
@@ -9,29 +9,18 @@ My = 1e6*365*24*3600
 function main()
 
     # Set the path to your files
-    # path ="/Users/tduretz/REPO/MDOODZ7.0/MDLIB/NonLinearPureshearAnisotropic/"
-    # path ="/Users/tduretz/REPO/MDOODZ7.0/RUNS/NR00/"
-    # path ="/Users/tduretz/REPO/MDOODZ7.0/MDLIB/qcoe_ref/"
-    # path ="/Users/tduretz/REPO/MDOODZ7.0/RUNS/qcoe_x100/"
-    # path ="/Users/tduretz/REPO/MDOODZ7.0/RUNS/qcoe_chk/"
-    # path ="/Users/tduretz/REPO/MDOODZ7.0/RUNS/1_NR07/"
-    #path = "/Users/lcandiot/Developer/MDOODZ7.0/RUNS/ThanushikaSubduction/test_steepSubd/"
-    # path ="/home/thanushika/software/MDOODZ7.0/cmake-exec/ThanushikaSubduction/"
-    # path = "/Users/lcandiot/Developer/MDOODZ7.0/cmake-exec/ThanushikaSubduction/"
-    #path ="/home/thanushika/software/MDOODZ7.0/cmake-exec/ThanushikaSubduction/O100/"
-    path = "/home/thanushika/software/Results/Phase_Diagram_Model/Results_D15Long_correctedcanbedele/"
-    # path ="/home/thanushika/software/Results/Trial2/Results_Density_OC2.97/"
+    path ="/Users/lcandiot/Developer/MDOODZ7.0/cmake-exec/ThanushikaSubduction/"
 
     # File numbers
     file_start = 0
     file_step  = 500
-    file_end   = 3000
+    file_end   = 0
 
 
     # Select field to visualise
-    #field = :Phases
+    field = :Phases
     #field = :Density
-     field = :Viscosity 
+    #  field = :Viscosity 
     # field = :PlasticStrainrate
     #field = :Stress
     # field = :StrainRate
@@ -48,7 +37,7 @@ function main()
     # Switches
     printfig    = true  # print figures to disk
     ph_contours = false  # add phase contours
-    T_contours  = true  # add temperature contours
+    T_contours  = false  # add temperature contours
     fabric      = false  # add fabric quiver (normal to director)
     topo        = false
     α_heatmap   = 1.0 #0.85   # transparency of heatmap 

diff --git a/SETS/ThanushikaSubduction.c b/SETS/ThanushikaSubduction.c
@@ -87,13 +87,6 @@ int SetPhase(MdoodzInput *instance, Coordinates coordinates) {
     phase = 2;
   }
 
-  // Set weak zone
-  double maxLithThickness = fmax(ocCrustThickness,lithosphereThickness);
-   if (coordinates.z > weakZoneDepth && coordinates.x > -weakZoneWidth - coordinates.z*subductionAngle && coordinates.x < weakZoneWidth - coordinates.z*subductionAngle)
-   {
-     phase = 3;
-   }
-
   // Set oceanic crust
   if (coordinates.z > -ocCrustThickness && coordinates.x < -weakZoneWidth - coordinates.z*subductionAngle)
   {
@@ -121,6 +114,13 @@ int SetPhase(MdoodzInput *instance, Coordinates coordinates) {
     phase = 4;
   }
 
+    // Set weak zone
+  double maxLithThickness = fmax(ocCrustThickness,lithosphereThickness);
+   if (coordinates.z > weakZoneDepth && coordinates.x > -weakZoneWidth - coordinates.z*subductionAngle && coordinates.x < weakZoneWidth - coordinates.z*subductionAngle)
+   {
+     phase = 3;
+   }
+
   // Return
   return phase;
 

diff --git a/SETS/ThanushikaSubduction.txt b/SETS/ThanushikaSubduction.txt
@@ -21,7 +21,7 @@ T               = 4.0e+02 /temperature
 /**** SPACE-TIME ****/
 Nx             = 1001               / No. grid points x
 Nz             = 381                / No. grid points z
-Nt             = 2000                  / No. time steps
+Nt             = 0                  / No. time steps
 xmin           = -1200.000000e3     / Minimum x-coordinate
 xmax           =  1200.000000e3     / Maximum x-coordinate
 zmin           = -660.000000e3      / Minimum z-coordinate