ttrying to fix the carpet - granular-basin - tectonic deformation experiments w… | |
git clone git://src.adamsgaard.dk/granular-basin | |
Log | |
Files | |
Refs | |
README | |
--- | |
commit a242f581c0e00bf87dbc3fccbfbb7b6485576b59 | |
parent 3e8210c86b044cdc74ad726b0372612c7601f428 | |
Author: esbenpalmstrom <[email protected]> | |
Date: Fri, 26 Nov 2021 15:45:29 +0100 | |
ttrying to fix the carpet | |
Diffstat: | |
M compact_basin.jl | 2 +- | |
M deform_basin.jl | 2 +- | |
M init_basin.jl | 7 +++---- | |
M layer_basin.jl | 2 +- | |
4 files changed, 6 insertions(+), 7 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 = "simulation250" # 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@@ -6,7 +6,7 @@ t_start = Dates.now() | |
# User defined settings | |
-id = "simulation250" # 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 | |
diff --git a/init_basin.jl b/init_basin.jl | |
t@@ -12,7 +12,7 @@ t_stack = 0.5 # duration for each stack to… | |
g = [0.,-9.8] # vector for direction and magnitude of gravit… | |
-ngrains = 250 # total number of grains | |
+ngrains = 500 # total number of grains | |
aspect_ratio = 4 # should be x times as wide as it is tall | |
mkpath("simulation$(ngrains)") | |
t@@ -217,10 +217,9 @@ append!(sim.grains,carpet.grains) # add the carpet grains… | |
# object will appear in the main simulation object | |
- | |
+""" | |
#reset the grain contacts and make them very old | |
- | |
for grain in sim.grains | |
grain.contacts[:] .= 0 | |
grain.n_contacts = 0 | |
t@@ -233,7 +232,7 @@ for grain in sim.grains | |
end | |
grain.strength_heal_rate = 1 # new bond stengthening | |
end | |
- | |
+""" | |
Granular.fitGridToGrains!(sim,sim.ocean,verbose=false) # fit the ocean to the… | |
diff --git a/layer_basin.jl b/layer_basin.jl | |
t@@ -3,7 +3,7 @@ import JLD2 | |
import PyPlot | |
import Dates | |
-id = "simulation250" # 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 |