Changeset 27518 for issm/trunk-jpl/src/c/classes/Loads/Moulin.cpp

Timestamp:

01/19/23 03:50:29 (2 years ago)

Author:

bdef

Message:

BUG: fix to the split between layers of moulin input for DoCo

File:

• issm/trunk-jpl/src/c/classes/Loads/Moulin.cpp (modified) (6 diffs)

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

@@ -104 +104 @@
 /*}}}*/
 void    Moulin::Echo(void){/*{{{*/
-        this->DeepEcho();
+
+        _printf_("Moulin:\n");
+        _printf_("   id: " << id << "\n");
+        hnode->Echo();
+        hvertex->Echo();
+        helement->Echo();
+        _printf_("   parameters\n");
+        parameters->Echo();
+        //this->DeepEcho();
 }
 /*}}}*/
@@ -143 +151 @@
 void  Moulin::Configure(Elements* elementsin,Loads* loadsin,Nodes* nodesin,Vertices* verticesin,Materials* materialsin,Parameters* parametersin){/*{{{*/
 
-        /*Take care of hooking up all objects for this load, ie links the objects in the hooks to their respective 
+        /*Take care of hooking up all objects for this load, ie links the objects in the hooks to their respective
          * datasets, using internal ids and offsets hidden in hooks: */
         hnode->configure(nodesin);
@@ -204 +212 @@
                         break;
                 case HydrologyDCInefficientAnalysisEnum:
-                        pe = CreatePVectorHydrologyDCInefficient();
+                        pe = this->CreatePVectorHydrologyDCInefficient();
                         break;
                 case HydrologyDCEfficientAnalysisEnum:
-                        pe = CreatePVectorHydrologyDCEfficient();
+                        pe = this->CreatePVectorHydrologyDCEfficient();
                         break;
                 default:
@@ -427 +435 @@
          * mesh), don't add the moulin input a second time*/
         if(node->IsClone()) return NULL;
-        bool isefficientlayer;
+        bool isefficientlayer, active_element;
         IssmDouble moulin_load,dt;
         IssmDouble epl_active;
-
         /*Initialize Element matrix*/
         ElementVector* pe=new ElementVector(&node,1,this->parameters);
@@ -437 +444 @@
         parameters->FindParam(&dt,TimesteppingTimeStepEnum);
         parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum);
-        // Test version input in EPL when active
+
+        //Test version input in EPL when active
         if(isefficientlayer){
-                this->element->GetInputValue(&epl_active,node,HydrologydcMaskEplactiveNodeEnum);
-                if(reCast<bool>(epl_active)){
-                        pe->values[0]=moulin_load*0.0;
+                this->element->GetInputValue(&active_element,HydrologydcMaskEplactiveEltEnum);
+                if(!active_element){
+                        /* this->element->GetInputValue(&epl_active,node,HydrologydcMaskEplactiveNodeEnum); */
+                        /* if(reCast<bool>(epl_active))pe->values[0]=0.0; */
+                        /* else { */
+                        pe->values[0]=moulin_load*dt;
+                        /*      if (moulin_load>0)_printf_("MoulinInput in Sed is "<<pe->values[0]<<"\n"); */
+                        /*      if (moulin_load>0)pe->Echo(); */
+                        /* } */
+                        //if (node->Sid()==4)_printf_("MoulinInput in Sed is "<<moulin_load*dt<<"\n");
                 }
-                else{
-                        pe->values[0]=moulin_load*dt;
-                }
-        }
-        else{
-                pe->values[0]=moulin_load*dt;
-        }
+                else pe->values[0]=0.0;
+        }
+        else pe->values[0]=moulin_load*dt;
+
+        //Test only input in sed
+        /* pe->values[0]=moulin_load*dt; */
+
         /*Clean up and return*/
         return pe;
@@ -458 +473 @@
         /*If this node is not the master node (belongs to another partition of the
          * mesh), don't add the moulin input a second time*/
+
         if(node->IsClone()) return NULL;
-        if(!this->node->IsActive()) return NULL;
-        IssmDouble moulin_load,dt;
         ElementVector* pe=new ElementVector(&node,1,this->parameters);
 
-        this->element->GetInputValue(&moulin_load,node,HydrologydcBasalMoulinInputEnum);
-        parameters->FindParam(&dt,TimesteppingTimeStepEnum);
-
-        pe->values[0]=moulin_load*dt;
-        /*Clean up and return*/
+        //Test Input in epl if active
+        /* IssmDouble epl_active; */
+        /* this->element->GetInputValue(&epl_active,node,HydrologydcMaskEplactiveNodeEnum); */
+        /* //if(node->Sid()==4)_printf_("Activity is "<<epl_active<<" \n"); */
+        /* if(reCast<bool>(epl_active)){ */
+        /*      IssmDouble moulin_load,dt; */
+        /*      this->element->GetInputValue(&moulin_load,node,HydrologydcBasalMoulinInputEnum); */
+        /*      parameters->FindParam(&dt,TimesteppingTimeStepEnum); */
+        /*      pe->values[0]=moulin_load*dt; */
+        /*      if (moulin_load>0)_printf_("MoulinInput in Epl is "<<pe->values[1]<<"\n"); */
+
+        /* } */
+        /*      else{ */
+        /*              pe->values[0]=0.0; */
+        /* } */
+        // Test element only test
+        bool active_element;
+        this->element->GetInputValue(&active_element,HydrologydcMaskEplactiveEltEnum);
+        if(active_element){
+                IssmDouble moulin_load,dt;
+                this->element->GetInputValue(&moulin_load,node,HydrologydcBasalMoulinInputEnum);
+                parameters->FindParam(&dt,TimesteppingTimeStepEnum);
+                pe->values[0]=moulin_load*dt;
+        }
+        else pe->values[0]=0.0;
+
+
+        //Test only input is sed
+        /* pe->values[0]=0.0; */
+
+        //Clean up and return
         return pe;
 }