[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

Stephane Popinet popinet at users.sf.net
Fri May 15 02:55:37 UTC 2009


The following commit has been merged in the upstream branch:
commit 100b43f83defd21cb72b3766aca96e246abd53fe
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Fri Jul 25 14:01:19 2008 +1000

    Fixed incorrect L-dimensioning of force output
    
    darcs-hash:20080725040119-d4795-de705d0a42d0372be854d3b093ad9e8c4d1e1ae5.gz

diff --git a/src/output.c b/src/output.c
index ae01e1d..b0b949a 100644
--- a/src/output.c
+++ b/src/output.c
@@ -946,7 +946,7 @@ static gboolean gfs_output_solid_force_event (GfsEvent * event,
     GfsDomain * domain = GFS_DOMAIN (sim);
     FILE * fp = GFS_OUTPUT (event)->file->fp;
     FttVector pf, vf, pm, vm;
-    gdouble L = sim->physical_params.L;
+    gdouble L = sim->physical_params.L, Ln = pow (L, 3. + FTT_DIMENSION - 2.);
 
     if (GFS_OUTPUT (event)->first_call)
       fputs ("# 1: T (2,3,4): Pressure force (5,6,7): Viscous force "
@@ -955,8 +955,8 @@ static gboolean gfs_output_solid_force_event (GfsEvent * event,
     gfs_domain_solid_force (domain, &pf, &vf, &pm, &vm);
     fprintf (fp, "%g %g %g %g %g %g %g %g %g %g %g %g %g\n",
 	     sim->time.t,
-	     pf.x*L, pf.y*L, pf.z*L,
-	     vf.x*L, vf.y*L, vf.z*L,
+	     pf.x*Ln, pf.y*Ln, pf.z*Ln,
+	     vf.x*Ln, vf.y*Ln, vf.z*Ln,
 	     pm.x, pm.y, pm.z,
 	     vm.x, vm.y, vm.z);
     return TRUE;

-- 
Gerris Flow Solver



More information about the debian-science-commits mailing list