tadd time factor - 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 f9d94ab1d001ee9827d0cb9ef9910c5b43d93f30
 (DIR) parent 05e481fc347acc1487d844d222d703a24f413b1c
 (HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
       Date:   Fri, 13 Feb 2015 15:05:14 +0100
       
       add time factor
       
       Diffstat:
         M python/halfshear-darcy-strength-di… |       1 +
         M python/halfshear-darcy-stress-mod-… |      10 ++++++----
       
       2 files changed, 7 insertions(+), 4 deletions(-)
       ---
 (DIR) diff --git a/python/halfshear-darcy-strength-dilation-rate.py b/python/halfshear-darcy-strength-dilation-rate.py
       t@@ -212,6 +212,7 @@ ax1.legend(loc='upper right', prop={'size':18}, fancybox=True,
        ax1.set_xlim([0.0, 0.2])
        ax1.set_ylim([-7, 45])
        ax2.set_xlim([0.0, 0.2])
       +ax2.set_ylim([0.0, 0.8])
        #ax1.set_ylim([0.0, 1.0])
        if pressures:
            #ax3.set_ylim([-1400, 900])
 (DIR) diff --git a/python/halfshear-darcy-stress-mod-starter.py b/python/halfshear-darcy-stress-mod-starter.py
       t@@ -4,7 +4,8 @@ import numpy
        import sys
        
        # launch with:
       -# $ ipython halfshear-darcy-stress-starter.py <device> <fluid> <c_phi> <k_c> <sigma_0> <mu> <shear_stress> <mod_A> <mod_f>
       +# $ ipython halfshear-darcy-stress-starter.py <device> <fluid> <c_phi> <k_c>
       +#     <sigma_0> <mu> <shear_stress> <mod_A> <mod_f> <timefactor>
        
        device = int(sys.argv[1])
        wet = int(sys.argv[2])
       t@@ -15,6 +16,7 @@ mu = float(sys.argv[6])
        shear_stress = float(sys.argv[7])
        mod_A = float(sys.argv[8])
        mod_f = float(sys.argv[9])
       +timefac = float(sys.argv[10])
        
        if wet == 1:
            fluid = True
       t@@ -61,7 +63,7 @@ if fluid:
            sim.setFluidCompressibility(1.0/K_w_sim)
            # the fluid modulation should be 180 degree out of phase with the wall
            # modulation
       -    sim.setFluidPressureModulation(A=mod_A, f=mod_f, phi=numpy.pi)
       +    sim.setFluidPressureModulation(A=mod_A, f=mod_f/timefac, phi=numpy.pi)
        
        sim.w_sigma0[0] = sigma0
        sim.w_m[0] = numpy.abs(sigma0*sim.L[0]*sim.L[1]/sim.g[2])
       t@@ -77,11 +79,11 @@ sim.setDampingTangential(0.0)
        #sim.deleteAllParticles()
        #sim.fixvel[:] = -1.0
        
       -sim.initTemporal(total = 20.0, file_dt = 0.01, epsilon=0.07)
       +sim.initTemporal(total = 20.0*timefac, file_dt = 0.01, epsilon=0.07)
        #sim.initTemporal(total = 20.0, file_dt = 0.00001, epsilon=0.07)
        #sim.time_dt[0] *= 1.0e-2
        #sim.initTemporal(total = 1.0e-4, file_dt = 1.0e-5, epsilon=0.07)
       -sim.setTopWallNormalStressModulation(A=mod_A, f=mod_f)
       +sim.setTopWallNormalStressModulation(A=mod_A, f=mod_f/timefac)
        
        # Fix lowermost particles
        #dz = sim.L[2]/sim.num[2]