Changeset 26608 for issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp

Timestamp:

11/11/21 09:56:50 (3 years ago)

Author:

Mathieu Morlighem

Message:

BUG: reverting Vincent's commit

File:

• issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp (modified) (5 diffs)

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

@@ -197 +197 @@
         /*Load parameters*/
         bool isstochastic;
-        bool issmbstochastic = false;
         int M,N,Nphi,arorder,numbasins,my_rank;
         femmodel->parameters->FindParam(&numbasins,SmbNumBasinsEnum);
@@ -211 +210 @@
         femmodel->parameters->FindParam(&phi,&M,&Nphi,SmbPhiEnum);  _assert_(M==numbasins); _assert_(Nphi==arorder);
 
+        /*Retrieve noise terms if stochasticity, otherwise leave noiseterms as 0*/
+   IssmDouble* noiseterms = xNewZeroInit<IssmDouble>(numbasins);
         femmodel->parameters->FindParam(&isstochastic,StochasticForcingIsStochasticForcingEnum);
    if(isstochastic){
@@ -218 +219 @@
       femmodel->parameters->FindParam(&stochasticfields,&N,StochasticForcingFieldsEnum); _assert_(N==numstochasticfields);
       for(int i=0;i<numstochasticfields;i++){
-         if(stochasticfields[i]==SMBautoregressionEnum) issmbstochastic = true;
+         if(stochasticfields[i]==SMBautoregressionEnum){
+                                femmodel->parameters->FindParam(&noiseterms,&M,SmbAutoregressionNoiseEnum);  _assert_(M==numbasins);
+                        }
                 }
                 xDelete<int>(stochasticfields);
@@ -228 +231 @@
         for(Object* &object:femmodel->elements->objects){
                 Element* element = xDynamicCast<Element*>(object);
-                element->Autoregression(isstepforar,arorder,telapsed_ar,beta0,beta1,phi,issmbstochastic,SMBautoregressionEnum);
+                element->Autoregression(isstepforar,arorder,telapsed_ar,beta0,beta1,phi,noiseterms,SMBautoregressionEnum);
         }
 
@@ -235 +238 @@
         xDelete<IssmDouble>(beta1);
         xDelete<IssmDouble>(phi);
+        xDelete<IssmDouble>(noiseterms);
 }/*}}}*/
 void Delta18oParameterizationx(FemModel* femmodel){/*{{{*/