Changeset 18584

Timestamp:

10/07/14 09:03:24 (10 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed m/yr m/sec conversion on SMB

File:

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

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

@@ -31 +31 @@
                         break;
                 case SMBgradientsEnum:
-                        if(VerboseSolution())_printf_(" call smb gradients module\n");
+                        if(VerboseSolution())_printf0_("        call smb gradients module\n");
                         SmbGradientsx(femmodel);
                         break;
                 case SMBhenningEnum:
-                        if(VerboseSolution())_printf_("  call smb Henning module\n");
+                        if(VerboseSolution())_printf0_("  call smb Henning module\n");
                         SmbHenningx(femmodel);
                         break;
                 case SMBcomponentsEnum:
-                        if(VerboseSolution())_printf_("  call smb Components module\n");
+                        if(VerboseSolution())_printf0_("  call smb Components module\n");
                         SmbComponentsx(femmodel);
                         break;
                 case SMBmeltcomponentsEnum:
-                        if(VerboseSolution())_printf_("  call smb Melt Components module\n");
+                        if(VerboseSolution())_printf0_("  call smb Melt Components module\n");
                         SmbMeltComponentsx(femmodel);
                         break;
@@ -263 +263 @@
                         }
             
-            /* Compute smb including anomaly,
-             correct for number of seconds in a year [s/yr]*/
-            smb = smb + anomaly*yts;
-            
+                        /* Compute smb including anomaly,
+                                correct for number of seconds in a year [s/yr]*/
+                        smb = smb/yts + anomaly;
+
+
                         /*Update array accordingly*/
                         smblist[v] = smb;