Changeset 17686 for issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp

Timestamp:

04/08/14 20:39:20 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: following Chris' suggestions, we adopt the following convention
md.mesh.dimension -> DomainDimensionEnum
md.mesh.domaintype ->DomainTypeEnum
md.mesh.elementtype->MeshElementtypeEnum

File:

• issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (modified) (12 diffs)

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

@@ -7 +7 @@
 
 /*Model processing*/
-int  HydrologyDCInefficientAnalysis::DofsPerNode(int** doflist,int meshxdim,int approximation){/*{{{*/
+int  HydrologyDCInefficientAnalysis::DofsPerNode(int** doflist,int domaintype,int approximation){/*{{{*/
         return 1;
 }/*}}}*/
@@ -88 +88 @@
         iomodel->FetchDataToInput(elements,SedimentHeadEnum);
         iomodel->FetchDataToInput(elements,HydrologydcSedimentTransmitivityEnum);
-        if(iomodel->meshxdim==Mesh3DEnum) iomodel->FetchDataToInput(elements,MeshElementonbaseEnum);
+        if(iomodel->domaintype==Mesh3DEnum) iomodel->FetchDataToInput(elements,MeshElementonbaseEnum);
 
         if(isefficientlayer)iomodel->FetchDataToInput(elements,HydrologydcMaskEplactiveNodeEnum);
@@ -101 +101 @@
         if(hydrology_model!=HydrologydcEnum) return;
 
-        if(iomodel->meshxdim!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum);
+        if(iomodel->domaintype!=Mesh2DhorizontalEnum) iomodel->FetchData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum);
         ::CreateNodes(nodes,iomodel,HydrologyDCInefficientAnalysisEnum,P1Enum);
         iomodel->DeleteData(2,MeshVertexonbaseEnum,MeshVertexonsurfaceEnum);
@@ -121 +121 @@
         if(hydrology_model!=HydrologydcEnum) return;
 
-        if(iomodel->meshxdim==Mesh3DEnum) iomodel->FetchData(1,MeshVertexonbaseEnum);
+        if(iomodel->domaintype==Mesh3DEnum) iomodel->FetchData(1,MeshVertexonbaseEnum);
 
         //create penalties for nodes: no node can have water above the max
         CreateSingleNodeToElementConnectivity(iomodel);
         for(int i=0;i<iomodel->numberofvertices;i++){
-                if (iomodel->meshxdim!=Mesh3DEnum){
+                if (iomodel->domaintype!=Mesh3DEnum){
                         /*keep only this partition's nodes:*/
                         if(iomodel->my_vertices[i]){
@@ -155 +155 @@
 
         /*Intermediaries*/
-        int      meshxdim;
+        int      domaintype;
         Element* basalelement;
 
         /*Get basal element*/
-        element->FindParam(&meshxdim,MeshXDimEnum);
-        switch(meshxdim){
+        element->FindParam(&domaintype,DomainTypeEnum);
+        switch(domaintype){
                 case Mesh2DhorizontalEnum:
                         basalelement = element;
@@ -168 +168 @@
                         basalelement = element->SpawnBasalElement();
                         break;
-                default: _error_("mesh "<<EnumToStringx(meshxdim)<<" not supported yet");
+                default: _error_("mesh "<<EnumToStringx(domaintype)<<" not supported yet");
         }
 
@@ -254 +254 @@
         xDelete<IssmDouble>(basis);
         delete gauss;
-        if(meshxdim!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
+        if(domaintype!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
         return Ke;
 }/*}}}*/
@@ -260 +260 @@
 
         /*Intermediaries*/
-        int      meshxdim;
+        int      domaintype;
         Element* basalelement;
 
         /*Get basal element*/
-        element->FindParam(&meshxdim,MeshXDimEnum);
-        switch(meshxdim){
+        element->FindParam(&domaintype,DomainTypeEnum);
+        switch(domaintype){
                 case Mesh2DhorizontalEnum:
                         basalelement = element;
@@ -273 +273 @@
                         basalelement = element->SpawnBasalElement();
                         break;
-                default: _error_("mesh "<<EnumToStringx(meshxdim)<<" not supported yet");
+                default: _error_("mesh "<<EnumToStringx(domaintype)<<" not supported yet");
         }
 
@@ -357 +357 @@
         xDelete<IssmDouble>(basis);
         delete gauss;
-        if(meshxdim!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
+        if(domaintype!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
         return pe;
 }/*}}}*/
@@ -392 +392 @@
 void HydrologyDCInefficientAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/
 
-        int        meshxdim;
+        int        domaintype;
         bool       converged;
         int*       doflist=NULL;
         Element*   basalelement=NULL;
 
-        element->FindParam(&meshxdim,MeshXDimEnum);
-        if(meshxdim!=Mesh2DhorizontalEnum){
+        element->FindParam(&domaintype,DomainTypeEnum);
+        if(domaintype!=Mesh2DhorizontalEnum){
                 if(!element->IsOnBase()) return;
                 basalelement=element->SpawnBasalElement();
@@ -446 +446 @@
         xDelete<IssmDouble>(residual);
         xDelete<int>(doflist);
-        if(meshxdim!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
+        if(domaintype!=Mesh2DhorizontalEnum){basalelement->DeleteMaterials(); delete basalelement;};
 }/*}}}*/
 void HydrologyDCInefficientAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/