Changeset 24549

Timestamp:

02/05/20 10:44:36 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added perturbation

File:

• issm/trunk-jpl/src/c/classes/Elements/Element.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -2123 +2123 @@
 
         IssmDouble  deepwaterel,upperwaterel,deepwatermelt,upperwatermelt;
-        IssmDouble* base                = xNew<IssmDouble>(NUM_VERTICES);
-        IssmDouble* values              = xNew<IssmDouble>(NUM_VERTICES);
+        IssmDouble *base         = xNew<IssmDouble>(NUM_VERTICES);
+        IssmDouble *values       = xNew<IssmDouble>(NUM_VERTICES);
+        IssmDouble *perturbation = xNew<IssmDouble>(NUM_VERTICES);
         IssmDouble      time;
 
@@ -2135 +2136 @@
 
         this->GetInputListOnVertices(base,BaseEnum);
+   this->GetInputListOnVertices(perturbation,BasalforcingsPerturbationMeltingRateEnum);
         for(int i=0;i<NUM_VERTICES;i++){
                 if(base[i]>=upperwaterel){
@@ -2146 +2148 @@
                         values[i]=deepwatermelt*alpha+(1.-alpha)*upperwatermelt;
                 }
+
+      values[i]+=perturbation[i];
         }
 
         this->AddInput2(BasalforcingsFloatingiceMeltingRateEnum,values,P1Enum);
         xDelete<IssmDouble>(base);
+   xDelete<IssmDouble>(perturbation);
         xDelete<IssmDouble>(values);
 
@@ -2157 +2162 @@
         const int NUM_VERTICES = this->GetNumberOfVertices();
 
-        IssmDouble* deepwatermelt       = xNew<IssmDouble>(NUM_VERTICES);
-        IssmDouble* deepwaterel     = xNew<IssmDouble>(NUM_VERTICES);
-        IssmDouble* upperwaterel        = xNew<IssmDouble>(NUM_VERTICES);
-        IssmDouble* base                        = xNew<IssmDouble>(NUM_VERTICES);
-        IssmDouble* values                      = xNew<IssmDouble>(NUM_VERTICES);
+        IssmDouble *deepwatermelt = xNew<IssmDouble>(NUM_VERTICES);
+        IssmDouble *deepwaterel   = xNew<IssmDouble>(NUM_VERTICES);
+        IssmDouble *upperwaterel  = xNew<IssmDouble>(NUM_VERTICES);
+        IssmDouble *base          = xNew<IssmDouble>(NUM_VERTICES);
+        IssmDouble *values        = xNew<IssmDouble>(NUM_VERTICES);
 
         this->GetInputListOnVertices(base,BaseEnum);