Changeset 26836
- Timestamp:
- 01/29/22 07:39:27 (3 years ago)
- Location:
- issm/trunk-jpl/src
- Files:
-
- 2 added
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp
r26825 r26836 219 219 iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.ocean_temp",BasalforcingsOceanTempEnum); 220 220 break; 221 case AutoregressionLinearFloatingMeltRateEnum: 222 iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.basin_id",BasalforcingsLinearBasinIdEnum); 223 break; 221 224 default: 222 225 _error_("Basal forcing model "<<EnumToStringx(basalforcing_model)<<" not supported yet"); -
issm/trunk-jpl/src/c/classes/Elements/Element.cpp
r26830 r26836 69 69 70 70 /*Get Basin ID and Basin coefficients*/ 71 if(enum_type==SMBautoregressionEnum) this->GetInputValue(&basinid,SmbBasinsIdEnum); 72 if(enum_type==FrontalForcingsRignotAutoregressionEnum) this->GetInputValue(&basinid,FrontalForcingsBasinIdEnum); 71 if(enum_type==SMBautoregressionEnum) this->GetInputValue(&basinid,SmbBasinsIdEnum); 72 if(enum_type==FrontalForcingsRignotAutoregressionEnum) this->GetInputValue(&basinid,FrontalForcingsBasinIdEnum); 73 if(enum_type==BasalforcingsDeepwaterMeltingRateAutoregressionEnum) this->GetInputValue(&basinid,BasalforcingsLinearBasinIdEnum); 73 74 for(int i=0;i<arorder;i++) phi_basin[i] = phi[basinid*arorder+i]; 74 75 beta0_basin = beta0[basinid]; … … 92 93 xDelete<IssmDouble>(oldvarspin); 93 94 } 94 if(enum_type==SMBautoregressionEnum) this->inputs->SetArrayInput(SmbValuesAutoregressionEnum,this->lid,varspin,numvertices*arorder); 95 if(enum_type==FrontalForcingsRignotAutoregressionEnum) this->inputs->SetArrayInput(ThermalforcingValuesAutoregressionEnum,this->lid,varspin,numvertices*arorder); 95 if(enum_type==SMBautoregressionEnum) this->inputs->SetArrayInput(SmbValuesAutoregressionEnum,this->lid,varspin,numvertices*arorder); 96 if(enum_type==FrontalForcingsRignotAutoregressionEnum) this->inputs->SetArrayInput(ThermalforcingValuesAutoregressionEnum,this->lid,varspin,numvertices*arorder); 97 if(enum_type==BasalforcingsDeepwaterMeltingRateAutoregressionEnum) this->inputs->SetArrayInput(BasalforcingsDeepwaterMeltingRateValuesAutoregressionEnum,this->lid,varspin,numvertices*arorder); 96 98 97 99 /*Cleanup and return*/ … … 123 125 outenum_type = FrontalForcingsThermalForcingEnum; 124 126 break; 127 case(BasalforcingsDeepwaterMeltingRateAutoregressionEnum): 128 arenum_type = BasalforcingsDeepwaterMeltingRateValuesAutoregressionEnum; 129 basinenum_type = BasalforcingsLinearBasinIdEnum; 130 noiseenum_type = BasalforcingsDeepwaterMeltingRateNoiseEnum; 131 outenum_type = BasalforcingsSpatialDeepwaterMeltingRateEnum; 132 break; 125 133 } 126 134 … … 172 180 xDelete<IssmDouble>(varlist); 173 181 xDelete<IssmDouble>(valuesautoregression); 182 }/*}}}*/ 183 void Element::BasinLinearFloatingiceMeltingRate(IssmDouble* deepwaterel,IssmDouble* upperwatermelt,IssmDouble* upperwaterel,IssmDouble* perturbation){/*{{{*/ 184 185 const int NUM_VERTICES = this->GetNumberOfVertices(); 186 187 int basinid; 188 IssmDouble alpha; 189 IssmDouble base[MAXVERTICES]; 190 IssmDouble values[MAXVERTICES]; 191 IssmDouble deepwatermelt[MAXVERTICES]; 192 193 /*Get element-specific values*/ 194 this->GetInputValue(&basinid,BasalforcingsLinearBasinIdEnum); 195 this->GetInputListOnVertices(&base[0],BaseEnum); 196 this->GetInputListOnVertices(&deepwatermelt[0],BasalforcingsSpatialDeepwaterMeltingRateEnum); 197 198 /*Compute melt rate at vertices according to basin-specific values of input arguments*/ 199 for(int i=0;i<NUM_VERTICES;i++){ 200 if(base[i]>=upperwaterel[basinid]){ 201 values[i]=upperwatermelt[basinid]; 202 } 203 else if (base[i]<deepwaterel[basinid]){ 204 values[i]=deepwatermelt[i]; 205 } 206 else{ 207 alpha = (base[i]-upperwaterel[basinid])/(deepwaterel[basinid]-upperwaterel[basinid]); 208 values[i]=deepwatermelt[i]*alpha+(1.-alpha)*upperwatermelt[basinid]; 209 } 210 } 211 212 this->AddInput(BasalforcingsFloatingiceMeltingRateEnum,&values[0],P1Enum); 174 213 }/*}}}*/ 175 214 void Element::ComputeLambdaS(){/*{{{*/ … … 2301 2340 IssmDouble base[MAXVERTICES]; 2302 2341 IssmDouble values[MAXVERTICES]; 2303 IssmDouble perturbation[MAXVERTICES];2304 2342 IssmDouble time; 2305 2343 … … 2312 2350 2313 2351 this->GetInputListOnVertices(&base[0],BaseEnum); 2314 this->GetInputListOnVertices(&perturbation[0],BasalforcingsPerturbationMeltingRateEnum);2315 2352 for(int i=0;i<NUM_VERTICES;i++){ 2316 2353 if(base[i]>=upperwaterel){ … … 2324 2361 values[i]=deepwatermelt*alpha+(1.-alpha)*upperwatermelt; 2325 2362 } 2326 2327 values[i]+=perturbation[i];2328 2363 } 2329 2364 -
issm/trunk-jpl/src/c/classes/Elements/Element.h
r26830 r26836 70 70 void AutoregressionInit(int numbasins,int arorder,int nspin,IssmDouble starttime,IssmDouble tstep_ar,IssmDouble tinit_ar,IssmDouble* beta0,IssmDouble* beta1,IssmDouble* phi,int enum_type); 71 71 void Autoregression(bool isstepforar,int arorder,IssmDouble telapsed_ar,IssmDouble* beta0,IssmDouble* beta1,IssmDouble* phi,bool isfieldstochastic,int enum_type); 72 void BasinLinearFloatingiceMeltingRate(IssmDouble* deepwaterel,IssmDouble* upperwatermelt,IssmDouble* upperwaterel,IssmDouble* perturbation); 72 73 void ComputeLambdaS(void); 73 74 void ComputeNewDamage(); -
issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.cpp
r26329 r26836 45 45 if(VerboseSolution())_printf0_(" call BeckmannGoosse Floating melting rate module\n"); 46 46 BeckmannGoosseFloatingiceMeltingRatex(femmodel); 47 break; 48 case AutoregressionLinearFloatingMeltRateEnum: 49 if(VerboseSolution())_printf0_(" call Autoregression Linear Floating melting rate module\n"); 50 AutoregressionLinearFloatingiceMeltingRatex(femmodel); 47 51 break; 48 52 default: … … 206 210 } 207 211 /*}}}*/ 212 void AutoregressionLinearFloatingiceMeltingRateInitx(FemModel* femmodel){/*{{{*/ 213 214 /*Initialization step of AutoregressionLinearFloatingiceMeltingRatex*/ 215 int M,N,Nphi,arorder,numbasins,my_rank; 216 IssmDouble starttime,tstep_ar,tinit_ar; 217 femmodel->parameters->FindParam(&numbasins,BasalforcingsLinearNumBasinsEnum); 218 femmodel->parameters->FindParam(&arorder,BasalforcingsAutoregressiveOrderEnum); 219 IssmDouble* beta0 = NULL; 220 IssmDouble* beta1 = NULL; 221 IssmDouble* phi = NULL; 222 femmodel->parameters->FindParam(&starttime,TimesteppingStartTimeEnum); 223 femmodel->parameters->FindParam(&tstep_ar,BasalforcingsAutoregressionTimestepEnum); 224 femmodel->parameters->FindParam(&tinit_ar,BasalforcingsAutoregressionInitialTimeEnum); 225 femmodel->parameters->FindParam(&beta0,&M,BasalforcingsBeta0Enum); _assert_(M==numbasins); 226 femmodel->parameters->FindParam(&beta1,&M,BasalforcingsBeta1Enum); _assert_(M==numbasins); 227 femmodel->parameters->FindParam(&phi,&M,&Nphi,BasalforcingsPhiEnum); _assert_(M==numbasins); _assert_(Nphi==arorder); 228 229 /*AR model spin-up with 0 noise to initialize BasalforcingsDeepwaterMeltingRateValuesAutoregressionEnum (688 = log(0.001)/log(0.99): decaying time of inluence of phi[0]=0.99 to 0.001 of beta_0*/ 230 int nspin = 688; 231 for(Object* &object:femmodel->elements->objects){ 232 Element* element = xDynamicCast<Element*>(object); //generate element object 233 element->AutoregressionInit(numbasins,arorder,nspin,starttime,tstep_ar,tinit_ar,beta0,beta1,phi,BasalforcingsDeepwaterMeltingRateAutoregressionEnum); 234 } 235 /*Cleanup*/ 236 xDelete<IssmDouble>(beta0); 237 xDelete<IssmDouble>(beta1); 238 xDelete<IssmDouble>(phi); 239 }/*}}}*/ 240 void AutoregressionLinearFloatingiceMeltingRatex(FemModel* femmodel){/*{{{*/ 241 242 /*Get time parameters*/ 243 IssmDouble time,dt,starttime,tstep_ar; 244 femmodel->parameters->FindParam(&time,TimeEnum); 245 femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum); 246 femmodel->parameters->FindParam(&starttime,TimesteppingStartTimeEnum); 247 femmodel->parameters->FindParam(&tstep_ar,BasalforcingsAutoregressionTimestepEnum); 248 249 /*Initialize module at first time step*/ 250 if(time<=starttime+dt){AutoregressionLinearFloatingiceMeltingRateInitx(femmodel);} 251 /*Determine if this is a time step for the AR model*/ 252 bool isstepforar = false; 253 254 #ifndef _HAVE_AD_ 255 if((fmod(time,tstep_ar)<fmod((time-dt),tstep_ar)) || (time<=starttime+dt) || tstep_ar==dt) isstepforar = true; 256 #else 257 _error_("not implemented yet"); 258 #endif 259 260 /*Load parameters*/ 261 bool isstochastic; 262 bool isdeepmeltingstochastic = false; 263 int M,N,Nphi,arorder,numbasins,my_rank; 264 femmodel->parameters->FindParam(&numbasins,BasalforcingsLinearNumBasinsEnum); 265 femmodel->parameters->FindParam(&arorder,BasalforcingsAutoregressiveOrderEnum); 266 IssmDouble tinit_ar; 267 IssmDouble* beta0 = NULL; 268 IssmDouble* beta1 = NULL; 269 IssmDouble* phi = NULL; 270 IssmDouble* deepwaterel = NULL; 271 IssmDouble* upperwaterel = NULL; 272 IssmDouble* upperwatermelt = NULL; 273 IssmDouble* perturbation = NULL; 274 275 /*Get autoregressive parameters*/ 276 femmodel->parameters->FindParam(&tinit_ar,BasalforcingsAutoregressionInitialTimeEnum); 277 femmodel->parameters->FindParam(&beta0,&M,BasalforcingsBeta0Enum); _assert_(M==numbasins); 278 femmodel->parameters->FindParam(&beta1,&M,BasalforcingsBeta1Enum); _assert_(M==numbasins); 279 femmodel->parameters->FindParam(&phi,&M,&Nphi,BasalforcingsPhiEnum); _assert_(M==numbasins); _assert_(Nphi==arorder); 280 281 /*Get basin-specific parameters*/ 282 femmodel->parameters->FindParam(&deepwaterel,&M,BasalforcingsDeepwaterElevationEnum); _assert_(M==numbasins); 283 femmodel->parameters->FindParam(&upperwaterel,&M,BasalforcingsUpperwaterElevationEnum); _assert_(M==numbasins); 284 femmodel->parameters->FindParam(&upperwatermelt,&M,BasalforcingsUpperwaterMeltingRateEnum); _assert_(M==numbasins); 285 286 /*Evaluate whether stochasticity on DeepwaterMeltingRate is requested*/ 287 femmodel->parameters->FindParam(&isstochastic,StochasticForcingIsStochasticForcingEnum); 288 if(isstochastic){ 289 int numstochasticfields; 290 int* stochasticfields; 291 femmodel->parameters->FindParam(&numstochasticfields,StochasticForcingNumFieldsEnum); 292 femmodel->parameters->FindParam(&stochasticfields,&N,StochasticForcingFieldsEnum); _assert_(N==numstochasticfields); 293 for(int i=0;i<numstochasticfields;i++){ 294 if(stochasticfields[i]==BasalforcingsDeepwaterMeltingRateAutoregressionEnum) isdeepmeltingstochastic = true; 295 } 296 xDelete<int>(stochasticfields); 297 } 298 /*Time elapsed with respect to AR model initial time*/ 299 IssmDouble telapsed_ar = time-tinit_ar; 300 301 /*Loop over each element to compute FloatingiceMeltingRate at vertices*/ 302 for(Object* &object:femmodel->elements->objects){ 303 Element* element = xDynamicCast<Element*>(object); 304 /*Compute autoregression*/ 305 element->Autoregression(isstepforar,arorder,telapsed_ar,beta0,beta1,phi,isdeepmeltingstochastic,BasalforcingsDeepwaterMeltingRateAutoregressionEnum); 306 element->BasinLinearFloatingiceMeltingRate(deepwaterel,upperwatermelt,upperwaterel,perturbation); 307 } 308 }/*}}}*/ -
issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatex/FloatingiceMeltingRatex.h
r24145 r26836 16 16 void FloatingiceMeltingRateIsmip6x(FemModel* femmodel); 17 17 void BeckmannGoosseFloatingiceMeltingRatex(FemModel* femmodel); 18 void AutoregressionLinearFloatingiceMeltingRateInitx(FemModel* femmodel); 19 void AutoregressionLinearFloatingiceMeltingRatex(FemModel* femmodel); 18 20 19 21 #endif /* _FloatingiceMeltingRatex_H*/ -
issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp
r26810 r26836 252 252 break; 253 253 case BeckmannGoosseFloatingMeltRateEnum: 254 break; 255 case AutoregressionLinearFloatingMeltRateEnum: 256 /*Add parameters that are not in standard nbvertices format*/ 257 parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.num_basins",BasalforcingsLinearNumBasinsEnum)); 258 parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.ar_order",BasalforcingsAutoregressiveOrderEnum)); 259 parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.ar_initialtime",BasalforcingsAutoregressionInitialTimeEnum)); 260 parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.ar_timestep",BasalforcingsAutoregressionTimestepEnum)); 261 iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.beta0"); 262 parameters->AddObject(new DoubleVecParam(BasalforcingsBeta0Enum,transparam,N)); 263 xDelete<IssmDouble>(transparam); 264 iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.beta1"); 265 parameters->AddObject(new DoubleVecParam(BasalforcingsBeta1Enum,transparam,N)); 266 xDelete<IssmDouble>(transparam); 267 iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.phi"); 268 parameters->AddObject(new DoubleMatParam(BasalforcingsPhiEnum,transparam,M,N)); 269 xDelete<IssmDouble>(transparam); 270 iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.upperwater_melting_rate"); 271 parameters->AddObject(new DoubleVecParam(BasalforcingsUpperwaterMeltingRateEnum,transparam,N)); 272 xDelete<IssmDouble>(transparam); 273 iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.upperwater_elevation"); 274 parameters->AddObject(new DoubleVecParam(BasalforcingsUpperwaterElevationEnum,transparam,N)); 275 xDelete<IssmDouble>(transparam); 276 iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.deepwater_elevation"); 277 parameters->AddObject(new DoubleVecParam(BasalforcingsDeepwaterElevationEnum,transparam,N)); 278 xDelete<IssmDouble>(transparam); 254 279 break; 255 280 default: -
issm/trunk-jpl/src/c/shared/Enum/Enum.vim
r26826 r26836 64 64 syn keyword cConstant BalancethicknessStabilizationEnum 65 65 syn keyword cConstant BarystaticContributionsEnum 66 syn keyword cConstant BasalforcingsAutoregressionInitialTimeEnum 67 syn keyword cConstant BasalforcingsAutoregressionTimestepEnum 68 syn keyword cConstant BasalforcingsAutoregressiveOrderEnum 69 syn keyword cConstant BasalforcingsBeta0Enum 70 syn keyword cConstant BasalforcingsBeta1Enum 66 71 syn keyword cConstant BasalforcingsBottomplumedepthEnum 67 72 syn keyword cConstant BasalforcingsCrustthicknessEnum 68 73 syn keyword cConstant BasalforcingsDeepwaterElevationEnum 69 74 syn keyword cConstant BasalforcingsDeepwaterMeltingRateEnum 75 syn keyword cConstant BasalforcingsDeepwaterMeltingRateNoiseEnum 70 76 syn keyword cConstant BasalforcingsDtbgEnum 71 77 syn keyword cConstant BasalforcingsEnum … … 77 83 syn keyword cConstant BasalforcingsIsmip6NumBasinsEnum 78 84 syn keyword cConstant BasalforcingsIsmip6TfDepthsEnum 85 syn keyword cConstant BasalforcingsLinearNumBasinsEnum 79 86 syn keyword cConstant BasalforcingsLowercrustheatEnum 80 87 syn keyword cConstant BasalforcingsMantleconductivityEnum 81 88 syn keyword cConstant BasalforcingsNusseltEnum 89 syn keyword cConstant BasalforcingsPhiEnum 82 90 syn keyword cConstant BasalforcingsPicoAverageOverturningEnum 83 91 syn keyword cConstant BasalforcingsPicoAverageSalinityEnum … … 594 602 syn keyword cConstant BalancethicknessThickeningRateEnum 595 603 syn keyword cConstant BasalCrevasseEnum 604 syn keyword cConstant BasalforcingsDeepwaterMeltingRateAutoregressionEnum 605 syn keyword cConstant BasalforcingsDeepwaterMeltingRateValuesAutoregressionEnum 596 606 syn keyword cConstant BasalforcingsFloatingiceMeltingRateEnum 597 607 syn keyword cConstant BasalforcingsGeothermalfluxEnum 598 608 syn keyword cConstant BasalforcingsGroundediceMeltingRateEnum 609 syn keyword cConstant BasalforcingsLinearBasinIdEnum 599 610 syn keyword cConstant BasalforcingsPerturbationMeltingRateEnum 600 611 syn keyword cConstant BasalforcingsSpatialDeepwaterElevationEnum … … 1212 1223 syn keyword cConstant ArrheniusEnum 1213 1224 syn keyword cConstant AutodiffJacobianEnum 1225 syn keyword cConstant AutoregressionLinearFloatingMeltRateEnum 1214 1226 syn keyword cConstant Balancethickness2AnalysisEnum 1215 1227 syn keyword cConstant Balancethickness2SolutionEnum -
issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
r26826 r26836 58 58 BalancethicknessStabilizationEnum, 59 59 BarystaticContributionsEnum, 60 BasalforcingsAutoregressionInitialTimeEnum, 61 BasalforcingsAutoregressionTimestepEnum, 62 BasalforcingsAutoregressiveOrderEnum, 63 BasalforcingsBeta0Enum, 64 BasalforcingsBeta1Enum, 60 65 BasalforcingsBottomplumedepthEnum, 61 66 BasalforcingsCrustthicknessEnum, 62 67 BasalforcingsDeepwaterElevationEnum, 63 68 BasalforcingsDeepwaterMeltingRateEnum, 69 BasalforcingsDeepwaterMeltingRateNoiseEnum, 64 70 BasalforcingsDtbgEnum, 65 71 BasalforcingsEnum, … … 71 77 BasalforcingsIsmip6NumBasinsEnum, 72 78 BasalforcingsIsmip6TfDepthsEnum, 79 BasalforcingsLinearNumBasinsEnum, 73 80 BasalforcingsLowercrustheatEnum, 74 81 BasalforcingsMantleconductivityEnum, 75 82 BasalforcingsNusseltEnum, 83 BasalforcingsPhiEnum, 76 84 BasalforcingsPicoAverageOverturningEnum, 77 85 BasalforcingsPicoAverageSalinityEnum, … … 590 598 BalancethicknessThickeningRateEnum, 591 599 BasalCrevasseEnum, 600 BasalforcingsDeepwaterMeltingRateAutoregressionEnum, 601 BasalforcingsDeepwaterMeltingRateValuesAutoregressionEnum, 592 602 BasalforcingsFloatingiceMeltingRateEnum, 593 603 BasalforcingsGeothermalfluxEnum, 594 604 BasalforcingsGroundediceMeltingRateEnum, 605 BasalforcingsLinearBasinIdEnum, 595 606 BasalforcingsPerturbationMeltingRateEnum, 596 607 BasalforcingsSpatialDeepwaterElevationEnum, … … 1211 1222 ArrheniusEnum, 1212 1223 AutodiffJacobianEnum, 1224 AutoregressionLinearFloatingMeltRateEnum, 1213 1225 Balancethickness2AnalysisEnum, 1214 1226 Balancethickness2SolutionEnum, -
issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
r26826 r26836 66 66 case BalancethicknessStabilizationEnum : return "BalancethicknessStabilization"; 67 67 case BarystaticContributionsEnum : return "BarystaticContributions"; 68 case BasalforcingsAutoregressionInitialTimeEnum : return "BasalforcingsAutoregressionInitialTime"; 69 case BasalforcingsAutoregressionTimestepEnum : return "BasalforcingsAutoregressionTimestep"; 70 case BasalforcingsAutoregressiveOrderEnum : return "BasalforcingsAutoregressiveOrder"; 71 case BasalforcingsBeta0Enum : return "BasalforcingsBeta0"; 72 case BasalforcingsBeta1Enum : return "BasalforcingsBeta1"; 68 73 case BasalforcingsBottomplumedepthEnum : return "BasalforcingsBottomplumedepth"; 69 74 case BasalforcingsCrustthicknessEnum : return "BasalforcingsCrustthickness"; 70 75 case BasalforcingsDeepwaterElevationEnum : return "BasalforcingsDeepwaterElevation"; 71 76 case BasalforcingsDeepwaterMeltingRateEnum : return "BasalforcingsDeepwaterMeltingRate"; 77 case BasalforcingsDeepwaterMeltingRateNoiseEnum : return "BasalforcingsDeepwaterMeltingRateNoise"; 72 78 case BasalforcingsDtbgEnum : return "BasalforcingsDtbg"; 73 79 case BasalforcingsEnum : return "Basalforcings"; … … 79 85 case BasalforcingsIsmip6NumBasinsEnum : return "BasalforcingsIsmip6NumBasins"; 80 86 case BasalforcingsIsmip6TfDepthsEnum : return "BasalforcingsIsmip6TfDepths"; 87 case BasalforcingsLinearNumBasinsEnum : return "BasalforcingsLinearNumBasins"; 81 88 case BasalforcingsLowercrustheatEnum : return "BasalforcingsLowercrustheat"; 82 89 case BasalforcingsMantleconductivityEnum : return "BasalforcingsMantleconductivity"; 83 90 case BasalforcingsNusseltEnum : return "BasalforcingsNusselt"; 91 case BasalforcingsPhiEnum : return "BasalforcingsPhi"; 84 92 case BasalforcingsPicoAverageOverturningEnum : return "BasalforcingsPicoAverageOverturning"; 85 93 case BasalforcingsPicoAverageSalinityEnum : return "BasalforcingsPicoAverageSalinity"; … … 596 604 case BalancethicknessThickeningRateEnum : return "BalancethicknessThickeningRate"; 597 605 case BasalCrevasseEnum : return "BasalCrevasse"; 606 case BasalforcingsDeepwaterMeltingRateAutoregressionEnum : return "BasalforcingsDeepwaterMeltingRateAutoregression"; 607 case BasalforcingsDeepwaterMeltingRateValuesAutoregressionEnum : return "BasalforcingsDeepwaterMeltingRateValuesAutoregression"; 598 608 case BasalforcingsFloatingiceMeltingRateEnum : return "BasalforcingsFloatingiceMeltingRate"; 599 609 case BasalforcingsGeothermalfluxEnum : return "BasalforcingsGeothermalflux"; 600 610 case BasalforcingsGroundediceMeltingRateEnum : return "BasalforcingsGroundediceMeltingRate"; 611 case BasalforcingsLinearBasinIdEnum : return "BasalforcingsLinearBasinId"; 601 612 case BasalforcingsPerturbationMeltingRateEnum : return "BasalforcingsPerturbationMeltingRate"; 602 613 case BasalforcingsSpatialDeepwaterElevationEnum : return "BasalforcingsSpatialDeepwaterElevation"; … … 1214 1225 case ArrheniusEnum : return "Arrhenius"; 1215 1226 case AutodiffJacobianEnum : return "AutodiffJacobian"; 1227 case AutoregressionLinearFloatingMeltRateEnum : return "AutoregressionLinearFloatingMeltRate"; 1216 1228 case Balancethickness2AnalysisEnum : return "Balancethickness2Analysis"; 1217 1229 case Balancethickness2SolutionEnum : return "Balancethickness2Solution"; -
issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim
r26826 r26836 57 57 syn keyword juliaConstC BalancethicknessStabilizationEnum 58 58 syn keyword juliaConstC BarystaticContributionsEnum 59 syn keyword juliaConstC BasalforcingsAutoregressionInitialTimeEnum 60 syn keyword juliaConstC BasalforcingsAutoregressionTimestepEnum 61 syn keyword juliaConstC BasalforcingsAutoregressiveOrderEnum 62 syn keyword juliaConstC BasalforcingsBeta0Enum 63 syn keyword juliaConstC BasalforcingsBeta1Enum 59 64 syn keyword juliaConstC BasalforcingsBottomplumedepthEnum 60 65 syn keyword juliaConstC BasalforcingsCrustthicknessEnum 61 66 syn keyword juliaConstC BasalforcingsDeepwaterElevationEnum 62 67 syn keyword juliaConstC BasalforcingsDeepwaterMeltingRateEnum 68 syn keyword juliaConstC BasalforcingsDeepwaterMeltingRateNoiseEnum 63 69 syn keyword juliaConstC BasalforcingsDtbgEnum 64 70 syn keyword juliaConstC BasalforcingsEnum … … 70 76 syn keyword juliaConstC BasalforcingsIsmip6NumBasinsEnum 71 77 syn keyword juliaConstC BasalforcingsIsmip6TfDepthsEnum 78 syn keyword juliaConstC BasalforcingsLinearNumBasinsEnum 72 79 syn keyword juliaConstC BasalforcingsLowercrustheatEnum 73 80 syn keyword juliaConstC BasalforcingsMantleconductivityEnum 74 81 syn keyword juliaConstC BasalforcingsNusseltEnum 82 syn keyword juliaConstC BasalforcingsPhiEnum 75 83 syn keyword juliaConstC BasalforcingsPicoAverageOverturningEnum 76 84 syn keyword juliaConstC BasalforcingsPicoAverageSalinityEnum … … 587 595 syn keyword juliaConstC BalancethicknessThickeningRateEnum 588 596 syn keyword juliaConstC BasalCrevasseEnum 597 syn keyword juliaConstC BasalforcingsDeepwaterMeltingRateAutoregressionEnum 598 syn keyword juliaConstC BasalforcingsDeepwaterMeltingRateValuesAutoregressionEnum 589 599 syn keyword juliaConstC BasalforcingsFloatingiceMeltingRateEnum 590 600 syn keyword juliaConstC BasalforcingsGeothermalfluxEnum 591 601 syn keyword juliaConstC BasalforcingsGroundediceMeltingRateEnum 602 syn keyword juliaConstC BasalforcingsLinearBasinIdEnum 592 603 syn keyword juliaConstC BasalforcingsPerturbationMeltingRateEnum 593 604 syn keyword juliaConstC BasalforcingsSpatialDeepwaterElevationEnum … … 1205 1216 syn keyword juliaConstC ArrheniusEnum 1206 1217 syn keyword juliaConstC AutodiffJacobianEnum 1218 syn keyword juliaConstC AutoregressionLinearFloatingMeltRateEnum 1207 1219 syn keyword juliaConstC Balancethickness2AnalysisEnum 1208 1220 syn keyword juliaConstC Balancethickness2SolutionEnum -
issm/trunk-jpl/src/c/shared/io/Marshalling/IoCodeConversions.cpp
r26832 r26836 255 255 case 7: return BasalforcingsIsmip6Enum; 256 256 case 8: return BeckmannGoosseFloatingMeltRateEnum; 257 case 9: return AutoregressionLinearFloatingMeltRateEnum; 257 258 default: _error_("Marshalled Basal Forcings code \""<<enum_in<<"\" not supported yet"); 258 259 }
Note:
See TracChangeset
for help on using the changeset viewer.