source: issm/oecreview/Archive/27230-27343/ISSM-27283-27284.diff@ 27344

Last change on this file since 27344 was 27344, checked in by Mathieu Morlighem, 2 years ago

CHG: added Archive/27230-27343
File size: 14.0 KB

  • ../trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp

     
    134134            iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum);
    135135         }
    136136         else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){
    137             iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum);
     137            iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",ThermalForcingEnum);
    138138         }
    139139                        break;
    140140                default:

  • ../trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp

     
    224224                                iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum);
    225225                        }
    226226                        else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){
    227                                 iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum);
     227                                iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",ThermalForcingEnum);
    228228                        }
    229229                        break;
    230230                case LinearFloatingMeltRatearmaEnum:

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

     
    862862              iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum);
    863863           }
    864864           else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){
    865               iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum);
     865              iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",ThermalForcingEnum);
    866866           }
    867867                                break;
    868868                        default:

  • ../trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp

     
    164164            iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum);
    165165         }
    166166         else if(melt_parameterization!=FrontalForcingsRignotarmaEnum){
    167             iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum);
     167            iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_thermalforcing",ThermalForcingEnum);
    168168         }
    169169                        break;
    170170                default:

  • ../trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp

     
    149149                        break;
    150150                case FrontalForcingsRignotEnum:
    151151         /*Retrieve thermal forcing only in the case of non-arma FrontalForcingsRignot*/
    152          iomodel->FetchDataToInput(inputs,elements,"md.frontalforcings.thermalforcing",FrontalForcingsAndBasalforcingsThermalForcingEnum);
     152         iomodel->FetchDataToInput(inputs,elements,"md.frontalforcings.thermalforcing",ThermalForcingEnum);
    153153         /* Do not break here, still retrieve basin_ID,subglacial_discharge, etc.*/
    154154      case FrontalForcingsRignotarmaEnum:
    155155         iomodel->FetchDataToInput(inputs,elements,"md.frontalforcings.basin_id",FrontalForcingsBasinIdEnum);

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

     
    8585         maenum_type    = ThermalforcingValuesMovingaverageEnum;
    8686         basinenum_type = FrontalForcingsBasinIdEnum;
    8787         noiseenum_type = ThermalforcingARMANoiseEnum;
    88          outenum_type   = FrontalForcingsAndBasalforcingsThermalForcingEnum;
     88         outenum_type   = ThermalForcingEnum;
    8989         break;
    9090                case(BasalforcingsDeepwaterMeltingRatearmaEnum):
    9191         arenum_type    = BasalforcingsDeepwaterMeltingRateValuesAutoregressionEnum;
    … …  
    194194         arenum_type    = ThermalforcingValuesAutoregressionEnum;
    195195         basinenum_type = FrontalForcingsBasinIdEnum;
    196196         noiseenum_type = ThermalforcingARMANoiseEnum;
    197          outenum_type   = FrontalForcingsAndBasalforcingsThermalForcingEnum;
     197         outenum_type   = ThermalForcingEnum;
    198198         break;
    199199                case(BasalforcingsDeepwaterMeltingRatearmaEnum):
    200200         arenum_type    = BasalforcingsDeepwaterMeltingRateValuesAutoregressionEnum;
    … …  
    28042804                this->GetInputListOnVertices(oceantemp,BasalforcingsOceanTempEnum);
    28052805        }
    28062806        else{
    2807                 this->GetInputListOnVertices(oceanthermalforcing,FrontalForcingsAndBasalforcingsThermalForcingEnum);
     2807                this->GetInputListOnVertices(oceanthermalforcing,ThermalForcingEnum);
    28082808        }
    28092809
    28102810        Gauss* gauss=this->NewGauss();
    … …  
    38133813        this->GetInputValue(&basinid,FrontalForcingsBasinIdEnum);
    38143814        Input* bed_input = this->GetInput(BedEnum);                     _assert_(bed_input);
    38153815   Input* qsg_input = this->GetInput(FrontalForcingsSubglacialDischargeEnum);     _assert_(qsg_input);
    3816    Input* TF_input  = this->GetInput(FrontalForcingsAndBasalforcingsThermalForcingEnum);          _assert_(TF_input);
     3816   Input* TF_input  = this->GetInput(ThermalForcingEnum);          _assert_(TF_input);
    38173817
    38183818        this->FindParam(&yts, ConstantsYtsEnum);
    38193819   this->parameters->FindParam(&numbasins,FrontalForcingsNumberofBasinsEnum);

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

     
    775775syn keyword cConstant FrictionfEnum
    776776syn keyword cConstant FrontalForcingsBasinIdEnum
    777777syn keyword cConstant FrontalForcingsSubglacialDischargeEnum
    778 syn keyword cConstant FrontalForcingsAndBasalforcingsThermalForcingEnum
    779778syn keyword cConstant GeometryHydrostaticRatioEnum
    780779syn keyword cConstant NGiaEnum
    781780syn keyword cConstant NGiaRateEnum
    … …  
    11051104syn keyword cConstant TemperaturePicardEnum
    11061105syn keyword cConstant TemperatureSEMICEnum
    11071106syn keyword cConstant ThermalforcingARMANoiseEnum
     1107syn keyword cConstant ThermalForcingEnum
    11081108syn keyword cConstant ThermalforcingValuesAutoregressionEnum
    11091109syn keyword cConstant ThermalforcingValuesMovingaverageEnum
    11101110syn keyword cConstant ThermalSpctemperatureEnum

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

     
    771771        FrictionfEnum,
    772772        FrontalForcingsBasinIdEnum,
    773773        FrontalForcingsSubglacialDischargeEnum,
    774         FrontalForcingsAndBasalforcingsThermalForcingEnum,
    775774        GeometryHydrostaticRatioEnum,
    776775        NGiaEnum,
    777776        NGiaRateEnum,
    … …  
    11021101        TemperaturePicardEnum,
    11031102        TemperatureSEMICEnum,
    11041103   ThermalforcingARMANoiseEnum,
     1104        ThermalForcingEnum,
    11051105        ThermalforcingValuesAutoregressionEnum,
    11061106        ThermalforcingValuesMovingaverageEnum,
    11071107        ThermalSpctemperatureEnum,

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

     
    777777                case FrictionfEnum : return "Frictionf";
    778778                case FrontalForcingsBasinIdEnum : return "FrontalForcingsBasinId";
    779779                case FrontalForcingsSubglacialDischargeEnum : return "FrontalForcingsSubglacialDischarge";
    780                 case FrontalForcingsAndBasalforcingsThermalForcingEnum : return "FrontalForcingsAndBasalforcingsThermalForcing";
    781780                case GeometryHydrostaticRatioEnum : return "GeometryHydrostaticRatio";
    782781                case NGiaEnum : return "NGia";
    783782                case NGiaRateEnum : return "NGiaRate";
    … …  
    11071106                case TemperaturePicardEnum : return "TemperaturePicard";
    11081107                case TemperatureSEMICEnum : return "TemperatureSEMIC";
    11091108                case ThermalforcingARMANoiseEnum : return "ThermalforcingARMANoise";
     1109                case ThermalForcingEnum : return "ThermalForcing";
    11101110                case ThermalforcingValuesAutoregressionEnum : return "ThermalforcingValuesAutoregression";
    11111111                case ThermalforcingValuesMovingaverageEnum : return "ThermalforcingValuesMovingaverage";
    11121112                case ThermalSpctemperatureEnum : return "ThermalSpctemperature";

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

     
    768768syn keyword juliaConstC FrictionfEnum
    769769syn keyword juliaConstC FrontalForcingsBasinIdEnum
    770770syn keyword juliaConstC FrontalForcingsSubglacialDischargeEnum
    771 syn keyword juliaConstC FrontalForcingsAndBasalforcingsThermalForcingEnum
    772771syn keyword juliaConstC GeometryHydrostaticRatioEnum
    773772syn keyword juliaConstC NGiaEnum
    774773syn keyword juliaConstC NGiaRateEnum
    … …  
    10981097syn keyword juliaConstC TemperaturePicardEnum
    10991098syn keyword juliaConstC TemperatureSEMICEnum
    11001099syn keyword juliaConstC ThermalforcingARMANoiseEnum
     1100syn keyword juliaConstC ThermalForcingEnum
    11011101syn keyword juliaConstC ThermalforcingValuesAutoregressionEnum
    11021102syn keyword juliaConstC ThermalforcingValuesMovingaverageEnum
    11031103syn keyword juliaConstC ThermalSpctemperatureEnum

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

     
    795795              else if (strcmp(name,"Frictionf")==0) return FrictionfEnum;
    796796              else if (strcmp(name,"FrontalForcingsBasinId")==0) return FrontalForcingsBasinIdEnum;
    797797              else if (strcmp(name,"FrontalForcingsSubglacialDischarge")==0) return FrontalForcingsSubglacialDischargeEnum;
    798               else if (strcmp(name,"FrontalForcingsAndBasalforcingsThermalForcing")==0) return FrontalForcingsAndBasalforcingsThermalForcingEnum;
    799798              else if (strcmp(name,"GeometryHydrostaticRatio")==0) return GeometryHydrostaticRatioEnum;
    800799              else if (strcmp(name,"NGia")==0) return NGiaEnum;
    801800              else if (strcmp(name,"NGiaRate")==0) return NGiaRateEnum;
    … …  
    874873              else if (strcmp(name,"MeshVertexonsurface")==0) return MeshVertexonsurfaceEnum;
    875874              else if (strcmp(name,"Misfit")==0) return MisfitEnum;
    876875              else if (strcmp(name,"MovingFrontalVx")==0) return MovingFrontalVxEnum;
     876              else if (strcmp(name,"MovingFrontalVy")==0) return MovingFrontalVyEnum;
    877877         else stage=8;
    878878   }
    879879   if(stage==8){
    880               if (strcmp(name,"MovingFrontalVy")==0) return MovingFrontalVyEnum;
    881               else if (strcmp(name,"Neumannflux")==0) return NeumannfluxEnum;
     880              if (strcmp(name,"Neumannflux")==0) return NeumannfluxEnum;
    882881              else if (strcmp(name,"NewDamage")==0) return NewDamageEnum;
    883882              else if (strcmp(name,"Node")==0) return NodeEnum;
    884883              else if (strcmp(name,"OmegaAbsGradient")==0) return OmegaAbsGradientEnum;
    … …  
    997996              else if (strcmp(name,"SmbCcsnowValue")==0) return SmbCcsnowValueEnum;
    998997              else if (strcmp(name,"SmbCciceValue")==0) return SmbCciceValueEnum;
    999998              else if (strcmp(name,"SmbCotValue")==0) return SmbCotValueEnum;
     999              else if (strcmp(name,"SmbD")==0) return SmbDEnum;
    10001000         else stage=9;
    10011001   }
    10021002   if(stage==9){
    1003               if (strcmp(name,"SmbD")==0) return SmbDEnum;
    1004               else if (strcmp(name,"SmbDailyairdensity")==0) return SmbDailyairdensityEnum;
     1003              if (strcmp(name,"SmbDailyairdensity")==0) return SmbDailyairdensityEnum;
    10051004              else if (strcmp(name,"SmbDailyairhumidity")==0) return SmbDailyairhumidityEnum;
    10061005              else if (strcmp(name,"SmbDailydlradiation")==0) return SmbDailydlradiationEnum;
    10071006              else if (strcmp(name,"SmbDailydsradiation")==0) return SmbDailydsradiationEnum;
    … …  
    11201119              else if (strcmp(name,"SurfaceCrevasse")==0) return SurfaceCrevasseEnum;
    11211120              else if (strcmp(name,"Surface")==0) return SurfaceEnum;
    11221121              else if (strcmp(name,"SurfaceOld")==0) return SurfaceOldEnum;
     1122              else if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
    11231123         else stage=10;
    11241124   }
    11251125   if(stage==10){
    1126               if (strcmp(name,"SurfaceLogVelMisfit")==0) return SurfaceLogVelMisfitEnum;
    1127               else if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
     1126              if (strcmp(name,"SurfaceLogVxVyMisfit")==0) return SurfaceLogVxVyMisfitEnum;
    11281127              else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;
    11291128              else if (strcmp(name,"SurfaceRelVelMisfit")==0) return SurfaceRelVelMisfitEnum;
    11301129              else if (strcmp(name,"SurfaceSlopeX")==0) return SurfaceSlopeXEnum;
    … …  
    11341133              else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum;
    11351134              else if (strcmp(name,"TemperatureSEMIC")==0) return TemperatureSEMICEnum;
    11361135              else if (strcmp(name,"ThermalforcingARMANoise")==0) return ThermalforcingARMANoiseEnum;
     1136              else if (strcmp(name,"ThermalForcing")==0) return ThermalForcingEnum;
    11371137              else if (strcmp(name,"ThermalforcingValuesAutoregression")==0) return ThermalforcingValuesAutoregressionEnum;
    11381138              else if (strcmp(name,"ThermalforcingValuesMovingaverage")==0) return ThermalforcingValuesMovingaverageEnum;
    11391139              else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum;
Note: See TracBrowser for help on using the repository browser.