Changeset 15387

Timestamp:

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

Author:

Mathieu Morlighem

Message:

BUG: fixing compilation: AverageOntoPartitionx should be if HAVE_RESPONSE

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Element.h (modified) (2 diffs)
• Penta.cpp (modified) (5 diffs)
• Penta.h (modified) (2 diffs)
• Tria.cpp (modified) (2 diffs)
• Tria.h (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Elements/Element.h ¶

@@ -84 +84 @@
 
                 #ifdef _HAVE_RESPONSES_
+                virtual void   AverageOntoPartition(Vector<IssmDouble>* partition_contributions,Vector<IssmDouble>* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part)=0;
                 virtual void   MinVel(IssmDouble* pminvel)=0;
                 virtual void   MaxVel(IssmDouble* pmaxvel)=0;
@@ -140 +141 @@
                 #endif
 
-                #ifdef _HAVE_WRAPPERS_
-                virtual void   AverageOntoPartition(Vector<IssmDouble>* partition_contributions,Vector<IssmDouble>* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part)=0;
-                #endif
-
 };
 #endif

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp ¶

@@ -3121 +3121 @@
 
 #ifdef _HAVE_RESPONSES_
+/*FUNCTION Penta::AverageOntoPartition {{{*/
+void  Penta::AverageOntoPartition(Vector<IssmDouble>* partition_contributions,Vector<IssmDouble>* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part){
+        _error_("Not supported yet!");
+}
+/*}}}*/
 /*FUNCTION Penta::IceVolume {{{*/
 IssmDouble Penta::IceVolume(void){
@@ -9110 +9115 @@
 /*}}}*/
 #endif
+
 #ifdef _HAVE_BALANCED_
 /*FUNCTION Penta::CreateKMatrixBalancethickness {{{*/
@@ -9159 +9165 @@
 /*}}}*/
 #endif
+
 #ifdef _HAVE_HYDROLOGY_
-
 /*FUNCTION Penta::CreateKMatrixHydrologyDCInefficient {{{*/
 ElementMatrix* Penta::CreateKMatrixHydrologyDCInefficient(void){
@@ -9465 +9471 @@
 }
 /*}}}*/
-#endif
-
-#ifdef _HAVE_WRAPPERS_
 /*FUNCTION Penta::PotentialUngrounding{{{*/
 void  Penta::PotentialUngrounding(Vector<IssmDouble>* potential_ungrounding){
@@ -9496 +9499 @@
 }
 /*}}}*/
-/*FUNCTION Penta::AverageOntoPartition {{{*/
-void  Penta::AverageOntoPartition(Vector<IssmDouble>* partition_contributions,Vector<IssmDouble>* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part){
-        _error_("Not supported yet!");
-}
-/*}}}*/
 /*FUNCTION Penta::UpdatePotentialUngrounding{{{*/
 int Penta::UpdatePotentialUngrounding(IssmDouble* vertices_potentially_ungrounding,Vector<IssmDouble>* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf){

issm/trunk-jpl/src/c/classes/Elements/Penta.h ¶

@@ -120 +120 @@
 
                  #ifdef _HAVE_RESPONSES_
+                void   AverageOntoPartition(Vector<IssmDouble>* partition_contributions,Vector<IssmDouble>* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part);
                 IssmDouble IceVolume(void);
                 IssmDouble TotalSmb(void);
@@ -174 +175 @@
                 void   PotentialUngrounding(Vector<IssmDouble>* potential_sheet_ungrounding);
                 int    UpdatePotentialUngrounding(IssmDouble* potential_sheet_ungrounding,Vector<IssmDouble>* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf);
-                #endif
-
-                #ifdef _HAVE_WRAPPERS_
-                void   AverageOntoPartition(Vector<IssmDouble>* partition_contributions,Vector<IssmDouble>* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part);
                 #endif
 

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

issm/trunk-jpl/src/c/classes/Elements/Tria.h ¶

@@ -118 +118 @@
 
                 #ifdef _HAVE_RESPONSES_
+                void   AverageOntoPartition(Vector<IssmDouble>* partition_contributions,Vector<IssmDouble>* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part);
                 IssmDouble IceVolume(void);
                 IssmDouble TotalSmb(void);
@@ -176 +177 @@
                 void   MigrateGroundingLine(IssmDouble* oldfloating,IssmDouble* sheet_ungrounding);
                 int    UpdatePotentialUngrounding(IssmDouble* vertices_potentially_ungrounding,Vector<IssmDouble>* vec_nodes_on_iceshelf,IssmDouble* nodes_on_iceshelf);
-                #endif
-
-                #ifdef _HAVE_WRAPPERS_
-                void   AverageOntoPartition(Vector<IssmDouble>* partition_contributions,Vector<IssmDouble>* partition_areas,IssmDouble* vertex_response,IssmDouble* qmu_part);
                 #endif