Changeset 17428

Timestamp:

03/12/14 16:12:07 (11 years ago)

Author:

jbondzio

Message:

CHG: PVector for spawned basal element; minor cleanup

File:

• issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.cpp

@@ -28 +28 @@
                         counter++;
                 }
+        }
+        
+        if(iomodel->meshtype==Mesh3DEnum){
+                iomodel->FetchDataToInput(elements,MeshElementonbedEnum);
         }
 }
@@ -199 +203 @@
         }/*}}}*/
 
-        //TESTING
-        _printf_("in element: " << basalelement->Id() << "\n");
-        Ke->Echo();
-
         /*Clean up and return*/
         xDelete<IssmDouble>(xyz_list);
@@ -209 +209 @@
         xDelete<IssmDouble>(dlsf);
         xDelete<IssmDouble>(normal);
+        if(meshtype!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
         delete gauss;
         return Ke;
@@ -219 +220 @@
 
         /*Intermediaries */
-        int i;
+        int i, meshtype;
         
         /*Fetch number of nodes */
         int numnodes = basalelement->GetNumberOfNodes();
+        basalelement->FindParam(&meshtype,MeshTypeEnum);
 
         /*Initialize Element vector*/
@@ -228 +230 @@
         for(i=0;i<numnodes;i++) 
                 pe->values[i]=0.; 
+        if(meshtype!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
         return pe;
 }/*}}}*/