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

Timestamp:

10/01/15 10:45:44 (10 years ago)

Author:

Eric.Larour

Message:

CHG: applying patches for the AD mode to compile.

File:

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

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

@@ -2375 +2375 @@
                 /*Calculate total system mass:*/
         sumMass=0; for(int i=0;i<m;i++) sumMass += dz[i]*d[i];
+
+        #ifndef _HAVE_ADOLC_ //we want to avoid the round operation at all cost. Not differentiable.
         dMass = sumMass + sumR + sumW - sumP - sumEC - initMass - sumMassAdd;
-        dMass = round(dMass * 100.0)/100.0;
+                dMass = round(dMass * 100.0)/100.0;
 
                 /*Check mass conservation:*/
         if (dMass != 0.0) _printf_("total system mass not conserved in MB function");
+                #endif
                 
                 /*Check bottom grid cell T is unchanged:*/
         if (T[m-1]!=T_bottom) _printf_("T(end)~=T_bottom" << "\n");
                 
+                /*Free ressources: */
+                xDelete<IssmDouble>(swf);
+
+                /*increase counter:*/
                 count++;
 
@@ -2399 +2406 @@
         this->AddInput(new DoubleArrayInput(SmbWEnum,W,m));
         this->AddInput(new DoubleArrayInput(SmbAEnum,a,m));
-        this->AddInput(new DoubleArrayInput(SmbSwfEnum,swf,m));
         this->AddInput(new DoubleInput(SmbMassBalanceEnum,(sumP + sumEC -sumR)/rho_water/dt));
         this->AddInput(new DoubleInput(SmbRunoffEnum,sumR/rho_water/dt));
@@ -2416 +2422 @@
         xDelete<IssmDouble>(a);
         xDelete<IssmDouble>(T);
-        xDelete<IssmDouble>(swf);
         delete gauss;
         /*}}}*/