Changeset 17610 for issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp

Timestamp:

03/31/14 16:43:09 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: renamed onbed -> onbase

File:

• issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp ¶

@@ -34 +34 @@
         iomodel->FetchDataToInput(elements,FrictionQEnum);
         iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
-        iomodel->FetchDataToInput(elements,MeshElementonbedEnum);
+        iomodel->FetchDataToInput(elements,MeshElementonbaseEnum);
         iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);
         iomodel->FetchDataToInput(elements,FlowequationElementEquationEnum);
@@ -44 +44 @@
 void MeltingAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
 
-        if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum);
+        if(iomodel->meshtype==Mesh3DEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum);
         ::CreateNodes(nodes,iomodel,MeltingAnalysisEnum,P1Enum);
-        iomodel->DeleteData(2,MeshVertexonbedEnum,MeshVertexonsurfaceEnum);
+        iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum);
 }/*}}}*/
 void MeltingAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
@@ -57 +57 @@
 
         //create penalties for nodes: no node can have a temperature over the melting point
-        iomodel->FetchData(1,MeshVertexonbedEnum);
+        iomodel->FetchData(1,MeshVertexonbaseEnum);
         CreateSingleNodeToElementConnectivity(iomodel);
 
         for(int i=0;i<iomodel->numberofvertices;i++){
                 if(iomodel->my_vertices[i]){
-                        if (reCast<int>(iomodel->Data(MeshVertexonbedEnum)[i])){
+                        if (reCast<int>(iomodel->Data(MeshVertexonbaseEnum)[i])){
                                 loads->AddObject(new Pengrid(iomodel->loadcounter+i+1,i,iomodel,MeltingAnalysisEnum));
                         }
                 }
         }
-        iomodel->DeleteData(1,MeshVertexonbedEnum);
+        iomodel->DeleteData(1,MeshVertexonbaseEnum);
 
 }/*}}}*/