Changeset 17735
- Timestamp:
- 04/15/14 09:15:48 (11 years ago)
- Location:
- issm/trunk-jpl/src
- Files:
-
- 1 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp ¶
r17700 r17735 525 525 IssmDouble epl_conductivity = element->GetMaterialParameter(HydrologydcEplConductivityEnum); 526 526 IssmDouble init_thick = element->GetMaterialParameter(HydrologydcEplInitialThicknessEnum); 527 IssmDouble max_thick = element->GetMaterialParameter(HydrologydcEplMaxThicknessEnum); 527 528 528 529 A=pow(B,-n); … … 555 556 556 557 /*Take care of otherthikening*/ 557 if(thickness[i]> 10.0*init_thick){558 thickness[i] = 10.0*init_thick;558 if(thickness[i]>max_thick){ 559 thickness[i] = max_thick; 559 560 } 560 561 } … … 630 631 631 632 IssmDouble init_thick = basalelement->GetMaterialParameter(HydrologydcEplInitialThicknessEnum); 633 IssmDouble init_thick = basalelement->GetMaterialParameter(HydrologydcEplMaximalThicknessEnum); 632 634 633 635 Input* active_element_input=basalelement->GetInput(HydrologydcMaskEplactiveEltEnum); _assert_(active_element_input); … … 653 655 else if(old_active[i]>0.){ 654 656 vec_mask->SetValue(basalelement->nodes[i]->Sid(),1.,INS_VAL); 655 /*If epl thickness gets under , close the layer*/657 /*If epl thickness gets under 10-3 initial thickness, close the layer*/ 656 658 if(epl_thickness[i]<0.001*init_thick){ 657 659 vec_mask->SetValue(basalelement->nodes[i]->Sid(),0.,INS_VAL); -
TabularUnified issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h ¶
r17734 r17735 116 116 HydrologydcEplPorosityEnum, 117 117 HydrologydcEplInitialThicknessEnum, 118 HydrologydcEplMaxThicknessEnum, 118 119 HydrologydcEplThicknessEnum, 119 120 HydrologydcEplThicknessOldEnum, -
TabularUnified issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp ¶
r17734 r17735 124 124 case HydrologydcEplPorosityEnum : return "HydrologydcEplPorosity"; 125 125 case HydrologydcEplInitialThicknessEnum : return "HydrologydcEplInitialThickness"; 126 case HydrologydcEplMaxThicknessEnum : return "HydrologydcEplMaxThickness"; 126 127 case HydrologydcEplThicknessEnum : return "HydrologydcEplThickness"; 127 128 case HydrologydcEplThicknessOldEnum : return "HydrologydcEplThicknessOld"; -
TabularUnified issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp ¶
r17734 r17735 124 124 else if (strcmp(name,"HydrologydcEplPorosity")==0) return HydrologydcEplPorosityEnum; 125 125 else if (strcmp(name,"HydrologydcEplInitialThickness")==0) return HydrologydcEplInitialThicknessEnum; 126 else if (strcmp(name,"HydrologydcEplMaxThickness")==0) return HydrologydcEplMaxThicknessEnum; 126 127 else if (strcmp(name,"HydrologydcEplThickness")==0) return HydrologydcEplThicknessEnum; 127 128 else if (strcmp(name,"HydrologydcEplThicknessOld")==0) return HydrologydcEplThicknessOldEnum; … … 136 137 else if (strcmp(name,"HydrologydcBasalMoulinInput")==0) return HydrologydcBasalMoulinInputEnum; 137 138 else if (strcmp(name,"HydrologyLayer")==0) return HydrologyLayerEnum; 138 else if (strcmp(name,"HydrologySediment")==0) return HydrologySedimentEnum;139 139 else stage=2; 140 140 } 141 141 if(stage==2){ 142 if (strcmp(name,"HydrologyEfficient")==0) return HydrologyEfficientEnum; 142 if (strcmp(name,"HydrologySediment")==0) return HydrologySedimentEnum; 143 else if (strcmp(name,"HydrologyEfficient")==0) return HydrologyEfficientEnum; 143 144 else if (strcmp(name,"HydrologySedimentKmax")==0) return HydrologySedimentKmaxEnum; 144 145 else if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum; … … 259 260 else if (strcmp(name,"ProfilingCurrentMem")==0) return ProfilingCurrentMemEnum; 260 261 else if (strcmp(name,"ProfilingCurrentFlops")==0) return ProfilingCurrentFlopsEnum; 261 else if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum;262 262 else stage=3; 263 263 } 264 264 if(stage==3){ 265 if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum; 265 if (strcmp(name,"ProfilingSolutionTime")==0) return ProfilingSolutionTimeEnum; 266 else if (strcmp(name,"MaxIterationConvergenceFlag")==0) return MaxIterationConvergenceFlagEnum; 266 267 else if (strcmp(name,"SteadystateMaxiter")==0) return SteadystateMaxiterEnum; 267 268 else if (strcmp(name,"SteadystateNumRequestedOutputs")==0) return SteadystateNumRequestedOutputsEnum; … … 382 383 else if (strcmp(name,"FSvelocity")==0) return FSvelocityEnum; 383 384 else if (strcmp(name,"FSpressure")==0) return FSpressureEnum; 384 else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;385 385 else stage=4; 386 386 } 387 387 if(stage==4){ 388 if (strcmp(name,"Loads")==0) return LoadsEnum; 388 if (strcmp(name,"Constraints")==0) return ConstraintsEnum; 389 else if (strcmp(name,"Loads")==0) return LoadsEnum; 389 390 else if (strcmp(name,"Materials")==0) return MaterialsEnum; 390 391 else if (strcmp(name,"Nodes")==0) return NodesEnum; … … 505 506 else if (strcmp(name,"Vx")==0) return VxEnum; 506 507 else if (strcmp(name,"VxPicard")==0) return VxPicardEnum; 507 else if (strcmp(name,"VyAverage")==0) return VyAverageEnum;508 508 else stage=5; 509 509 } 510 510 if(stage==5){ 511 if (strcmp(name,"Vy")==0) return VyEnum; 511 if (strcmp(name,"VyAverage")==0) return VyAverageEnum; 512 else if (strcmp(name,"Vy")==0) return VyEnum; 512 513 else if (strcmp(name,"VyPicard")==0) return VyPicardEnum; 513 514 else if (strcmp(name,"Vz")==0) return VzEnum; … … 628 629 else if (strcmp(name,"QmuMaskGroundediceLevelset")==0) return QmuMaskGroundediceLevelsetEnum; 629 630 else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum; 630 else if (strcmp(name,"GaussTria")==0) return GaussTriaEnum;631 631 else stage=6; 632 632 } 633 633 if(stage==6){ 634 if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum; 634 if (strcmp(name,"GaussTria")==0) return GaussTriaEnum; 635 else if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum; 635 636 else if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum; 636 637 else if (strcmp(name,"FSSolver")==0) return FSSolverEnum; -
TabularUnified issm/trunk-jpl/src/m/enum/EnumDefinitions.py ¶
r17734 r17735 116 116 def HydrologydcEplPorosityEnum(): return StringToEnum("HydrologydcEplPorosity")[0] 117 117 def HydrologydcEplInitialThicknessEnum(): return StringToEnum("HydrologydcEplInitialThickness")[0] 118 def HydrologydcEplMaxThicknessEnum(): return StringToEnum("HydrologydcEplMaxThickness")[0] 118 119 def HydrologydcEplThicknessEnum(): return StringToEnum("HydrologydcEplThickness")[0] 119 120 def HydrologydcEplThicknessOldEnum(): return StringToEnum("HydrologydcEplThicknessOld")[0]
Note:
See TracChangeset
for help on using the changeset viewer.