Changeset 28104

Timestamp:

02/20/24 13:51:13 (21 months ago)

Author:

jdquinn

Message:

CHG: Reverting last commit for now

File:

• issm/trunk-jpl/src/c/shared/Elements/PddSurfaceMassBalance.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/shared/Elements/PddSurfaceMassBalance.cpp

@@ -10 +10 @@
 
 IssmDouble PddSurfaceMassBalance(IssmDouble* monthlytemperatures, IssmDouble* monthlyprec,
-                                 IssmDouble* pdds, IssmDouble* pds, IssmDouble* melt, IssmDouble* accu,  
-                                 IssmDouble signorm, IssmDouble yts, IssmDouble h, IssmDouble s, IssmDouble desfac,
-                                 IssmDouble s0t,IssmDouble s0p, IssmDouble rlaps,IssmDouble rlapslgm,
-                                 IssmDouble TdiffTime,IssmDouble sealevTime, IssmDouble pddsnowfac,IssmDouble pddicefac,
-                                 IssmDouble rho_water,IssmDouble rho_ice){
+         IssmDouble* pdds, IssmDouble* pds, IssmDouble* melt, IssmDouble* accu, 
+         IssmDouble signorm, IssmDouble yts, IssmDouble h, IssmDouble s, IssmDouble desfac,
+         IssmDouble s0t,IssmDouble s0p, IssmDouble rlaps,IssmDouble rlapslgm,
+         IssmDouble TdiffTime,IssmDouble sealevTime, IssmDouble pddsnowfac,IssmDouble pddicefac,
+         IssmDouble rho_water,IssmDouble rho_ice){
 
   // output:
@@ -70 +70 @@
   IssmDouble pddtj, hmx2;
   IssmDouble pddsnowfac0=4.3, pddicefac0=8.3;
-  IssmDouble snowfac, icefac; 
-  
-  IssmDouble snow;
+  IssmDouble snowfac, icefac;
 
   sconv=(rho_water/rho_ice)/12.; //rhow_rain/rhoi / 12 months
@@ -138 +136 @@
   icefac=pddicefac0;
   if (pddsnowfac>0) {
-          if (pddsnowfac<1.65) {
-                  _printf0_("WARNING: Pdd snow factor input, " << pddsnowfac << ", results in a negative value. It will be ignored. \n");
-          }
-          else{
-                snowfac=pddsnowfac;
-          }
+    if (pddsnowfac<1.65) {
+      _printf0_("WARNING: Pdd snow factor input, " << pddsnowfac << ", results in a negative value. It will be ignored. \n");
+    }
+    else{
+    snowfac=pddsnowfac;
+    }
   }
   if (pddicefac>0) {
-          if (pddicefac>17.22) {
-                  _printf0_("WARNING: Pdd ice factor input, " << pddicefac << ", results in a negative value. It will be ignored. \n");
-          }
-          else{
-            icefac=pddicefac;
-          }
+    if (pddicefac>17.22) {
+      _printf0_("WARNING: Pdd ice factor input, " << pddicefac << ", results in a negative value. It will be ignored. \n");
+    }
+    else{
+      icefac=pddicefac;
+    }
   }
 
@@ -160 +158 @@
   } 
   else if(Tsum< 10){
-          snwmf = (0.15*(Tsum+1) + (2.65+snowfac-pddsnowfac0))*0.001;
-          smf = (((17.22-pddicefac0)/(pow(11,3)))*pow((10.-Tsum),3) + icefac)*0.001;//icefac)*0.001;//pddicefac0)*0.001;
-          //2024: Prior Calculation SMF:  smf = (((17.22-icefac)/(pow(11,3)))*pow((10.-Tsum),3) + pddicefac0)*0.001;
-          //Original: Tarasov and Peltier: smf = (((icefac-pddicefac0)/(Tsum+1))*pow((10.-Tsum),3) + pddicefac0)*0.001;
+    snwmf = (0.15*(Tsum+1) + (2.65+snowfac-pddsnowfac0))*0.001;
+    smf = (((17.22-icefac)/(pow(11,3)))*pow((10.-Tsum),3) + pddicefac0)*0.001;
+    //JC,smf = (((icefac-pddicefac0)/(Tsum+1))*pow((10.-Tsum),3) + pddicefac0)*0.001;
   }
   else{
@@ -249 +246 @@
   pddtj=pddt;
 
-  //cout << sizeof(snwm);
-  //snw = mean(snwm);
-
-  //std::cout << snwm << std::endl;
-  //printf("snowmelt %f\n",snow);
-  
   return B;
 }