Changeset 26285

Timestamp:

05/20/21 11:00:16 (4 years ago)

Author:

Eric.Larour

Message:

CHG: easier way to reset barystatic contributors.

Location:

issm/trunk-jpl/src/c

Files:

• classes/BarystaticContributions.cpp (modified) (1 diff)
• classes/BarystaticContributions.h (modified) (1 diff)
• cores/sealevelchange_core.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/BarystaticContributions.cpp

@@ -131 +131 @@
 
 } /*}}}*/
-void BarystaticContributions::Reset(int eid){ /*{{{*/
+void BarystaticContributions::Reset(){ /*{{{*/
+
+
+        ice->SetValue(0);
+        hydro->SetValue(0);
+        ocean->SetValue(0);
         
-        int id;
-        if(nice){
-                id=reCast<int>(pice[eid]);
-                ice->SetValue(id,0.,INS_VAL);
-        }
-        else{
-                ice->SetValue(0,0.,INS_VAL);
-        }
-
-        if(nhydro){
-                id=reCast<int>(phydro[eid]);
-                hydro->SetValue(id,0.,INS_VAL);
-        }
-        else{
-                hydro->SetValue(0,0.,INS_VAL);
-        }
-
-        if(nocean){
-                id=reCast<int>(pocean[eid]);
-                ocean->SetValue(id,0.,INS_VAL);
-        }
-        else{
-                ocean->SetValue(0,0.,INS_VAL);
-        }
-                
-
 } /*}}}*/
 void BarystaticContributions::Save(Results* results, Parameters* parameters, IssmDouble oceanarea){ /*{{{*/

issm/trunk-jpl/src/c/classes/BarystaticContributions.h

@@ -42 +42 @@
                 void Save(Results* results, Parameters* parameters, IssmDouble oceanarea);
                 void Set(int eid, IssmDouble icevalue, IssmDouble hydrovalue, IssmDouble oceanvalue);
-                void Reset(int eid);
+                void Reset();
 
 };

issm/trunk-jpl/src/c/cores/sealevelchange_core.cpp

@@ -388 +388 @@
                 barycontrib->Cumulate(femmodel->parameters);
                 barycontrib->Save(femmodel->results,femmodel->parameters,oceanarea);
-
-                //Avoid double counting barystatic contributions in future time steps: reset all non-cumulative bscl to 0
-                for(Object* & object : femmodel->elements->objects){
-                        Element* element = xDynamicCast<Element*>(object);
-                        barycontrib->Reset(element->Sid());
-                }
+                barycontrib->Reset();
         }