tDeleted old header file with solver parameters, fixed failing io test - sphere - GPU-based 3D discrete element method algorithm with optional fluid coupling
(HTM) git clone git://src.adamsgaard.dk/sphere
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) LICENSE
---
(DIR) commit 92d726c70620bb1b7c33338f6f451374e7a6d0dc
(DIR) parent a256467760695524f2da99584b27f7a22c9adfe2
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Tue, 25 Mar 2014 14:55:43 +0100
Deleted old header file with solver parameters, fixed failing io test
Diffstat:
D src/navierstokes_solver_parameters… | 46 -------------------------------
M tests/io_tests_fluid.py | 5 ++++-
2 files changed, 4 insertions(+), 47 deletions(-)
---
(DIR) diff --git a/src/navierstokes_solver_parameters.h b/src/navierstokes_solver_parameters.h
t@@ -1,46 +0,0 @@
-#ifndef NAVIERSTOKES_SOLVER_PARAMETERS_H_
-#define NAVIERSTOKES_SOLVER_PARAMETERS_H_
-
-//// Parameters for the iterative Jacobi solver
-
-// Define `CFDDEMCOUPLING` in order to enable the two-way coupling between the
-// fluid and particle phase.
-#define CFDDEMCOUPLING
-
-// Solver parameter, used in velocity prediction and pressure iteration
-// 1.0: Use old pressures for fluid velocity prediction (see Langtangen et al.
-// 2002)
-// 0.0: Do not use old pressures for fluid velocity prediction (Chorin's
-// original projection method, see Chorin (1968) and "Projection method (fluid
-// dynamics)" page on Wikipedia.
-// The best results precision and performance-wise are obtained by using BETA=0
-// and a very low tolerance criteria value (e.g. 1.0e-9)
-//#define BETA 0.0
-
-// Under-relaxation parameter, used in solution of Poisson equation. The value
-// should be within the range ]0.0;1.0]. At a value of 1.0, the new estimate of
-// epsilon values is used exclusively. At lower values, a linear interpolation
-// between new and old values is used. The solution typically converges faster
-// with a value of 1.0, but instabilities may be avoided with lower values.
-//#define THETA 1.0
-
-// Smoothing parameter. The epsilon (pressure) values are smoothed by including
-// the average epsilon value of the six closest (face) neighbor cells. This
-// parameter should be in the range [0.0;1.0[. The higher the value, the more
-// averaging is introduced. A value of 0.0 disables all averaging.
-//#define GAMMA 0.5
-//#define GAMMA 0.0
-
-// Tolerance criteria for the normalized residual
-//const double tolerance = 1.0e-3;
-//const double tolerance = 1.0e-4;
-//const double tolerance = 1.0e-5;
-//const double tolerance = 1.0e-7;
-//const double tolerance = 1.0e-8;
-//const double tolerance = 1.0e-9;
-
-// The maximum number of iterations to perform
-//const unsigned int maxiter = 1e4;
-
-
-#endif
(DIR) diff --git a/tests/io_tests_fluid.py b/tests/io_tests_fluid.py
t@@ -12,7 +12,6 @@ orig.defaultParams()
orig.initRandomGridPos()
orig.initFluid()
orig.initTemporal(current=0.0, total=0.0)
-orig.g[2] = 0.0
orig.time_total=2.0*orig.time_dt
orig.time_file_dt = orig.time_dt
orig.writebin(verbose=False)
t@@ -34,6 +33,10 @@ cuda = sphere.sim(fluid=True)
cuda.readbin("../output/" + orig.sid + ".output00001.bin", verbose=False)
cuda.time_current = orig.time_current
cuda.time_step_count = orig.time_step_count
+compareNumpyArraysClose(orig.v_f, cuda.v_f, "cuda.v_f:", tolerance=1e-5)
+cuda.v_f = orig.v_f
+compareNumpyArraysClose(orig.p_f, cuda.p_f, "cuda.p_f:", tolerance=0.1)
+cuda.p_f = orig.p_f
compare(orig, cuda, "CUDA IO: ")
# Remove temporary files