tuse hardcoded limits for fluid time step - 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 a911141e8df42ba8a6b2be040a989889cbd93a96
 (DIR) parent 506beb30a646e4f173f393bf18dc80f5c20e7d19
 (HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
       Date:   Thu,  6 Nov 2014 11:15:05 +0100
       
       use hardcoded limits for fluid time step
       
       Diffstat:
         M python/sphere.py                    |       7 +++++--
         M src/darcy.cuh                       |       4 ++--
       
       2 files changed, 7 insertions(+), 4 deletions(-)
       ---
 (DIR) diff --git a/python/sphere.py b/python/sphere.py
       t@@ -2783,8 +2783,11 @@ class sim:
                        # Determine on the base of the diffusivity coefficient
                        # components
                        self.cellSize()
       -                self.hydraulicPermeability()
       -                alpha_max = numpy.max(self.k/(self.beta_f*0.9*self.mu))
       +                #self.hydraulicPermeability()
       +                #alpha_max = numpy.max(self.k/(self.beta_f*0.9*self.mu))
       +                k_max = 2.7e-8   # hardcoded
       +                phi_min = 0.1    # hardcoded
       +                alpha_max = k_max/(self.beta_f*phi_min*self.mu)
                        return safety * 1.0/(2.0*alpha_max)*1.0/(
                                1.0/(self.dx[0]**2) + \
                                1.0/(self.dx[1]**2) + \
 (DIR) diff --git a/src/darcy.cuh b/src/darcy.cuh
       t@@ -378,7 +378,7 @@ __global__ void findDarcyPorosities(
                    //}
        
                    // Make sure that the porosity is in the interval [0.0;1.0]
       -            phi = fmin(0.99, fmax(0.01, void_volume/cell_volume));
       +            phi = fmin(0.9, fmax(0.1, void_volume/cell_volume));
                    //phi = void_volume/cell_volume;
        
                    Float dphi = phi - phi_0;
       t@@ -642,7 +642,7 @@ __global__ void findDarcyPermeabilities(
        
                // limit permeability [m*m]
                // K_gravel = 3.0e-2 m/s => k_gravel = 2.7e-9 m*m
       -        k = fmin(2.7e-9, k);
       +        k = fmin(2.7e-8, k);
        
                __syncthreads();
                dev_darcy_k[cellidx] = k;