Changeset 27347 for issm/trunk/src/c/modules/StochasticForcingx/StochasticForcingx.cpp

Timestamp:

10/27/22 11:39:37 (2 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 27344

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/modules/StochasticForcingx/StochasticForcingx.cpp (modified) (2 diffs)

issm/trunk/src/c/modules/StochasticForcingx/StochasticForcingx.cpp

@@ -75 +75 @@
                 int dimensionid;
 
-                /*Deal with the autoregressive models*/
-                if(fields[j]==SMBautoregressionEnum || fields[j]==FrontalForcingsRignotAutoregressionEnum || fields[j]==BasalforcingsDeepwaterMeltingRateAutoregressionEnum){
+                /*Deal with the ARMA models*/
+                if(fields[j]==SMBarmaEnum || fields[j]==FrontalForcingsRignotarmaEnum || fields[j]==BasalforcingsDeepwaterMeltingRatearmaEnum){
                         switch(fields[j]){
-                                case SMBautoregressionEnum:
+                                case SMBarmaEnum:
                                         dimenum_type   = SmbBasinsIdEnum;
-                                        noiseenum_type = SmbAutoregressionNoiseEnum;
-                                        break;
-                                case FrontalForcingsRignotAutoregressionEnum:
+                                        noiseenum_type = SmbARMANoiseEnum;
+                                        break;
+                                case FrontalForcingsRignotarmaEnum:
                                         dimenum_type   = FrontalForcingsBasinIdEnum;
-                                        noiseenum_type = ThermalforcingAutoregressionNoiseEnum;
-                                        break;
-                                case BasalforcingsDeepwaterMeltingRateAutoregressionEnum:
+                                        noiseenum_type = ThermalforcingARMANoiseEnum;
+                                        break;
+                                case BasalforcingsDeepwaterMeltingRatearmaEnum:
                                         dimenum_type   = BasalforcingsLinearBasinIdEnum;
                                         noiseenum_type = BasalforcingsDeepwaterMeltingRateNoiseEnum;
@@ -103 +103 @@
                 else{
                         switch(fields[j]){
-                                case SMBautoregressionEnum:
-                                case FrontalForcingsRignotAutoregressionEnum:
-                                case BasalforcingsDeepwaterMeltingRateAutoregressionEnum:
+                                case SMBarmaEnum:
+                                case FrontalForcingsRignotarmaEnum:
+                                case BasalforcingsDeepwaterMeltingRatearmaEnum:
                                         /*Already done above*/
                                         break;