From 5fcaf72a1feb25f61d6a7390a9d5dcbc77abe66c Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 28 Jan 2006 03:23:15 +0000
Subject: [PATCH] better averaging
---
Common/ViewsIO.cpp | 28 +++++++++++++++++++++-------
Plugin/ExtractElements.cpp | 30 ++++++++++++++++++++++--------
2 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/Common/ViewsIO.cpp b/Common/ViewsIO.cpp
index 0099d2d583..94920b2d33 100644
--- a/Common/ViewsIO.cpp
+++ b/Common/ViewsIO.cpp
@@ -1,4 +1,4 @@
-// $Id: ViewsIO.cpp,v 1.2 2006-01-28 00:58:25 geuzaine Exp $
+// $Id: ViewsIO.cpp,v 1.3 2006-01-28 03:23:15 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -645,12 +645,26 @@ static void get_nod(int nbelm, List_T *list, int nbnod, int nbcomp,
static void print_elm(FILE *file, int num, int nbnod, Nod nod[8],
int nbcomp, double *vals, int dim)
{
- // FIXME: implement a nice algo to assign regions based on the values!
- double avg = 0.;
- for(int i = 0; i < nbcomp*nbnod; i++)
- avg += vals[i];
- avg /= (double)(nbcomp*nbnod);
- int ele = (int)fabs(avg) + 1, phys = 1;
+ // compute average value in elm
+ double d = 0.;
+ for(int k = 0; k < nbnod; k++) {
+ double *v = &vals[nbcomp * k];
+ switch(nbcomp) {
+ case 1: // scalar
+ d += v[0];
+ break;
+ case 3 : // vector
+ d += sqrt(DSQR(v[0]) + DSQR(v[1]) + DSQR(v[2]));
+ break;
+ case 9 : // tensor
+ d += ComputeVonMises(v);
+ break;
+ }
+ }
+ d /= (double)nbnod;
+
+ // assign val as elementary region number
+ int ele = (int)fabs(d) + 1, phys = 1;
switch(dim){
case 0:
diff --git a/Plugin/ExtractElements.cpp b/Plugin/ExtractElements.cpp
index 5c2ce70fad..a7803a398a 100644
--- a/Plugin/ExtractElements.cpp
+++ b/Plugin/ExtractElements.cpp
@@ -1,4 +1,4 @@
-// $Id: ExtractElements.cpp,v 1.2 2006-01-28 01:44:11 geuzaine Exp $
+// $Id: ExtractElements.cpp,v 1.3 2006-01-28 03:23:15 geuzaine Exp $
//
// Copyright (C) 1997-2006 C. Geuzaine, J.-F. Remacle
//
@@ -90,13 +90,27 @@ static void extract(List_T *inList, int inNb,
int nb = List_Nbr(inList) / inNb;
for(int i = 0; i < List_Nbr(inList); i += nb) {
- double *val = (double *)List_Pointer_Fast(inList, i + 3 * nbNod +
- timeStep * nbNod * nbComp);
- double v = 0.;
- for(int j = 0; j < nbNod*nbComp; j++)
- v += val[j];
- v /= (double)(nbNod*nbComp);
- if(v >= MinVal && v < MaxVal){
+ double *vals = (double *)List_Pointer_Fast(inList, i + 3 * nbNod +
+ timeStep * nbNod * nbComp);
+ double d = 0.;
+ for(int k = 0; k < nbNod; k++) {
+ double *v = &vals[nbComp * k];
+ switch(nbComp) {
+ case 1: // scalar
+ d += v[0];
+ break;
+ case 3 : // vector
+ d += sqrt(DSQR(v[0]) + DSQR(v[1]) + DSQR(v[2]));
+ break;
+ case 9 : // tensor
+ d += ComputeVonMises(v);
+ break;
+ }
+ }
+ d /= (double)nbNod;
+ // '<=' and '<' so that we can do segmentation without playing
+ // without worrying about roudoff errors
+ if(d >= MinVal && d < MaxVal){
for(int j = 0; j < nb; j++)
List_Add(outList, List_Pointer_Fast(inList, i + j));
(*outNb)++;
--
GitLab