Changeset 17555 for issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

Timestamp:

03/26/14 20:18:48 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: renamed Bed -> Base in src/c (matlab to be done)

File:

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

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

@@ -2109 +2109 @@
         /*Now get the average height*/
         Input* surface_input = inputs->GetInput(SurfaceEnum); _assert_(surface_input);
-        Input* bed_input     = inputs->GetInput(BedEnum);     _assert_(bed_input);
+        Input* base_input     = inputs->GetInput(BaseEnum);     _assert_(base_input);
         surface_input->GetInputAverage(&surface);
-        bed_input->GetInputAverage(&bed);
+        base_input->GetInputAverage(&bed);
 
         /*Return: */
@@ -2145 +2145 @@
         /*Now get the average height and bathymetry*/
         Input* surface_input    = inputs->GetInput(SurfaceEnum);    _assert_(surface_input);
-        Input* bed_input        = inputs->GetInput(BedEnum);        _assert_(bed_input);
-        Input* bathymetry_input = inputs->GetInput(BathymetryEnum); _assert_(bathymetry_input);
+        Input* base_input        = inputs->GetInput(BaseEnum);        _assert_(base_input);
+        Input* bed_input = inputs->GetInput(BedEnum); _assert_(bed_input);
         surface_input->GetInputAverage(&surface);
-        bed_input->GetInputAverage(&bed);
-        bathymetry_input->GetInputAverage(&bathymetry);
+        base_input->GetInputAverage(&bed);
+        bed_input->GetInputAverage(&bathymetry);
         
         /*Return: */
@@ -4136 +4136 @@
                                         GetInputListOnVertices(&thickness_init[0],ThicknessEnum);
                                         GetInputListOnVertices(&hydrostatic_ratio[0],GeometryHydrostaticRatioEnum);
-                                        GetInputListOnVertices(&bed[0],BedEnum);
+                                        GetInputListOnVertices(&bed[0],BaseEnum);
                                         GetInputListOnVertices(&surface[0],SurfaceEnum);
 
@@ -4178 +4178 @@
                                         /*Add new inputs: */
                                         this->inputs->AddInput(new TriaInput(ThicknessEnum,thickness,P1Enum));
-                                        this->inputs->AddInput(new TriaInput(BedEnum,bed,P1Enum));
+                                        this->inputs->AddInput(new TriaInput(BaseEnum,bed,P1Enum));
                                         this->inputs->AddInput(new TriaInput(SurfaceEnum,surface,P1Enum));
 
@@ -4255 +4255 @@
         GetInputListOnVertices(&h[0],ThicknessEnum);
         GetInputListOnVertices(&s[0],SurfaceEnum);
-        GetInputListOnVertices(&b[0],BedEnum);
-        GetInputListOnVertices(&r[0],BathymetryEnum);
+        GetInputListOnVertices(&b[0],BaseEnum);
+        GetInputListOnVertices(&r[0],BedEnum);
         GetInputListOnVertices(&phi[0],MaskGroundediceLevelsetEnum);
         rho_water   = matpar->GetRhoWater();
@@ -4333 +4333 @@
         /*Update inputs*/
         this->inputs->AddInput(new TriaInput(SurfaceEnum,&s[0],P1Enum));
-        this->inputs->AddInput(new TriaInput(BedEnum,&b[0],P1Enum));
+        this->inputs->AddInput(new TriaInput(BaseEnum,&b[0],P1Enum));
 
 }
@@ -4349 +4349 @@
         density=rho_ice/rho_water;
         GetInputListOnVertices(&h[0],ThicknessEnum);
-        GetInputListOnVertices(&r[0],BathymetryEnum);
+        GetInputListOnVertices(&r[0],BedEnum);
         GetInputListOnVertices(&gl[0],MaskGroundediceLevelsetEnum);