Changeset 3372

Timestamp:

04/01/10 14:47:39 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added FieldAverageOntoVertices, to be completed

Location:

issm/trunk/src

Files:

• c/DataSet/DataSet.cpp (modified) (1 diff)
• c/DataSet/DataSet.h (modified) (1 diff)
• c/FieldAverageOntoVerticesx (added)
• c/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp (added)
• c/FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h (added)
• c/Makefile.am (modified) (2 diffs)
• c/issm.h (modified) (1 diff)
• c/objects/Node.cpp (modified) (1 diff)
• c/objects/Node.h (modified) (1 diff)
• m/solutions/jpl/prognostic2_core.m (modified) (1 diff)
• mex/FieldAverageOntoVertices (added)
• mex/FieldAverageOntoVertices/FieldAverageOntoVertices.cpp (added)
• mex/FieldAverageOntoVertices/FieldAverageOntoVertices.h (added)
• mex/Makefile.am (modified) (7 diffs)

issm/trunk/src/c/DataSet/DataSet.cpp

@@ -1087 +1087 @@
         }
 
+
+}
+/*}}}*/
+/*FUNCTION DataSet::FieldAverageOntoVertices{{{1*/
+void  DataSet::FieldAverageOntoVertices(Vec field,double* field_serial,char* fieldname){
+
+        vector<Object*>::iterator object;
+        Node* node=NULL;
+
+        for ( object=objects.begin() ; object < objects.end(); object++ ){
+
+                if((*object)->Enum()==NodeEnum()){
+                        node=(Node*)(*object);
+                        node->FieldAverageOntoVertices(field,field_serial,fieldname);
+                }
+
+        }
 
 }

issm/trunk/src/c/DataSet/DataSet.h

@@ -84 +84 @@
                 void  CostFunction(double* pJ, void* inputs,int analysis_type,int sub_analysis_type);
                 void  SurfaceArea(double* pS, void* inputs,int analysis_type,int sub_analysis_type);
+                void  FieldAverageOntoVertices(Vec field,double* field_serial,char* fieldname);
                 void  FieldDepthAverageAtBase(Vec field,double* field_serial,char* fieldname);
                 int   DeleteObject(Object* object);

issm/trunk/src/c/Makefile.am

@@ -329 +329 @@
                                         ./Qmux/SpawnCore.cpp\
                                         ./Qmux/SpawnCoreSerial.cpp\
+                                        ./FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp\
+                                        ./FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h\
                                         ./FieldDepthAveragex/FieldDepthAveragex.cpp\
                                         ./FieldDepthAveragex/FieldDepthAveragex.h\
@@ -705 +707 @@
                                         ./Qmux/SpawnCore.cpp\
                                         ./Qmux/SpawnCoreParallel.cpp\
+                                        ./FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.cpp\
+                                        ./FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h\
                                         ./FieldDepthAveragex/FieldDepthAveragex.cpp\
                                         ./FieldDepthAveragex/FieldDepthAveragex.h\

issm/trunk/src/c/issm.h

@@ -56 +56 @@
 #include "./CostFunctionx/CostFunctionx.h"
 #include "./ControlConstrainx/ControlConstrainx.h"
+#include "./FieldAverageOntoVerticesx/FieldAverageOntoVerticesx.h"
 #include "./FieldDepthAveragex/FieldDepthAveragex.h"
 #include "./ComputePressurex/ComputePressurex.h"

issm/trunk/src/c/objects/Node.cpp

@@ -406 +406 @@
 }
 /*}}}*/
+/*FUNCTION Node FieldAverageOntoVertices{{{1*/
+void  Node::FieldAverageOntoVertices(Vec field,double* field_serial,char* fieldname){
+
+        ISSMERROR("NOT SUPPORTED YET"); // we need the vertex number !
+}
+/*}}}*/
 /*FUNCTION Node FieldDepthAverageAtBase{{{1*/
 void  Node::FieldDepthAverageAtBase(Vec field,double* field_serial,char* fieldname){

issm/trunk/src/c/objects/Node.h

@@ -83 +83 @@
                 int   IsOnSurface();
                 void  FreezeDof(int dof);
+                void  FieldAverageOntoVertices(Vec field,double* field_serial,char* fieldname);
                 void  FieldDepthAverageAtBase(Vec field,double* field_serial,char* fieldname);
                 int   IsOnShelf();

issm/trunk/src/m/solutions/jpl/prognostic2_core.m

@@ -23 +23 @@
 
         displaystring(m.parameters.verbose,'\n%s',['extrude computed thickness on all layers:']);
-%       results.h_g=FieldExtrude(m.elements,m.nodes,m.loads,m.materials,m.parameters,results.h_g,'thickness',0);
+        results.h_g=FieldAverageOntoVertices(m.elements,m.nodes,m.loads,m.materials,m.parameters,results.h_g,'thickness');
 
 end %end function

issm/trunk/src/mex/Makefile.am

@@ -5 +5 @@
 bin_PROGRAMS = 
 else
-bin_PROGRAMS =  BuildNodeSets\
+bin_PROGRAMS = AverageFilter\
                                 Bamg\
                                 BamgConvertMesh\
+                                BuildNodeSets\
                                 ComputePressure\
                                 ConfigureObjects \
@@ -19 +20 @@
                                 Echo\
                                 ElementConnectivity\
+                                FieldAverageOntoVertices\
+                                FieldDepthAverage\
+                                FieldExtrude\
                                 Gradj\
                                 HoleFiller \
@@ -25 +29 @@
                                 InterpFromMeshToMesh3d \
                                 InterpFromMeshToGrid \
-                                AverageFilter\
                                 MassFlux\
                                 Mergesolutionfromftog\
@@ -50 +53 @@
                                 SystemMatrices\
                                 Test\
-                                FieldExtrude\
                                 TriMesh\
                                 TriMeshNoDensity\
@@ -57 +59 @@
                                 UpdateFromInputs\
                                 UpdateNodePositions\
-                                UpdateGeometry\
-                                FieldDepthAverage
+                                UpdateGeometry
 
 endif
@@ -125 +126 @@
                           ElementConnectivity/ElementConnectivity.h
 
+FieldAverageOntoVertices_SOURCES = FieldAverageOntoVertices/FieldAverageOntoVertices.cpp\
+                                                                         FieldAverageOntoVertices/FieldAverageOntoVertices.h
+
+FieldDepthAverage_SOURCES = FieldDepthAverage/FieldDepthAverage.cpp\
+                          FieldDepthAverage/FieldDepthAverage.h
+
 Gradj_SOURCES = Gradj/Gradj.cpp\
                           Gradj/Gradj.h
@@ -242 +249 @@
                           UpdateNodePositions/UpdateNodePositions.h
 
-FieldDepthAverage_SOURCES = FieldDepthAverage/FieldDepthAverage.cpp\
-                          FieldDepthAverage/FieldDepthAverage.h