Changeset 347

Timestamp:

05/12/09 09:58:13 (16 years ago)

Author:

Eric.Larour

Message:

Collapsed surface and bed slope computations into one

Location:

issm/trunk/src/c/ModelProcessorx

Files:

• DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp (modified) (7 diffs)
• Model.cpp (modified) (1 diff)
• SlopeCompute (moved) (moved from issm/trunk/src/c/ModelProcessorx/BedSlopeCompute )
• SurfaceSlopeCompute (deleted)

issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp

@@ -147 +147 @@
         materials = new DataSet(MaterialsEnum());
 
+
         /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */
         if (!model->ismacayealpattyn)goto cleanup_and_return;
@@ -153 +154 @@
         analysis_type=AnalysisTypeAsEnum(model->analysis_type);
 
+        
         /*Width of elements: */
         if(strcmp(model->meshtype,"2d")==0){
@@ -160 +162 @@
                 elements_width=6; //penta elements
         }
+
 
 
@@ -173 +176 @@
         }
 
+
         MeshPartitionx(&epart, &npart,model->numberofelements,model->numberofnodes,model->elements, model->numberofelements2d,model->numberofnodes2d,model->elements2d,model->numlayers,elements_width, model->meshtype,num_procs);
 
@@ -178 +182 @@
         xfree((void**)&model->elements);
         xfree((void**)&model->elements2d);
-                
+
 
         /*Deal with rifts, they have to be included into one partition only, not several: */
@@ -337 +341 @@
                 xfree((void**)&model->B);
                 xfree((void**)&model->n);
+
         }
         else{ //        if (strcmp(meshtype,"2d")==0)
@@ -563 +568 @@
         ModelFetchData((void**)&model->gridonsurface,NULL,NULL,model_handle,"gridonsurface","Matrix","Mat");
 
-        
+
         /*Get number of dofs per node: */
         DistributeNumDofs(&node_numdofs,analysis_type);

issm/trunk/src/c/ModelProcessorx/Model.cpp

@@ -277 +277 @@
 
         ModelFetchData((void**)&model->meshtype,NULL,NULL,model_handle,"type","String",NULL);
-
         /*!Get numberofelements and numberofnodes: */
         ModelFetchData((void**)&model->numberofnodes,NULL,NULL,model_handle,"numberofgrids","Integer",NULL);