source: issm/oecreview/Archive/24684-25833/ISSM-25322-25323.diff

../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -540 +540 @@
         DrivingStressYEnum,
         DslGlobalAverageThermostericSeaLevelChangeEnum,
         DslSeaSurfaceHeightChangeAboveGeoidEnum,
-        DslSeaWaterPressureChangeAtSeaFloor,
+        DslSeaWaterPressureChangeAtSeaFloorEnum,
         DslStericRateEnum,
         DslDynamicRateEnum,
         GiaMmeNgiaEnum,

../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -546 +546 @@
                 case DrivingStressYEnum : return "DrivingStressY";
                 case DslGlobalAverageThermostericSeaLevelChangeEnum : return "DslGlobalAverageThermostericSeaLevelChange";
                 case DslSeaSurfaceHeightChangeAboveGeoidEnum : return "DslSeaSurfaceHeightChangeAboveGeoid";
+                case DslSeaWaterPressureChangeAtSeaFloorEnum : return "DslSeaWaterPressureChangeAtSeaFloor";
                 case DslStericRateEnum : return "DslStericRate";
                 case DslDynamicRateEnum : return "DslDynamicRate";
                 case GiaMmeNgiaEnum : return "GiaMmeNgia";

../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -558 +558 @@
               else if (strcmp(name,"DrivingStressY")==0) return DrivingStressYEnum;
               else if (strcmp(name,"DslGlobalAverageThermostericSeaLevelChange")==0) return DslGlobalAverageThermostericSeaLevelChangeEnum;
               else if (strcmp(name,"DslSeaSurfaceHeightChangeAboveGeoid")==0) return DslSeaSurfaceHeightChangeAboveGeoidEnum;
+              else if (strcmp(name,"DslSeaWaterPressureChangeAtSeaFloor")==0) return DslSeaWaterPressureChangeAtSeaFloorEnum;
               else if (strcmp(name,"DslStericRate")==0) return DslStericRateEnum;
               else if (strcmp(name,"DslDynamicRate")==0) return DslDynamicRateEnum;
               else if (strcmp(name,"GiaMmeNgia")==0) return GiaMmeNgiaEnum;

../trunk-jpl/src/c/shared/Enum/Enum.vim

@@ -544 +544 @@
 syn keyword cConstant DrivingStressYEnum
 syn keyword cConstant DslGlobalAverageThermostericSeaLevelChangeEnum
 syn keyword cConstant DslSeaSurfaceHeightChangeAboveGeoidEnum
+syn keyword cConstant DslSeaWaterPressureChangeAtSeaFloorEnum
 syn keyword cConstant DslStericRateEnum
 syn keyword cConstant DslDynamicRateEnum
 syn keyword cConstant GiaMmeNgiaEnum

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

@@ -5886 +5886 @@
         this->GetInput2Value(&area,AreaEnum);
 
         /*Retrieve bottom pressure change and average over the element: */
-        Input2* bottompressure_change_input=this->GetInput2(DslSeaWaterPressureChangeAtSeaFloor);
+        Input2* bottompressure_change_input=this->GetInput2(DslSeaWaterPressureChangeAtSeaFloorEnum);
         if (!bottompressure_change_input)_error_("bottom pressure input needed to compute sea level rise fingerprint!");
         bottompressure_change_input->GetInputAverage(&BP);
 
@@ -5992 +5992 @@
                 
                 /*If bottom pressures are available, retrieve them to load the bedrock:*/
                 if(bp_compute_fingerprints){
-                        Input2* bottompressure_change_input=this->GetInput2(DslSeaWaterPressureChangeAtSeaFloor);
+                        Input2* bottompressure_change_input=this->GetInput2(DslSeaWaterPressureChangeAtSeaFloorEnum);
                         if (!bottompressure_change_input)_error_("bottom pressure input needed to compute sea level rise fingerprint!");
                         bottompressure_change_input->GetInputAverage(&BP);
 

../trunk-jpl/src/c/analyses/SealevelriseAnalysis.cpp

@@ -82 +82 @@
 
                 /*deal with dynamic sea level fields: */
                 iomodel->FetchDataToInput(inputs2,elements,"md.dsl.sea_surface_height_change_above_geoid", DslSeaSurfaceHeightChangeAboveGeoidEnum);
-                iomodel->FetchDataToInput(inputs2,elements,"md.dsl.sea_water_pressure_change_at_sea_floor", DslSeaWaterPressureChangeAtSeaFloor);
+                iomodel->FetchDataToInput(inputs2,elements,"md.dsl.sea_water_pressure_change_at_sea_floor", DslSeaWaterPressureChangeAtSeaFloorEnum);
                 
         } /*}}}*/
         else if (dslmodel==2){ /*multi-model ensemble dsl model:{{{*/
@@ -135 +135 @@
                 xDelete<int>(pN);
                 /*}}}*/
                 iomodel->FetchDataToInput(inputs2,elements,"md.dsl.sea_surface_height_change_above_geoid",DslSeaSurfaceHeightChangeAboveGeoidEnum);
-                iomodel->FetchDataToInput(inputs2,elements,"md.dsl.sea_water_pressure_change_at_sea_floor",DslSeaWaterPressureChangeAtSeaFloor);
+                iomodel->FetchDataToInput(inputs2,elements,"md.dsl.sea_water_pressure_change_at_sea_floor",DslSeaWaterPressureChangeAtSeaFloorEnum);
 
         } /*}}}*/
         else _error_("Dsl model " << dslmodel << " not implemented yet!");

../trunk-jpl/src/c/cores/sealevelchange_core.cpp

@@ -70 +70 @@
 
                 if(VerboseSolution()) _printf0_("   saving results\n");
                 femmodel->parameters->FindParam(&requested_outputs,&numoutputs,SealevelriseRequestedOutputsEnum);
+                femmodel->inputs2->Echo();
                 femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs);
                 if(numoutputs){for(int i=0;i<numoutputs;i++){xDelete<char>(requested_outputs[i]);} xDelete<char*>(requested_outputs);}
         }
@@ -750 +751 @@
         
                 IssmDouble modelid;
                 /*figure out the type of DslSeaWaterPressureChangeAtSeaFloor input:*/
-                type=femmodel->inputs2->GetInputObjectEnum(DslSeaWaterPressureChangeAtSeaFloor);
+                type=femmodel->inputs2->GetInputObjectEnum(DslSeaWaterPressureChangeAtSeaFloorEnum);
 
                 if(type==DatasetInput2Enum){
                 
                         /*find the DslSeaWaterPressureChangeAtSeaFloor dataset of transient inputs:*/
-                        DatasetInput2* dataset_input=femmodel->inputs2->GetDatasetInput2(DslSeaWaterPressureChangeAtSeaFloor);
+                        DatasetInput2* dataset_input=femmodel->inputs2->GetDatasetInput2(DslSeaWaterPressureChangeAtSeaFloorEnum);
                 
                         /*Recover modelid:*/
                         femmodel->parameters->FindParam(&modelid,DslModelidEnum);
@@ -764 +765 @@
                         /*Go find the modelid'th transient input:*/
                         TransientInput2* transient_input=dataset_input->GetTransientInputByOffset(reCast<int, IssmDouble>(modelid));
 
-                        /*Plug into DslDynamicRate input: */
+                        /*Plug into DslSeaWaterPressureChangeAtSeaFloor input: */
                         Input2* transient_input_copy=transient_input->copy();
-                        transient_input_copy->ChangeEnum(DslSeaWaterPressureChangeAtSeaFloor);
+                        transient_input_copy->ChangeEnum(DslSeaWaterPressureChangeAtSeaFloorEnum);
                         femmodel->inputs2->AddInput(transient_input_copy);
                 }
         }