Changeset 27584

Timestamp:

02/16/23 19:33:07 (2 years ago)

Author:

inwoo

Message:

CHG: src/c/classes/Element.cpp - fix memory clean of SmbSemicTransient

File:

• issm/trunk-jpl/src/c/classes/Elements/Element.cpp (modified) (8 diffs)

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

@@ -4237 +4237 @@
         const int NLOOP = 10; // default internal iteration for SEMIC (Ruckamp et al. 2018).
 
-        IssmDouble* s=xNew<IssmDouble>(NUM_VERTICES);
-        IssmDouble* s0gcm=xNew<IssmDouble>(NUM_VERTICES);
-        IssmDouble* st=xNew<IssmDouble>(NUM_VERTICES);
-
         // daily forcing inputs
         IssmDouble* dailyrainfall   =xNew<IssmDouble>(NUM_VERTICES);
@@ -4252 +4248 @@
         IssmDouble* dailytemperature=xNew<IssmDouble>(NUM_VERTICES);
 
+        // inputs: geometry
+        IssmDouble* s=xNew<IssmDouble>(NUM_VERTICES);
+        IssmDouble* s0gcm=xNew<IssmDouble>(NUM_VERTICES);
+        IssmDouble* st=xNew<IssmDouble>(NUM_VERTICES);
+
+        // inputs
         IssmDouble* tsurf_in        =xNew<IssmDouble>(NUM_VERTICES); 
         IssmDouble* mask_in         =xNew<IssmDouble>(NUM_VERTICES); 
@@ -4260 +4262 @@
         IssmDouble* hsnow_in        =xNew<IssmDouble>(NUM_VERTICES); 
 
-        // daily outputs
+        // outputs
         IssmDouble* tsurf_out  =xNew<IssmDouble>(NUM_VERTICES); memset(tsurf_out, 0., NUM_VERTICES*sizeof(IssmDouble));
         IssmDouble* smb_out    =xNew<IssmDouble>(NUM_VERTICES); memset(smb_out, 0., NUM_VERTICES*sizeof(IssmDouble));
@@ -4429 +4431 @@
                                 &tsurf_out[iv], &smb_out[iv], &smbi_out[iv], &smbs_out[iv], &saccu_out[iv], &smelt_out[iv],&albedo_out[iv], &albedo_snow_out[iv], &hsnow_out[iv], &hice_out[iv]);
 
-                /* unit conversion: water -> ice */
+                /* 
+                 unit conversion: water -> ice
+                 w.e. : water equivalenet.
+                 */
                 smbi_out[iv] = smbi_out[iv]*rho_water/rho_ice;
-                smbs_out[iv] = smbs_out[iv]*yts; // m/sec -> m/yr
+                smbs_out[iv] = smbs_out[iv]*yts; // w.e. m/sec -> m/yr
+                sacc_out[iv] = accu_out[iv]*yts; // w.e. m/sec -> m/yr
         }
 
@@ -4468 +4474 @@
         }
 
-        /*clean-up*/
+        /*clean-up {{{*/
         delete gauss;
         xDelete<IssmDouble>(dailysnowfall);
@@ -4481 +4487 @@
         xDelete<IssmDouble>(dailytemperature);
 
+        /*for outputs*/
         xDelete<IssmDouble>(tsurf_out);
         xDelete<IssmDouble>(smb_out);
@@ -4489 +4496 @@
         xDelete<IssmDouble>(albedo_out);
         xDelete<IssmDouble>(albedo_snow_out);
-
+        xDelete<IssmDouble>(hsnow_out)
+        xDelete<IssmDouble>(hice_out)
+
+        /*for inputs*/
         xDelete<IssmDouble>(hsnow_in);
         xDelete<IssmDouble>(hice_in);
@@ -4497 +4507 @@
         xDelete<IssmDouble>(albedo_snow_in);
         xDelete<IssmDouble>(tsurf_in);
+
+        /* for inputs:geometry */
         xDelete<IssmDouble>(s);
         xDelete<IssmDouble>(st);
         xDelete<IssmDouble>(s0gcm);
+        /*}}}*/
 }
 /*}}}*/