Changeset 27260 for issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp

Timestamp:

09/02/22 04:49:02 (3 years ago)

Author:

vverjans

Message:

NEW arma process fully implemented

File:

• issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp

@@ -231 +231 @@
    bool isstochastic;
    bool isdeepmeltingstochastic = false;
-   int M,N,Narlags,arorder,numbasins,my_rank;
+   int M,N,Narlagcoefs,Nmalagcoefs,arorder,maorder,numbasins,my_rank;
    femmodel->parameters->FindParam(&numbasins,BasalforcingsLinearNumBasinsEnum);
         femmodel->parameters->FindParam(&arorder,BasalforcingsARMAarOrderEnum);
+        femmodel->parameters->FindParam(&maorder,BasalforcingsARMAmaOrderEnum);
    IssmDouble tinit_arma;
    IssmDouble* termconstant   = NULL;
    IssmDouble* trend          = NULL;
    IssmDouble* arlagcoefs     = NULL;
+   IssmDouble* malagcoefs     = NULL;
    IssmDouble* deepwaterel    = NULL;
    IssmDouble* upperwaterel   = NULL;
@@ -247 +249 @@
    femmodel->parameters->FindParam(&termconstant,&M,BasalforcingsARMAconstEnum);              _assert_(M==numbasins);
    femmodel->parameters->FindParam(&trend,&M,BasalforcingsARMAtrendEnum);                     _assert_(M==numbasins);
-   femmodel->parameters->FindParam(&arlagcoefs,&M,&Narlags,BasalforcingsARMAarlagcoefsEnum);  _assert_(M==numbasins); _assert_(Narlags==arorder);
+   femmodel->parameters->FindParam(&arlagcoefs,&M,&Narlagcoefs,BasalforcingsARMAarlagcoefsEnum);  _assert_(M==numbasins); _assert_(Narlagcoefs==arorder);
+   femmodel->parameters->FindParam(&malagcoefs,&M,&Nmalagcoefs,BasalforcingsARMAmalagcoefsEnum);  _assert_(M==numbasins); _assert_(Nmalagcoefs==maorder);
 
         /*Get basin-specific parameters*/
@@ -272 +275 @@
    for(Object* &object:femmodel->elements->objects){
       Element* element = xDynamicCast<Element*>(object);
-      /*Compute autoregression*/
-      element->Autoregression(isstepforarma,arorder,telapsed_arma,tstep_arma,termconstant,trend,arlagcoefs,isdeepmeltingstochastic,BasalforcingsDeepwaterMeltingRatearmaEnum);
+      /*Compute ARMA*/
+      element->ArmaProcess(isstepforarma,arorder,maorder,telapsed_arma,tstep_arma,termconstant,trend,arlagcoefs,malagcoefs,isdeepmeltingstochastic,BasalforcingsDeepwaterMeltingRatearmaEnum);
                 element->BasinLinearFloatingiceMeltingRate(deepwaterel,upperwatermelt,upperwaterel,perturbation);
         }
@@ -281 +284 @@
         xDelete<IssmDouble>(trend);
         xDelete<IssmDouble>(arlagcoefs);
+        xDelete<IssmDouble>(malagcoefs);
         xDelete<IssmDouble>(deepwaterel);
         xDelete<IssmDouble>(upperwaterel);