Changeset 17555 for issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.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/analyses/StressbalanceAnalysis.cpp (modified) (9 diffs)

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

@@ -194 +194 @@
         iomodel->FetchDataToInput(elements,ThicknessEnum);
         iomodel->FetchDataToInput(elements,SurfaceEnum);
-        iomodel->FetchDataToInput(elements,BedEnum);
+        iomodel->FetchDataToInput(elements,BaseEnum);
         iomodel->FetchDataToInput(elements,FrictionCoefficientEnum);
         iomodel->FetchDataToInput(elements,FrictionPEnum);
@@ -809 +809 @@
         if(numrifts){
                 iomodel->FetchData(&riftinfo,&numriftsegments,NULL,RiftsRiftstructEnum);
-                iomodel->FetchData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,MaskGroundediceLevelsetEnum);
+                iomodel->FetchData(5,RiftsRiftstructEnum,ThicknessEnum,BaseEnum,SurfaceEnum,MaskGroundediceLevelsetEnum);
                 for(i=0;i<numriftsegments;i++){
                         if(iomodel->my_elements[reCast<int,IssmDouble>(*(riftinfo+RIFTINFOSIZE*i+2))-1]){
@@ -816 +816 @@
                         }
                 }
-                iomodel->DeleteData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,MaskGroundediceLevelsetEnum);
+                iomodel->DeleteData(5,RiftsRiftstructEnum,ThicknessEnum,BaseEnum,SurfaceEnum,MaskGroundediceLevelsetEnum);
                 xDelete<IssmDouble>(riftinfo);
         }
@@ -1486 +1486 @@
         /*Retrieve all inputs and parameters*/
         Input* thickness_input = element->GetInput(ThicknessEnum); _assert_(thickness_input);
-        Input* bed_input       = element->GetInput(BedEnum);       _assert_(bed_input);
+        Input* base_input       = element->GetInput(BaseEnum);       _assert_(base_input);
         IssmDouble rho_water   = element->GetMaterialParameter(MaterialsRhoWaterEnum);
         IssmDouble rho_ice     = element->GetMaterialParameter(MaterialsRhoIceEnum);
@@ -1501 +1501 @@
                 gauss->GaussPoint(ig);
                 thickness_input->GetInputValue(&thickness,gauss);
-                bed_input->GetInputValue(&bed,gauss);
+                base_input->GetInputValue(&bed,gauss);
                 element->JacobianDeterminantSurface(&Jdet,xyz_list_front,gauss);
                 element->NodalFunctions(basis,gauss);
@@ -1938 +1938 @@
         /*Retrieve all inputs and parameters*/
         Input* thickness_input = element->GetInput(ThicknessEnum); _assert_(thickness_input);
-        Input* bed_input       = element->GetInput(BedEnum);       _assert_(bed_input);
+        Input* base_input       = element->GetInput(BaseEnum);       _assert_(base_input);
         IssmDouble rho_water   = element->GetMaterialParameter(MaterialsRhoWaterEnum);
         IssmDouble rho_ice     = element->GetMaterialParameter(MaterialsRhoIceEnum);
@@ -1952 +1952 @@
                 gauss->GaussPoint(ig);
                 thickness_input->GetInputValue(&thickness,gauss);
-                bed_input->GetInputValue(&bed,gauss);
+                base_input->GetInputValue(&bed,gauss);
                 element->JacobianDeterminantSurface(&Jdet,xyz_list_front,gauss);
                 element->NodalFunctions(basis,gauss);
@@ -3592 +3592 @@
         /*Retrieve all inputs and parameters*/
         element->GetVerticesCoordinatesBase(&xyz_list_base);
-        Input*      bed_input=element->GetInput(BedEnum); _assert_(bed_input);
+        Input*      base_input=element->GetInput(BaseEnum); _assert_(base_input);
         IssmDouble  rho_water=element->GetMaterialParameter(MaterialsRhoWaterEnum);
         IssmDouble  gravity  =element->GetMaterialParameter(ConstantsGEnum);
@@ -3606 +3606 @@
                 element->NormalBase(&normal[0],xyz_list_base);
                 _assert_(normal[dim-1]<0.);
-                bed_input->GetInputValue(&bed, gauss);
+                base_input->GetInputValue(&bed, gauss);
                 water_pressure=gravity*rho_water*bed;