Changeset 4328

Timestamp:

06/29/10 16:21:55 (15 years ago)

Author:

seroussi

Message:

use AddInput and not AddObject in InputDuplicate

Location:

issm/trunk/src/c/objects/Elements

Files:

• Penta.cpp (modified) (1 diff)
• Tria.cpp (modified) (2 diffs)

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -1038 +1038 @@
 
         /*Add copy into inputs, it will wipe off the one already there: */
-        inputs->AddObject((Input*)copy);
+        inputs->AddInput((Input*)copy);
 }
 /*}}}*/

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -1426 +1426 @@
 
         /*Add copy into inputs, it will wipe off the one already there: */
-        inputs->AddObject((Input*)copy);
+        inputs->AddInput((Input*)copy);
 }
 /*}}}*/
@@ -2320 +2320 @@
                 /*Create New Surface: s = (1-rho_ice/rho_water) h*/
                 InputDuplicate(ThicknessEnum,SurfaceEnum);     //1: copy thickness into surface
-                InputScale(SurfaceEnum,(1-rho_ice/rho_water)); //2: surface = surface * (1-di)
+                InputScale(SurfaceEnum,(1.0-rho_ice/rho_water)); //2: surface = surface * (1-di)
 
                 /*Create New Bed b = -rho_ice/rho_water h*/