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

Stephane Popinet s.popinet at niwa.co.nz
Fri May 15 02:51:57 UTC 2009


The following commit has been merged in the upstream branch:
commit 54fd5d61733de2829944e5465678a707a21c8348
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Mon Jun 13 15:26:29 2005 +1000

    "S" is a derived macro for solid area
    
    darcs-hash:20050613052629-fbd8f-68736e6c78af115706ca5f65a1c31f6d15a1d5fa.gz

diff --git a/src/utils.c b/src/utils.c
index a84c8fb..98c6f1e 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -59,6 +59,13 @@ static gdouble cell_fraction (FttCell * cell)
   return GFS_IS_MIXED (cell) ? GFS_STATE (cell)->solid->a : 1.;
 }
 
+static gdouble cell_solid_area (FttCell * cell)
+{
+  FttVector n;
+  gfs_solid_normal (cell, &n);
+  return sqrt (n.x*n.x + n.y*n.y + n.z*n.z);
+}
+
 GfsDerivedVariable gfs_derived_variable[] = {
   { "Vorticity",  gfs_vorticity },
   { "Divergence", gfs_divergence },
@@ -66,6 +73,7 @@ GfsDerivedVariable gfs_derived_variable[] = {
   { "Velocity2",  gfs_velocity_norm2 },
   { "Level",      cell_level },
   { "A",          cell_fraction },
+  { "S",          cell_solid_area },
   { "Lambda2",    gfs_velocity_lambda2 },
   { "Curvature",  gfs_streamline_curvature },
   { NULL, NULL}

-- 
Gerris Flow Solver



More information about the debian-science-commits mailing list