Changeset 21203

Timestamp:

09/12/16 07:52:45 (9 years ago)

Author:

bdef

Message:

NEW:modification to shift Moulin input to EPL when opened

Location:

issm/trunk-jpl/src/c

Files:

• analyses/HydrologyDCEfficientAnalysis.cpp (modified) (1 diff)
• classes/Loads/Pengrid.cpp (modified) (2 diffs)
• classes/Loads/Pengrid.h (modified) (1 diff)

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

@@ -64 +64 @@
         iomodel->FetchDataToInput(elements,"md.initialization.sediment_head",SedimentHeadEnum);
         iomodel->FetchDataToInput(elements,"md.initialization.epl_thickness",HydrologydcEplThicknessEnum);
-                if(iomodel->domaintype!=Domain2DhorizontalEnum){
+        iomodel->FetchDataToInput(elements,"md.hydrology.basal_moulin_input",HydrologydcBasalMoulinInputEnum);
+        if(iomodel->domaintype!=Domain2DhorizontalEnum){
                 iomodel->FetchDataToInput(elements,"md.mesh.vertexonbase",MeshVertexonbaseEnum);
                 iomodel->FetchDataToInput(elements,"md.mesh.vertexonsurface",MeshVertexonsurfaceEnum);

issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp

@@ -202 +202 @@
         case HydrologyDCInefficientAnalysisEnum:
                 pe = CreatePVectorHydrologyDCInefficient();
+                break;
+        case HydrologyDCEfficientAnalysisEnum:
+                pe = CreatePVectorHydrologyDCEfficient();
                 break;
         default:
@@ -558 +561 @@
 ElementVector* Pengrid::CreatePVectorHydrologyDCInefficient(void){/*{{{*/
 
+        bool active_element,isefficientlayer;
         IssmDouble moulin_load,dt;
+        IssmDouble epl_active;
 
         /*Initialize Element matrix*/
+        ElementVector* pe=new ElementVector(&node,1,this->parameters);
+
+        this->element->GetInputValue(&moulin_load,node,HydrologydcBasalMoulinInputEnum);
+        parameters->FindParam(&dt,TimesteppingTimeStepEnum);
+        parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum);
+
+
+        // Test version input in EPL when active
+        if(isefficientlayer){
+                this->element->GetInputValue(&epl_active,node,HydrologydcMaskEplactiveNodeEnum);
+                if(epl_active){
+                        pe->values[0]=moulin_load*0.0;
+                }
+                else{
+                        if(dt!=0.0) pe->values[0]=moulin_load*dt;
+                }
+        }
+        else{
+                        if(dt!=0.0) pe->values[0]=moulin_load*dt;
+        }
+
+        //Initial treatment, allways input in sediment
+        /* if(dt!=0.0) pe->values[0]=moulin_load*dt; */
+
+        /*Clean up and return*/
+        return pe;
+ }
+/*}}}*/
+ElementVector* Pengrid::CreatePVectorHydrologyDCEfficient(void){/*{{{*/
+
+        IssmDouble moulin_load,dt;
+
+        /*Initialize Element matrix*/
+        if(!this->active) return NULL;
         ElementVector* pe=new ElementVector(&node,1,this->parameters);
 

issm/trunk-jpl/src/c/classes/Loads/Pengrid.h

@@ -88 +88 @@
                 void           ConstraintActivateThermal(int* punstable);
                 ElementVector* CreatePVectorHydrologyDCInefficient(void);
+                ElementVector* CreatePVectorHydrologyDCEfficient(void);
                 ElementMatrix* PenaltyCreateKMatrixHydrologyDCInefficient(IssmDouble kmax);
                 ElementMatrix* PenaltyCreateKMatrixMelting(IssmDouble kmax);