tAdd parameter examples, use tabs for indentation, use tan instead of atan - cn… | |
git clone git://src.adamsgaard.dk/cngf-pf | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 094372b6fea19801db2cf3d1025a4d2052669efc | |
parent 5aca72fd4967063ab5f250ec7f6b24f053737135 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Mon, 8 Jul 2019 13:21:03 +0200 | |
Add parameter examples, use tabs for indentation, use tan instead of atan | |
Diffstat: | |
M parameter_defaults.h | 101 ++++++++++++++++++-----------… | |
1 file changed, 59 insertions(+), 42 deletions(-) | |
--- | |
diff --git a/parameter_defaults.h b/parameter_defaults.h | |
t@@ -11,64 +11,81 @@ | |
/* Simulation settings */ | |
struct simulation init_sim(void) | |
{ | |
- struct simulation sim; | |
+ struct simulation sim; | |
- sprintf(sim.name, DEFAULT_SIMULATION_NAME); | |
+ sprintf(sim.name, DEFAULT_SIMULATION_NAME); | |
- sim.G = 9.81; | |
+ sim.G = 9.81; | |
- sim.P_wall = 120e3; /* larger normal stress deepens the shear depth */ | |
- sim.mu_wall = 0.40; | |
- sim.v_x_bot = 0.0; | |
+ sim.P_wall = 120e3; /* larger normal stress deepens the shear depth */ | |
+ sim.mu_wall = 0.40; | |
+ sim.v_x_bot = 0.0; | |
- sim.nz = 100; | |
+ sim.nz = 100; | |
- /* lower values of A mean that the velocity curve can have sharper curves, | |
- * e.g. at the transition from μ ≈ μ_s */ | |
- sim.A = 0.40; /* Loose fit to Damsgaard et al 2013 */ | |
+ /* lower values of A mean that the velocity curve can have sharper cur… | |
+ * e.g. at the transition from μ ≈ μ_s */ | |
+ sim.A = 0.40; /* Loose fit to Damsgaard et al 2013 */ | |
- /* lower values of b mean larger shear velocity for a given stress ratio | |
- * above yield */ | |
- sim.b = 0.9377; /* Henann and Kamrin 2016 */ | |
+ /* lower values of b mean larger shear velocity for a given stress rat… | |
+ * above yield */ | |
+ sim.b = 0.9377; /* Henann and Kamrin 2016 */ | |
- sim.mu_s = atan(DEG2RAD(22.0)); /* Damsgaard et al 2013 */ | |
- sim.C = 0.0; /* Damsgaard et al 2013 */ | |
+ /* Henann and Kamrin 2016 */ | |
+ /* sim.mu_s = 0.3819; */ | |
+ /* sim.C = 0.0; */ | |
- sim.phi = initval(0.25, 1); /* Damsgaard et al 2013 */ | |
+ /* Damsgaard et al 2013 */ | |
+ sim.mu_s = tan(DEG2RAD(22.0)); | |
+ sim.C = 0.0; | |
- /* lower values of d mean that the shear velocity curve can have sharper | |
- * curves, e.g. at the transition from μ ≈ μ_s */ | |
- sim.d = 0.04; /* Damsgaard et al 2013 */ | |
+ /* Iverson et al 1998: Storglaciaren till */ | |
+ /* sim.mu_s = tan(DEG2RAD(26.3)); */ | |
+ /* sim.C = 5.0e3; */ | |
- /* grain material density [kg/m^3] */ | |
- sim.rho_s = 2.6e3; /* Damsgaard et al 2013 */ | |
+ /* Iverson et al 1998: Two Rivers till */ | |
+ /* sim.mu_s = tan(DEG2RAD(17.8)); */ | |
+ /* sim.C = 14.0e3; */ | |
- /* spatial settings */ | |
- sim.origo_z = 0.0; | |
- sim.L_z = 0.7; /* Damsgaard et al 2013 */ | |
+ /* Tulaczyk et al 2000a: Upstream B till */ | |
+ /* sim.mu_s = tan(DEG2RAD(23.9)); */ | |
+ /* sim.C = 5.0e3; */ | |
- /* temporal settings */ | |
- sim.t = 0.0; | |
- sim.dt = 2.0; | |
- sim.t_end = 1.0; | |
- sim.file_dt = 0.1; | |
- sim.n_file = 0; | |
+ sim.phi = initval(0.25, 1); /* Damsgaard et al 2013 */ | |
- /* fluid settings */ | |
- sim.fluid = 0; | |
+ /* lower values of d mean that the shear velocity curve can have sharp… | |
+ * curves, e.g. at the transition from μ ≈ μ_s */ | |
+ sim.d = 0.04; /* Damsgaard et al 2013 */ | |
- sim.beta_f = 4.5e-10; /* Water, Goren et al 2011 */ | |
- sim.mu_f = 1e-3; /* Water, Goren et al 2011 */ | |
- sim.rho_f = 1e3; /* Water */ | |
- sim.k = initval(1.9e-15, 1); /* Damsgaard et al 2015 */ | |
+ /* grain material density [kg/m^3] */ | |
+ sim.rho_s = 2.6e3; /* Damsgaard et al 2013 */ | |
- /* no fluid-pressure variations */ | |
- sim.p_f_top = 0.0; | |
- sim.p_f_mod_ampl = 0.0; | |
- sim.p_f_mod_freq = 1.0; | |
- sim.p_f_mod_phase = 0.0; | |
+ /* spatial settings */ | |
+ sim.origo_z = 0.0; | |
+ sim.L_z = 0.7; /* Damsgaard et al 2013 */ | |
- return sim; | |
+ /* temporal settings */ | |
+ sim.t = 0.0; | |
+ sim.dt = 2.0; | |
+ sim.t_end = 1.0; | |
+ sim.file_dt = 0.1; | |
+ sim.n_file = 0; | |
+ | |
+ /* fluid settings */ | |
+ sim.fluid = 0; | |
+ | |
+ sim.beta_f = 4.5e-10; /* Water, Goren et al 2011 */ | |
+ sim.mu_f = 1e-3; /* Water, Goren et al 2011 */ | |
+ sim.rho_f = 1e3; /* Water */ | |
+ sim.k = initval(1.9e-15, 1); /* Damsgaard et al 2015 */ | |
+ | |
+ /* no fluid-pressure variations */ | |
+ sim.p_f_top = 0.0; | |
+ sim.p_f_mod_ampl = 0.0; | |
+ sim.p_f_mod_freq = 1.0; | |
+ sim.p_f_mod_phase = 0.0; | |
+ | |
+ return sim; | |
} | |
#endif |