Changeset 19744 for issm/trunk-jpl/src/c/analyses/HydrologySommersAnalysis.cpp

Timestamp:

11/17/15 16:10:39 (9 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added discrete moulins to hydrology model

File:

• issm/trunk-jpl/src/c/analyses/HydrologySommersAnalysis.cpp (modified) (2 diffs)

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

@@ -22 +22 @@
 }/*}}}*/
 void HydrologySommersAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/
-        /*No loads*/
+
+        /*Fetch parameters: */
+        int  hydrology_model;
+        iomodel->Constant(&hydrology_model,HydrologyModelEnum);
+
+        /*Now, do we really want Sommers?*/
+        if(hydrology_model!=HydrologysommersEnum) return;
+
+        //create penalties for nodes: no node can have water above the max
+        CreateSingleNodeToElementConnectivity(iomodel);
+        for(int i=0;i<iomodel->numberofvertices;i++){
+                if (iomodel->domaintype!=Domain3DEnum){
+                        /*keep only this partition's nodes:*/
+                        if(iomodel->my_vertices[i]){
+                                loads->AddObject(new Moulin(iomodel->loadcounter+i+1,i,iomodel,HydrologySommersAnalysisEnum));
+                        }
+                }
+                else if(reCast<int>(iomodel->Data(MeshVertexonbaseEnum)[i])){
+                        if(iomodel->my_vertices[i]){
+                                loads->AddObject(new Moulin(iomodel->loadcounter+i+1,i,iomodel,HydrologySommersAnalysisEnum));
+                        }       
+                }
+        }
+        iomodel->DeleteData(1,MeshVertexonbaseEnum);
+
 }/*}}}*/
 void HydrologySommersAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
@@ -72 +96 @@
         iomodel->FetchDataToInput(elements,HydrologyGapHeightEnum);
         iomodel->FetchDataToInput(elements,HydrologyEnglacialInputEnum);
+        iomodel->FetchDataToInput(elements,HydrologyMoulinInputEnum);
         iomodel->FetchDataToInput(elements,HydrologyBumpSpacingEnum);
         iomodel->FetchDataToInput(elements,HydrologyBumpHeightEnum);