Changeset 27435

Timestamp:

11/28/22 07:01:04 (2 years ago)

Author:

vverjans

Message:

CHG changing name of MonthlyFractionBasin() to MonthlyFactorBasin()

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Element.cpp (modified) (4 diffs)
• modules/FrontalForcingsx/FrontalForcingsx.cpp (modified) (1 diff)

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

@@ -2730 +2730 @@
 
 }/*}}}*/
-void       Element::MonthlyFractionBasin(IssmDouble* monthlyfrac,int enum_type){/*{{{*/
+void       Element::MonthlyFactorBasin(IssmDouble* monthlyfac,int enum_type){/*{{{*/
         
         /*Variable declaration*/
@@ -2779 +2779 @@
         /*Get basin-specific parameters of the element*/
    this->GetInputValue(&basinid,basinenum_type);
-        for(int i=0;i<12;i++) monthlyfrac_b[i]   = monthlyfrac[basinid*12+i];
+        for(int i=0;i<12;i++) monthlyfac_b[i]   = monthlyfac[basinid*12+i];
 
         /*Retrieve input*/
@@ -2787 +2787 @@
         for(int v=0;v<numvertices;v++){
                 for(int i=0;i<12;i++){
-                        rateinmonth[v*12+i] = varlistinput[v]*monthlyfrac_b[i]*12;
+                        rateinmonth[v*12+i] = varlistinput[v]*monthlyfac_b[i]*12;
                         varlist[v]          = varlist[v]+fracdtinmonth[i]*rateinmonth[v*12+i];
                 }
@@ -2797 +2797 @@
         xDelete<IssmDouble>(fracdtinmonth);
         xDelete<IssmDouble>(rateinmonth);
-        xDelete<IssmDouble>(monthlyfrac_b);
+        xDelete<IssmDouble>(monthlyfac_b);
         xDelete<IssmDouble>(monthlyrate_b);
         xDelete<IssmDouble>(varlist);

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

@@ -165 +165 @@
       element->ArmaProcess(isstepforarma,arorder,maorder,numparams,numbreaks,tstep_arma,polyparams,arlagcoefs,malagcoefs,datebreaks,isdischargestochastic,FrontalForcingsSubglacialDischargearmaEnum);
                 /*Scale with monthly fractions*/
-                element->MonthlyFractionBasin(monthlyfrac,FrontalForcingsSubglacialDischargeEnum);
+                element->MonthlyFactorBasin(monthlyfrac,FrontalForcingsSubglacialDischargeEnum);
         }