tminor changes - granular-basin - tectonic deformation experiments with Granul… | |
git clone git://src.adamsgaard.dk/granular-basin | |
Log | |
Files | |
Refs | |
README | |
--- | |
commit 62e67c9f6439ac0091e555710eba716c7499f198 | |
parent 0813325bb8a04723d8c26c333d18b44d185be2d5 | |
Author: esbenpalmstrom <[email protected]> | |
Date: Fri, 26 Nov 2021 10:38:38 +0100 | |
minor changes | |
Diffstat: | |
M compact_basin.jl | 2 +- | |
M deform_basin.jl | 17 ++++++++--------- | |
M layer_basin.jl | 9 +++------ | |
3 files changed, 12 insertions(+), 16 deletions(-) | |
--- | |
diff --git a/compact_basin.jl b/compact_basin.jl | |
t@@ -8,7 +8,7 @@ t_start = Dates.now() # Save the start time, print the end tim… | |
# lav en lille test? se om dit appendede carpet stadig er forbundet til hoved- | |
# simulationsobjektet | |
-id = "simulation1000" # id of simulation to load | |
+id = "simulation500" # id of simulation to load | |
N = 20e3 # amount of stress to be applied | |
t_comp = 3.0 # compaction max duration [s] | |
diff --git a/deform_basin.jl b/deform_basin.jl | |
t@@ -4,10 +4,9 @@ import Dates | |
t_start = Dates.now() | |
- | |
# User defined settings | |
-id = "simulation1000" # folder name of simulation | |
+id = "simulation500" # folder name of simulation | |
hw_ratio = 0.2 # height/width ratio of indenter | |
grain_radius = 0.05 # grain radius of grains in indenter | |
t@@ -27,10 +26,10 @@ for grain in sim.grains | |
grain.fixed = false | |
end | |
-y_bot = Inf | |
+y_bot_pre = Inf | |
for grain in sim.grains | |
- if y_bot > grain.lin_pos[2] - grain.contact_radius | |
- global y_bot = grain.lin_pos[2] - grain.contact_radius | |
+ if y_bot_pre > grain.lin_pos[2] - grain.contact_radius | |
+ global y_bot_pre = grain.lin_pos[2] - grain.contact_radius | |
end | |
end | |
t@@ -71,7 +70,9 @@ Granular.fitGridToGrains!(sim, | |
sim.time_iteration = 0 | |
sim.time = 0.0 | |
-sim.file_time_since_output_file = 0.y_bot = Inf | |
+sim.file_time_since_output_file = 0. | |
+ | |
+y_bot = Inf | |
for grain in sim.grains | |
if y_bot > grain.lin_pos[2] - grain.contact_radius | |
global y_bot = grain.lin_pos[2] - grain.contact_radius | |
t@@ -86,7 +87,6 @@ cd("$id") | |
sim.id = "deformed" | |
sim.walls = Granular.WallLinearFrictionless[] # remove existing walls | |
- | |
#find the edge grains of the carpet | |
left_edge = -Inf | |
right_edge = Inf | |
t@@ -101,7 +101,6 @@ for i = 1:size(sim.grains,1) | |
end | |
end | |
- | |
#add walls to the east and west | |
Granular.addWallLinearFrictionless!(sim,[1.,0.], | |
left_edge, | |
t@@ -114,7 +113,7 @@ Granular.addWallLinearFrictionless!(sim,[1.,0.], | |
#add wall beneath the carpet | |
Granular.addWallLinearFrictionless!(sim, [0.,1.], | |
- y_bot, | |
+ y_bot_pre, | |
bc = "fixed") | |
while sim.time < sim.time_total | |
diff --git a/layer_basin.jl b/layer_basin.jl | |
t@@ -3,7 +3,7 @@ import JLD2 | |
import PyPlot | |
import Dates | |
-id = "simulation1000" # id of simulation to load, just write the folder | |
+id = "simulation500" # id of simulation to load, just write the folder | |
# name here | |
# Layer interface positions | |
t@@ -24,10 +24,10 @@ color = [0,0,0] | |
carpet_youngs_modulus = 2e7 | |
carpet_poissons_ratio = 0.185 | |
-carpet_tensile_strength = Inf | |
+carpet_tensile_strength = 1e16 | |
carpet_contact_dynamic_friction = 0.4 | |
carpet_rotating = true | |
-carpet_shear_strength = Inf | |
+carpet_shear_strength = 1e16 | |
sim = Granular.readSimulation("$(id)/comp.jld2") | |
SimSettings = SimSettings = JLD2.load("$(id)/SimSettings.jld2") | |
t@@ -142,6 +142,3 @@ cd("..") | |
Granular.writeSimulation(sim, | |
filename = "$(id)/layered.jld2") | |
- | |
-Granular.writeSimulation(carpet, | |
- filename = "$(id)/carpet.jld2") |