Changeset 24095

Timestamp:

07/15/19 17:50:28 (6 years ago)

Author:

schlegel

Message:

CHG: revert to older pdd scaling for ice

File:

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

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

@@ -135 +135 @@
   snowfac=pddsnowfac0;
   icefac=pddicefac0;
-  if (pddsnowfac>=0) {
+  if (pddsnowfac>0) {
           if (pddsnowfac<1.65) {
                   _printf0_("WARNING: Pdd snow factor input, " << pddsnowfac << ", results in a negative value. It will be ignored. \n");
@@ -143 +143 @@
           }
   }
-  if (pddicefac>=0) {
+  if (pddicefac>0) {
           if (pddicefac>17.22) {
-                  _printf0_("WARNING: Pdd ice factor input, " << pddsnowfac << ", results in a negative value. It will be ignored. \n");
+                  _printf0_("WARNING: Pdd ice factor input, " << pddicefac << ", results in a negative value. It will be ignored. \n");
           }
           else{
@@ -158 +158 @@
   } 
   else if(Tsum< 10){
-    snwmf = (0.15*(Tsum+1) + (2.65+snowfac-pddsnowfac0))*0.001;
-    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{