Changeset 13395 for issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp

Timestamp:

09/19/12 09:32:34 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13393

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (modified) (9 diffs)

issm/trunk

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

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

@@ -14 +14 @@
 
         int      i, migration_style,analysis_type;
-        double*  vertices_potentially_ungrounding = NULL;
-        double*  vertices_ungrounding             = NULL;
-        double*  old_floatingice                  = NULL;
-        Vector*      vec_old_floatingice              = NULL;
+        IssmDouble*  vertices_potentially_ungrounding = NULL;
+        IssmDouble*  vertices_ungrounding             = NULL;
+        IssmDouble*  old_floatingice                  = NULL;
+        Vector<IssmDouble>*      vec_old_floatingice              = NULL;
         Element* element                          = NULL;
         
@@ -27 +27 @@
 
         if(migration_style==NoneEnum) return;
-        if(migration_style!=AgressiveMigrationEnum && migration_style!=SoftMigrationEnum) _error2_(EnumToStringx(migration_style) << " not supported yet!");
+        if(migration_style!=AgressiveMigrationEnum && migration_style!=SoftMigrationEnum) _error_(EnumToStringx(migration_style) << " not supported yet!");
 
         if(migration_style==SoftMigrationEnum){
@@ -49 +49 @@
         /*free ressouces: */
         xdelete(&vec_old_floatingice);
-        xDelete<double>(vertices_potentially_ungrounding);
-        xDelete<double>(vertices_ungrounding);
-        xDelete<double>(old_floatingice);
+        xDelete<IssmDouble>(vertices_potentially_ungrounding);
+        xDelete<IssmDouble>(vertices_ungrounding);
+        xDelete<IssmDouble>(old_floatingice);
 }
 
 /*FUNCTION CreateNodesOnFloatingIce {{{*/
-Vector* CreateNodesOnFloatingIce(Nodes* nodes,int configuration_type){ 
+Vector<IssmDouble>* CreateNodesOnFloatingIce(Nodes* nodes,int configuration_type){ 
 
         int     i,numnods;
-        Vector*   vec_nodes_on_floatingice = NULL;
+        Vector<IssmDouble>*   vec_nodes_on_floatingice = NULL;
         Node *node                     = NULL;
 
         /*First, initialize nodes_on_floatingice, which will track which nodes have changed status: */
         numnods=nodes->NumberOfNodes(configuration_type);
-        vec_nodes_on_floatingice=new Vector(numnods);
+        vec_nodes_on_floatingice=new Vector<IssmDouble>(numnods);
 
         /*Loop through nodes, and fill vec_nodes_on_floatingice: */
@@ -82 +82 @@
 /*%}}}*/
 /*FUNCTION PotentialSheetUngrounding {{{*/
-double*    PotentialSheetUngrounding(Elements* elements,Vertices* vertices,Parameters* parameters){ 
+IssmDouble*    PotentialSheetUngrounding(Elements* elements,Vertices* vertices,Parameters* parameters){ 
 
         int      i,numberofvertices;
-        double*  vertices_potentially_ungrounding      = NULL;
-        Vector*      vec_vertices_potentially_ungrounding  = NULL;
+        IssmDouble*  vertices_potentially_ungrounding      = NULL;
+        Vector<IssmDouble>*      vec_vertices_potentially_ungrounding  = NULL;
         Element* element                               = NULL;
 
         /*Initialize vector with number of vertices*/
         numberofvertices=vertices->NumberOfVertices();
-        vec_vertices_potentially_ungrounding=new Vector(numberofvertices); //grounded vertex that could start floating
+        vec_vertices_potentially_ungrounding=new Vector<IssmDouble>(numberofvertices); //grounded vertex that could start floating
 
         /*Fill vector vertices_potentially_floating: */
@@ -109 +109 @@
 /*}}}*/
 /*FUNCTION PropagateFloatingiceToGroundedNeighbors {{{*/
-double*    PropagateFloatingiceToGroundedNeighbors(Elements* elements,Nodes* nodes,Vertices* vertices,Parameters* parameters,double* vertices_potentially_ungrounding){ 
+IssmDouble*    PropagateFloatingiceToGroundedNeighbors(Elements* elements,Nodes* nodes,Vertices* vertices,Parameters* parameters,IssmDouble* vertices_potentially_ungrounding){ 
 
         int      i,analysis_type;
         int      numberofvertices;
         int      nflipped,local_nflipped;
-        double*  nodes_on_floatingice                  = NULL;
-        double*  elements_neighboring_floatingce      = NULL;
-        Vector*      vec_elements_neighboring_floatingice = NULL;
-        Vector*      vec_nodes_on_floatingice              = NULL;
+        IssmDouble*  nodes_on_floatingice                  = NULL;
+        IssmDouble*  elements_neighboring_floatingce      = NULL;
+        Vector<IssmDouble>*      vec_elements_neighboring_floatingice = NULL;
+        Vector<IssmDouble>*      vec_nodes_on_floatingice              = NULL;
         Node*    node                                  = NULL;
         Element* element                               = NULL;
@@ -134 +134 @@
                 
                 /*Vector of size number of elements*/
-                vec_elements_neighboring_floatingice=new Vector(elements->NumberOfElements(),true);
+                vec_elements_neighboring_floatingice=new Vector<IssmDouble>(elements->NumberOfElements(),true);
 
                 /*Figure out if any of the nodes of the element will be floating -> elements neighbouting the floating ice*/
@@ -150 +150 @@
                 for(i=0;i<elements->Size();i++){
                         element=(Element*)elements->GetObjectByOffset(i);
-                        if(elements_neighboring_floatingce[element->Sid()]){
+                        if(reCast<int,IssmDouble>(elements_neighboring_floatingce[element->Sid()])){
                                 local_nflipped+=element->UpdatePotentialSheetUngrounding(vertices_potentially_ungrounding,vec_nodes_on_floatingice,nodes_on_floatingice);
                         }
@@ -164 +164 @@
 
                 /*Avoid leaks: */
-                xDelete<double>(elements_neighboring_floatingce);
-                xDelete<double>(nodes_on_floatingice);
+                xDelete<IssmDouble>(elements_neighboring_floatingce);
+                xDelete<IssmDouble>(nodes_on_floatingice);
 
                 /*Assemble and serialize:*/
@@ -174 +174 @@
         /*Free ressources:*/
         xdelete(&vec_nodes_on_floatingice);
-        xDelete<double>(elements_neighboring_floatingce);
+        xDelete<IssmDouble>(elements_neighboring_floatingce);
 
         return nodes_on_floatingice;

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4