tUse SL code style for main.c - cngf-pf - continuum model for granular flows wi… | |
git clone git://src.adamsgaard.dk/cngf-pf | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 489d34f1e91fa232fb7ed8ecd3e4b33593bd624d | |
parent 115ee491c27fb352e64c6648b9c5bb2f9bbbce7d | |
Author: Anders Damsgaard <[email protected]> | |
Date: Fri, 28 Jun 2019 09:55:08 +0200 | |
Use SL code style for main.c | |
Diffstat: | |
M fluid.c | 5 ++++- | |
M main.c | 41 ++++++++++++++++++-----------… | |
2 files changed, 28 insertions(+), 18 deletions(-) | |
--- | |
diff --git a/fluid.c b/fluid.c | |
t@@ -88,7 +88,10 @@ darcy_solver_1d(struct simulation* sim, | |
{ | |
int i, iter; | |
double epsilon, theta, p_f, p_f_top, r_norm_max; | |
- double* dp_f_expl, dp_f_impl, p_f_ghost_out, r_norm; | |
+ double* dp_f_expl; | |
+ double* dp_f_impl; | |
+ double* p_f_ghost_out; | |
+ double* r_norm; | |
/* compute explicit solution to pressure change */ | |
dp_f_expl = zeros(sim->nz); | |
diff --git a/main.c b/main.c | |
t@@ -11,7 +11,8 @@ | |
#include "parameter_defaults.h" | |
-static void usage(void) | |
+static void | |
+usage(void) | |
{ | |
struct simulation sim = init_sim(); | |
printf("%s: %s [OPTIONS] [NAME]\n" | |
t@@ -77,7 +78,8 @@ static void usage(void) | |
free(sim.k); | |
} | |
-static void version(void) | |
+static void | |
+version(void) | |
{ | |
printf("%s v%s\n" | |
"Licensed under the GNU Public License, v3+\n" | |
t@@ -86,16 +88,21 @@ static void version(void) | |
, PROGNAME, VERSION); | |
} | |
-int main(int argc, char* argv[]) | |
+int | |
+main(int argc, char* argv[]) | |
{ | |
+ int normalize, opt, i; | |
+ struct simulation sim; | |
+ const char* optstring; | |
+ unsigned long iter; | |
+ double new_phi, new_k, filetimeclock, max_v_x; | |
/* load with default values */ | |
- struct simulation sim = init_sim(); | |
+ sim = init_sim(); | |
- int normalize = 0; | |
+ normalize = 0; | |
- int opt; | |
- const char* optstring = "hvNn:G:P:m:V:A:b:f:Fp:d:r:o:L:c:i:R:k:O:a:q:H… | |
+ optstring = "hvNn:G:P:m:V:A:b:f:Fp:d:r:o:L:c:i:R:k:O:a:q:H:t:T:D:I:"; | |
const struct option longopts[] = { | |
{"help", no_argument, NULL, 'h'}, | |
{"version", no_argument, NULL, 'v'}, | |
t@@ -128,8 +135,8 @@ int main(int argc, char* argv[]) | |
{NULL, 0, NULL, 0} | |
}; | |
- double new_phi = sim.phi[0]; | |
- double new_k = sim.k[0]; | |
+ new_phi = sim.phi[0]; | |
+ new_k = sim.k[0]; | |
while ((opt = getopt_long(argc, argv, optstring, longopts, NULL)) != -… | |
switch (opt) { | |
case -1: /* no more arguments */ | |
t@@ -231,7 +238,7 @@ int main(int argc, char* argv[]) | |
return -2; | |
} | |
} | |
- for (int i=optind; i<argc; ++i) { | |
+ for (i=optind; i<argc; ++i) { | |
if (i>optind) { | |
fprintf(stderr, | |
"error: more than one simulation name specifie… | |
t@@ -243,10 +250,10 @@ int main(int argc, char* argv[]) | |
prepare_arrays(&sim); | |
if (!isnan(new_phi)) | |
- for (int i=0; i<sim.nz; ++i) | |
+ for (i=0; i<sim.nz; ++i) | |
sim.phi[i] = new_phi; | |
if (!isnan(new_k)) | |
- for (int i=0; i<sim.nz; ++i) | |
+ for (i=0; i<sim.nz; ++i) | |
sim.k[i] = new_k; | |
lithostatic_pressure_distribution(&sim); | |
t@@ -263,8 +270,8 @@ int main(int argc, char* argv[]) | |
puts(""); | |
#endif | |
- double filetimeclock = 0.0; | |
- unsigned long iter = 0; | |
+ filetimeclock = 0.0; | |
+ iter = 0; | |
while (sim.t <= sim.t_end) { | |
if (sim.fluid) { | |
t@@ -306,13 +313,13 @@ int main(int argc, char* argv[]) | |
} | |
if (normalize) { | |
- double max_v_x = max(sim.v_x, sim.nz); | |
- for (int i=0; i<sim.nz; ++i) | |
+ max_v_x = max(sim.v_x, sim.nz); | |
+ for (i=0; i<sim.nz; ++i) | |
sim.v_x[i] /= max_v_x; | |
} | |
if (sim.fluid) | |
- for (int i=0; i<sim.nz; ++i) | |
+ for (i=0; i<sim.nz; ++i) | |
printf("%.17g\t%.17g\t%.17g\t%.17g\n", | |
sim.z[i], | |
sim.v_x[i], |