Changeset 3968

Timestamp:

05/27/10 10:43:40 (15 years ago)

Author:

Mathieu Morlighem

Message:

moved some Dataset methods to modules

Location:

issm/trunk/src/c

Files:

• DataSet/DataSet.cpp (modified) (1 diff)
• DataSet/DataSet.h (modified) (1 diff)
• modules/SurfaceAreax/SurfaceAreax.cpp (modified) (2 diffs)

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

@@ -1197 +1197 @@
 }
 /*}}}*/
-/*FUNCTION DataSet::SurfaceArea{{{1*/
-void  DataSet::SurfaceArea(double* pS,int analysis_type,int sub_analysis_type){
-
-        double S=0;
-
-        vector<Object*>::iterator object;
-        Element* element=NULL;
-
-        for ( object=objects.begin() ; object < objects.end(); object++ ){
-
-                if(EnumIsElement((*object)->Enum())){
-
-                        element=(Element*)(*object);
-                        S+=element->SurfaceArea(analysis_type,sub_analysis_type);
-
-                }
-        }
-
-        /*Assign output pointers:*/
-        *pS=S;
-
-}
-/*}}}*/
 /*FUNCTION DataSet::UpdateInputsFromSolution{{{1*/
 void  DataSet::UpdateInputsFromSolution(double* solution, int analysis_type, int sub_analysis_type){

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

@@ -81 +81 @@
                 void  MeltingConstraints(int* pconverged, int* pnum_unstable_constraints,int analysis_type,int sub_analysis_type);
                 DataSet* Copy(void);
-                void  SurfaceArea(double* pS, int analysis_type,int sub_analysis_type);
                 void  FieldAverageOntoVertices(Vec fieldsum,Vec connectivity,double* field);
                 void  FieldDepthAverageAtBase(Vec field,double* field_serial,char* fieldname);

issm/trunk/src/c/modules/SurfaceAreax/SurfaceAreax.cpp

@@ -13 +13 @@
                         int analysis_type,int sub_analysis_type){
         
+        /*Intermediary*/
+        Element* element=NULL;
+        int i;
+
         /*output: */
-        double S;
+        double S=0;
         double S_sum;
         
@@ -22 +26 @@
 
         /*Compute gradients: */
-        elements->SurfaceArea(&S,analysis_type,sub_analysis_type);
+        for (i=0;i<elements->Size();i++){
+                element=(Element*)elements->GetObjectByOffset(i);
+                S+=element->SurfaceArea(analysis_type,sub_analysis_type);
+        }
 
         /*Sum all J from all cpus of the cluster:*/