Changeset 15387 for issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

Timestamp:

07/02/13 08:01:44 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing compilation: AverageOntoPartitionx should be if HAVE_RESPONSE

File:

• issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -2316 +2316 @@
 
 #ifdef _HAVE_RESPONSES_
+/*FUNCTION Tria::AverageOntoPartition {{{*/
+void  Tria::AverageOntoPartition(Vector<IssmDouble>* partition_contributions,Vector<IssmDouble>* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part){
+
+        bool       already = false;
+        int        i,j;
+        int        partition[NUMVERTICES];
+        int        offsetsid[NUMVERTICES];
+        int        offsetdof[NUMVERTICES];
+        IssmDouble area;
+        IssmDouble mean;
+
+        /*First, get the area: */
+        area=this->GetArea();
+
+        /*Figure out the average for this element: */
+        this->GetVertexSidList(&offsetsid[0]);
+        this->GetVertexPidList(&offsetdof[0]);
+        mean=0;
+        for(i=0;i<NUMVERTICES;i++){
+                partition[i]=reCast<int>(qmu_part[offsetsid[i]]);
+                mean=mean+1.0/NUMVERTICES*vertex_response[offsetdof[i]];
+        }
+
+        /*Add contribution: */
+        for(i=0;i<NUMVERTICES;i++){
+                already=false;
+                for(j=0;j<i;j++){
+                        if (partition[i]==partition[j]){
+                                already=true;
+                                break;
+                        }
+                }
+                if(!already){
+                        partition_contributions->SetValue(partition[i],mean*area,ADD_VAL);
+                        partition_areas->SetValue(partition[i],area,ADD_VAL);
+                };
+        }
+}
+/*}}}*/
 /*FUNCTION Tria::IceVolume {{{*/
 IssmDouble Tria::IceVolume(void){
@@ -7028 +7067 @@
 /*}}}*/
 #endif
-
-#ifdef _HAVE_WRAPPERS_
-/*FUNCTION Tria::AverageOntoPartition {{{*/
-void  Tria::AverageOntoPartition(Vector<IssmDouble>* partition_contributions,Vector<IssmDouble>* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part){
-
-        bool       already = false;
-        int        i,j;
-        int        partition[NUMVERTICES];
-        int        offsetsid[NUMVERTICES];
-        int        offsetdof[NUMVERTICES];
-        IssmDouble area;
-        IssmDouble mean;
-
-        /*First, get the area: */
-        area=this->GetArea();
-
-        /*Figure out the average for this element: */
-        this->GetVertexSidList(&offsetsid[0]);
-        this->GetVertexPidList(&offsetdof[0]);
-        mean=0;
-        for(i=0;i<NUMVERTICES;i++){
-                partition[i]=reCast<int>(qmu_part[offsetsid[i]]);
-                mean=mean+1.0/NUMVERTICES*vertex_response[offsetdof[i]];
-        }
-
-        /*Add contribution: */
-        for(i=0;i<NUMVERTICES;i++){
-                already=false;
-                for(j=0;j<i;j++){
-                        if (partition[i]==partition[j]){
-                                already=true;
-                                break;
-                        }
-                }
-                if(!already){
-                        partition_contributions->SetValue(partition[i],mean*area,ADD_VAL);
-                        partition_areas->SetValue(partition[i],area,ADD_VAL);
-                };
-        }
-}
-/*}}}*/
-#endif