Changeset 16181
- Timestamp:
- 09/19/13 11:02:41 (12 years ago)
- Location:
- issm/trunk-jpl
- Files:
-
- 45 added
- 1 deleted
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/m4/issm_options.m4
r16173 r16181 1711 1711 AC_MSG_RESULT($HAVE_BALANCED) 1712 1712 dnl }}} 1713 dnl with-damage{{{ 1714 AC_ARG_WITH([damage], 1715 AS_HELP_STRING([--with-damage = YES], [compile with damage capabilities (default is yes)]), 1716 [DAMAGE=$withval],[DAMAGE=yes]) 1717 AC_MSG_CHECKING(for damage capability compilation) 1718 1719 if test "x$DAMAGE" = "xyes"; then 1720 1721 dnl defaults 1722 HAVE_DAMAGE=yes 1723 1724 AC_DEFINE([_HAVE_DAMAGE_],[1],[with damage capability]) 1725 else 1726 HAVE_DAMAGE=no 1727 fi 1728 AM_CONDITIONAL([DAMAGE], [test x$HAVE_DAMAGE = xyes]) 1729 AC_MSG_RESULT($HAVE_DAMAGE) 1730 dnl }}} 1713 1731 dnl with-responses{{{ 1714 1732 AC_ARG_WITH([responses], -
issm/trunk-jpl/src/c/Makefile.am
r16167 r16181 546 546 547 547 #}}} 548 #Damage sources {{{ 549 damage_sources = ./analyses/damage_core.cpp\ 550 ./modules/ModelProcessorx/Damage/UpdateElementsDamage.cpp\ 551 ./modules/ModelProcessorx/Damage/CreateNodesDamage.cpp \ 552 ./modules/ModelProcessorx/Damage/CreateConstraintsDamage.cpp\ 553 ./modules/ModelProcessorx/Damage/CreateParametersDamage.cpp\ 554 ./modules/ModelProcessorx/Damage/CreateLoadsDamage.cpp 555 556 #}}} 548 557 #Groundingline sources {{{ 549 558 groundingline_sources= ./modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp\ … … 950 959 issm_sources += $(pkriging_sources) 951 960 endif 961 962 if DAMAGE 963 issm_sources += $(damage_sources) 964 endif 965 952 966 #}}} 953 967 #Library flags and sources {{{ -
issm/trunk-jpl/src/c/analyses/AnalysisConfiguration.cpp
r16007 r16181 113 113 analyses[0]=GiaAnalysisEnum; 114 114 break; 115 116 case DamageEvolutionSolutionEnum: 117 numanalyses=1; 118 analyses=xNew<int>(numanalyses); 119 analyses[0]=DamageEvolutionAnalysisEnum; 120 break; 115 121 116 122 case TransientSolutionEnum: -
issm/trunk-jpl/src/c/analyses/CorePointerFromSolutionEnum.cpp
r16007 r16181 115 115 #endif 116 116 break; 117 case DamageEvolutionSolutionEnum: 118 #ifdef _HAVE_DAMAGE_ 119 solutioncore=&damage_core; 120 #else 121 _error_("ISSM was not compiled with damage evolution capabilities. Exiting"); 122 #endif 123 break; 117 124 118 125 default: -
issm/trunk-jpl/src/c/analyses/analyses.h
r16007 r16181 38 38 void dummy_core(FemModel* femmodel); 39 39 void gia_core(FemModel* femmodel); 40 void damage_core(FemModel* femmodel); 40 41 IssmDouble objectivefunction(IssmDouble search_scalar,OptArgs* optargs); 41 42 -
issm/trunk-jpl/src/c/classes/Node.cpp
r16164 r16181 92 92 analysis_type==BalancethicknessAnalysisEnum || 93 93 analysis_type==HydrologyDCInefficientAnalysisEnum || 94 analysis_type==DamageEvolutionAnalysisEnum || 94 95 analysis_type==HydrologyDCEfficientAnalysisEnum 95 96 ){ -
issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp
r16142 r16181 130 130 break; 131 131 #endif 132 133 #ifdef _HAVE_DAMAGE_ 134 case DamageEvolutionAnalysisEnum: 135 CreateNodesDamage(pnodes, iomodel); 136 CreateConstraintsDamage(pconstraints,iomodel); 137 CreateLoadsDamage(ploads,iomodel); 138 UpdateElementsDamage(elements,iomodel,analysis_counter,analysis_type); 139 break; 140 #endif 141 132 142 133 143 #ifdef _HAVE_SLOPE_ -
issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp
r16164 r16181 109 109 parameters->AddObject(iomodel->CopyConstantObject(SurfaceforcingsIssmbgradientsEnum)); 110 110 parameters->AddObject(iomodel->CopyConstantObject(GiaCrossSectionShapeEnum)); 111 111 112 112 iomodel->Constant(&ispdd,SurfaceforcingsIspddEnum); 113 113 if(ispdd){ … … 237 237 CreateParametersHydrologyDCEfficient(¶meters,iomodel,solution_type,analysis_type); 238 238 #endif 239 240 #ifdef _HAVE_DAMAGE_ 241 CreateParametersDamage(¶meters,iomodel,solution_type,analysis_type); 242 #endif 239 243 240 244 /*Before returning, create parameters in case we are running Qmu or control types runs: */ -
issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp
r16007 r16181 112 112 numdofs=1; 113 113 break; 114 case DamageEvolutionAnalysisEnum: 115 numdofs=1; 116 break; 114 117 case BalancethicknessAnalysisEnum: 115 118 numdofs=1; -
issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h
r16142 r16181 51 51 void CreateLoadsGia(Loads** ploads, IoModel* iomodel); 52 52 void UpdateElementsGia(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); 53 #endif 54 55 #ifdef _HAVE_DAMAGE_ 56 /*damage*/ 57 void CreateNodesDamage(Nodes** pnodes,IoModel* iomodel); 58 void CreateConstraintsDamage(Constraints** pconstraints,IoModel* iomodel); 59 void CreateLoadsDamage(Loads** ploads, IoModel* iomodel); 60 void UpdateElementsDamage(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); 61 void CreateParametersDamage(Parameters** pparameters,IoModel* iomodel,int solution_type,int analysis_type); 53 62 #endif 54 63 -
issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
r16167 r16181 153 153 MaterialsRheologyNEnum, 154 154 DamageDEnum, 155 QmuDamageDEnum, 155 156 DamageDbarEnum, 156 DamageIsdamageEnum,157 157 DamageLawEnum, 158 158 DamageC1Enum, … … 160 160 DamageC3Enum, 161 161 DamageC4Enum, 162 DamageHealingEnum, 162 163 DamageStressThresholdEnum, 164 DamageStabilizationEnum, 165 DamageSpcdamageEnum, 163 166 MaterialsRhoIceEnum, 164 167 MaterialsRhoWaterEnum, … … 264 267 TransientIsthermalEnum, 265 268 TransientIsgiaEnum, 269 TransientIsdamageEnum, 266 270 TransientNumRequestedOutputsEnum, 267 271 TransientRequestedOutputsEnum, … … 287 291 BedSlopeXAnalysisEnum, 288 292 BedSlopeYAnalysisEnum, 293 DamageEvolutionSolutionEnum, 294 DamageEvolutionAnalysisEnum, 289 295 StressbalanceAnalysisEnum, 290 296 StressbalanceSIAAnalysisEnum, -
issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
r16167 r16181 161 161 case MaterialsRheologyNEnum : return "MaterialsRheologyN"; 162 162 case DamageDEnum : return "DamageD"; 163 case QmuDamageDEnum : return "QmuDamageD"; 163 164 case DamageDbarEnum : return "DamageDbar"; 164 case DamageIsdamageEnum : return "DamageIsdamage";165 165 case DamageLawEnum : return "DamageLaw"; 166 166 case DamageC1Enum : return "DamageC1"; … … 168 168 case DamageC3Enum : return "DamageC3"; 169 169 case DamageC4Enum : return "DamageC4"; 170 case DamageHealingEnum : return "DamageHealing"; 170 171 case DamageStressThresholdEnum : return "DamageStressThreshold"; 172 case DamageStabilizationEnum : return "DamageStabilization"; 173 case DamageSpcdamageEnum : return "DamageSpcdamage"; 171 174 case MaterialsRhoIceEnum : return "MaterialsRhoIce"; 172 175 case MaterialsRhoWaterEnum : return "MaterialsRhoWater"; … … 272 275 case TransientIsthermalEnum : return "TransientIsthermal"; 273 276 case TransientIsgiaEnum : return "TransientIsgia"; 277 case TransientIsdamageEnum : return "TransientIsdamage"; 274 278 case TransientNumRequestedOutputsEnum : return "TransientNumRequestedOutputs"; 275 279 case TransientRequestedOutputsEnum : return "TransientRequestedOutputs"; … … 293 297 case BedSlopeXAnalysisEnum : return "BedSlopeXAnalysis"; 294 298 case BedSlopeYAnalysisEnum : return "BedSlopeYAnalysis"; 299 case DamageEvolutionSolutionEnum : return "DamageEvolutionSolution"; 300 case DamageEvolutionAnalysisEnum : return "DamageEvolutionAnalysis"; 295 301 case StressbalanceAnalysisEnum : return "StressbalanceAnalysis"; 296 302 case StressbalanceSIAAnalysisEnum : return "StressbalanceSIAAnalysis"; -
issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
r16167 r16181 164 164 else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum; 165 165 else if (strcmp(name,"DamageD")==0) return DamageDEnum; 166 else if (strcmp(name,"QmuDamageD")==0) return QmuDamageDEnum; 166 167 else if (strcmp(name,"DamageDbar")==0) return DamageDbarEnum; 167 else if (strcmp(name,"DamageIsdamage")==0) return DamageIsdamageEnum;168 168 else if (strcmp(name,"DamageLaw")==0) return DamageLawEnum; 169 169 else if (strcmp(name,"DamageC1")==0) return DamageC1Enum; … … 171 171 else if (strcmp(name,"DamageC3")==0) return DamageC3Enum; 172 172 else if (strcmp(name,"DamageC4")==0) return DamageC4Enum; 173 else if (strcmp(name,"DamageHealing")==0) return DamageHealingEnum; 173 174 else if (strcmp(name,"DamageStressThreshold")==0) return DamageStressThresholdEnum; 175 else if (strcmp(name,"DamageStabilization")==0) return DamageStabilizationEnum; 176 else if (strcmp(name,"DamageSpcdamage")==0) return DamageSpcdamageEnum; 174 177 else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum; 175 178 else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum; … … 257 260 else if (strcmp(name,"ThermalIsdynamicbasalspc")==0) return ThermalIsdynamicbasalspcEnum; 258 261 else if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum; 259 else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum;260 else if (strcmp(name,"ThermalPenaltyLock")==0) return ThermalPenaltyLockEnum;261 else if (strcmp(name,"ThermalPenaltyThreshold")==0) return ThermalPenaltyThresholdEnum;262 262 else stage=3; 263 263 } 264 264 if(stage==3){ 265 if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum; 265 if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum; 266 else if (strcmp(name,"ThermalPenaltyLock")==0) return ThermalPenaltyLockEnum; 267 else if (strcmp(name,"ThermalPenaltyThreshold")==0) return ThermalPenaltyThresholdEnum; 268 else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum; 266 269 else if (strcmp(name,"ThermalStabilization")==0) return ThermalStabilizationEnum; 267 270 else if (strcmp(name,"GiaMantleViscosity")==0) return GiaMantleViscosityEnum; … … 278 281 else if (strcmp(name,"TransientIsthermal")==0) return TransientIsthermalEnum; 279 282 else if (strcmp(name,"TransientIsgia")==0) return TransientIsgiaEnum; 283 else if (strcmp(name,"TransientIsdamage")==0) return TransientIsdamageEnum; 280 284 else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum; 281 285 else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum; … … 299 303 else if (strcmp(name,"BedSlopeXAnalysis")==0) return BedSlopeXAnalysisEnum; 300 304 else if (strcmp(name,"BedSlopeYAnalysis")==0) return BedSlopeYAnalysisEnum; 305 else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum; 306 else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum; 301 307 else if (strcmp(name,"StressbalanceAnalysis")==0) return StressbalanceAnalysisEnum; 302 308 else if (strcmp(name,"StressbalanceSIAAnalysis")==0) return StressbalanceSIAAnalysisEnum; … … 377 383 else if (strcmp(name,"SSA3dIceFront")==0) return SSA3dIceFrontEnum; 378 384 else if (strcmp(name,"Matice")==0) return MaticeEnum; 379 else if (strcmp(name,"Matpar")==0) return MatparEnum; 385 else stage=4; 386 } 387 if(stage==4){ 388 if (strcmp(name,"Matpar")==0) return MatparEnum; 380 389 else if (strcmp(name,"Node")==0) return NodeEnum; 381 390 else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum; … … 383 392 else if (strcmp(name,"Param")==0) return ParamEnum; 384 393 else if (strcmp(name,"L1L2IceFront")==0) return L1L2IceFrontEnum; 385 else stage=4; 386 } 387 if(stage==4){ 388 if (strcmp(name,"HOIceFront")==0) return HOIceFrontEnum; 394 else if (strcmp(name,"HOIceFront")==0) return HOIceFrontEnum; 389 395 else if (strcmp(name,"Pengrid")==0) return PengridEnum; 390 396 else if (strcmp(name,"Penpair")==0) return PenpairEnum; … … 500 506 else if (strcmp(name,"StressTensor")==0) return StressTensorEnum; 501 507 else if (strcmp(name,"StressTensorxx")==0) return StressTensorxxEnum; 502 else if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum; 508 else stage=5; 509 } 510 if(stage==5){ 511 if (strcmp(name,"StressTensorxy")==0) return StressTensorxyEnum; 503 512 else if (strcmp(name,"StressTensorxz")==0) return StressTensorxzEnum; 504 513 else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum; … … 506 515 else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum; 507 516 else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum; 508 else stage=5; 509 } 510 if(stage==5){ 511 if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum; 517 else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum; 512 518 else if (strcmp(name,"GiaW")==0) return GiaWEnum; 513 519 else if (strcmp(name,"P0")==0) return P0Enum; -
issm/trunk-jpl/src/m/classes/damage.m
r16179 r16181 8 8 % {{{ 9 9 %damage 10 isdamage = NaN;11 10 D = NaN; 12 11 law = ''; 12 spcdamage = NaN; 13 stabilization = NaN; 13 14 14 15 %parameters for law 'initial': … … 18 19 c3 = NaN; 19 20 c4 = NaN; 21 healing = NaN; 20 22 21 23 end % }}} … … 42 44 43 45 %damage parameters: 44 obj.isdamage=0;45 46 obj.D=0; 46 47 obj.law='undamaged'; 47 48 49 %Type of stabilization used 50 obj.stabilization=2; 51 48 52 %damage parameters for 'initial' law of damage propagation 49 53 obj.stress_threshold=0; 54 obj.healing=0; 50 55 obj.c1=0; 51 56 obj.c2=0; … … 57 62 58 63 md = checkfield(md,'damage.D','>=0',0,'size',[md.mesh.numberofvertices 1]); 59 if obj.isdamage,60 md = checkfield(md,'damage.law','values',{'undamaged','pralong'});61 end64 md = checkfield(md,'damage.law','values',{'undamaged','pralong'}); 65 md = checkfield(md,'damage.spcdamage','forcing',1); 66 md = checkfield(md,'damage.stabilization','numel',[1],'values',[0 1 2]); 62 67 if strcmpi(obj.law,'pralong'), 68 md = checkfield(md,'damage.healing','>=',0); 63 69 md = checkfield(md,'damage.c1','>=',0); 64 70 md = checkfield(md,'damage.c2','>=',0); … … 74 80 fielddisplay(obj,'D','damage tensor (scalar)'); 75 81 fielddisplay(obj,'law','damage law (string) from {''undamaged'',''pralong''}'); 82 fielddisplay(obj,'spcdamage','damage constraints (NaN means no constraint) [m]'); 83 fielddisplay(obj,'stabilization','0: no, 1: artificial_diffusivity, 2: SUPG'); 76 84 if strcmpi(obj.law,'pralong'), 77 85 fielddisplay(obj,'c1','damage parameter 1'); … … 79 87 fielddisplay(obj,'c3','damage parameter 3'); 80 88 fielddisplay(obj,'c4','damage parameter 4'); 89 fielddisplay(obj,'healing','damage healing parameter 1'); 81 90 fielddisplay(obj,'stress_threshold','damage stress threshold [Pa]'); 82 91 end … … 85 94 function marshall(obj,md,fid) % {{{ 86 95 87 WriteData(fid,'object',obj,'fieldname','isdamage','format','DoubleMat','mattype',1);88 96 WriteData(fid,'object',obj,'fieldname','D','format','DoubleMat','mattype',1); 89 if obj.isdamage,90 WriteData(fid,'object',obj,'fieldname','law','format','String');91 end97 WriteData(fid,'object',obj,'fieldname','law','format','String'); 98 WriteData(fid,'object',obj,'fieldname','stabilization','format','Integer'); 99 WriteData(fid,'object',obj,'fieldname','spcdamage','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1); 92 100 if strcmpi(obj.law,'pralong'), 93 101 WriteData(fid,'object',obj,'fieldname','c1','format','Double'); … … 96 104 WriteData(fid,'object',obj,'fieldname','c4','format','Double'); 97 105 WriteData(fid,'object',obj,'fieldname','stress_threshold','format','Double'); 106 WriteData(fid,'object',obj,'fieldname','healing','format','Double'); 98 107 end 99 108 -
issm/trunk-jpl/src/m/classes/transient.m
r15771 r16181 11 11 isgroundingline = 0; 12 12 isgia = 0; 13 isdamage = 0; 13 14 requested_outputs = NaN; 14 15 end … … 30 31 obj.isgroundingline=0; 31 32 obj.isgia=0; 33 obj.isdamage=0; 32 34 33 35 end % }}} … … 42 44 md = checkfield(md,'transient.isgroundingline','numel',[1],'values',[0 1]); 43 45 md = checkfield(md,'transient.isgia','numel',[1],'values',[0 1]); 46 md = checkfield(md,'transient.isdamage','numel',[1],'values',[0 1]); 44 47 md = checkfield(md,'transient.requested_outputs','size',[NaN 1]); 45 48 … … 48 51 disp(sprintf(' transient solution parameters:')); 49 52 50 fielddisplay(obj,'ismasstransport','indicates if a masstransport solution is used in the transient'); 51 fielddisplay(obj,'isstressbalance','indicates if a stressbalance solution is used in the transient'); 52 fielddisplay(obj,'isthermal','indicates if a thermal solution is used in the transient'); 53 fielddisplay(obj,'isgroundingline','indicates if a groundingline migration is used in the transient'); 54 fielddisplay(obj,'isgia','indicates if a postglacial rebound model is used in the transient'); 53 fielddisplay(obj,'ismasstransport','indicates whether a masstransport solution is used in the transient'); 54 fielddisplay(obj,'isstressbalance','indicates whether a stressbalance solution is used in the transient'); 55 fielddisplay(obj,'isthermal','indicates whether a thermal solution is used in the transient'); 56 fielddisplay(obj,'isgroundingline','indicates whether a groundingline migration is used in the transient'); 57 fielddisplay(obj,'isgia','indicates whether a postglacial rebound model is used in the transient'); 58 fielddisplay(obj,'isdamage','indicates whether damage evolution is used in the transient'); 55 59 fielddisplay(obj,'requested_outputs','list of additional outputs requested'); 56 60 … … 62 66 WriteData(fid,'object',obj,'fieldname','isgroundingline','format','Boolean'); 63 67 WriteData(fid,'object',obj,'fieldname','isgia','format','Boolean'); 68 WriteData(fid,'object',obj,'fieldname','isdamage','format','Boolean'); 64 69 WriteData(fid,'object',obj,'fieldname','requested_outputs','format','DoubleMat','mattype',3); 65 70 end % }}} -
issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m
r16008 r16181 100 100 numanalyses=3; 101 101 analyses=[BedSlopeAnalysisEnum();SurfaceSlopeAnalysisEnum();HydrologyShreveAnalysisEnum();HydrologyDCInefficientAnalysisEnum();HydrologyDCEfficientAnalysisEnum()]; 102 103 case DamageEvolutionSolutionEnum(), 104 numanalyses=1; 105 analyses=[DamageEvolutionAnalysisEnum()]; 102 106 103 107 otherwise -
issm/trunk-jpl/src/m/enum/EnumDefinitions.py
r16167 r16181 153 153 def MaterialsRheologyNEnum(): return StringToEnum("MaterialsRheologyN")[0] 154 154 def DamageDEnum(): return StringToEnum("DamageD")[0] 155 def QmuDamageDEnum(): return StringToEnum("QmuDamageD")[0] 155 156 def DamageDbarEnum(): return StringToEnum("DamageDbar")[0] 156 def DamageIsdamageEnum(): return StringToEnum("DamageIsdamage")[0]157 157 def DamageLawEnum(): return StringToEnum("DamageLaw")[0] 158 158 def DamageC1Enum(): return StringToEnum("DamageC1")[0] … … 160 160 def DamageC3Enum(): return StringToEnum("DamageC3")[0] 161 161 def DamageC4Enum(): return StringToEnum("DamageC4")[0] 162 def DamageHealingEnum(): return StringToEnum("DamageHealing")[0] 162 163 def DamageStressThresholdEnum(): return StringToEnum("DamageStressThreshold")[0] 164 def DamageStabilizationEnum(): return StringToEnum("DamageStabilization")[0] 165 def DamageSpcdamageEnum(): return StringToEnum("DamageSpcdamage")[0] 163 166 def MaterialsRhoIceEnum(): return StringToEnum("MaterialsRhoIce")[0] 164 167 def MaterialsRhoWaterEnum(): return StringToEnum("MaterialsRhoWater")[0] … … 264 267 def TransientIsthermalEnum(): return StringToEnum("TransientIsthermal")[0] 265 268 def TransientIsgiaEnum(): return StringToEnum("TransientIsgia")[0] 269 def TransientIsdamageEnum(): return StringToEnum("TransientIsdamage")[0] 266 270 def TransientNumRequestedOutputsEnum(): return StringToEnum("TransientNumRequestedOutputs")[0] 267 271 def TransientRequestedOutputsEnum(): return StringToEnum("TransientRequestedOutputs")[0] … … 285 289 def BedSlopeXAnalysisEnum(): return StringToEnum("BedSlopeXAnalysis")[0] 286 290 def BedSlopeYAnalysisEnum(): return StringToEnum("BedSlopeYAnalysis")[0] 291 def DamageEvolutionSolutionEnum(): return StringToEnum("DamageEvolutionSolution")[0] 292 def DamageEvolutionAnalysisEnum(): return StringToEnum("DamageEvolutionAnalysis")[0] 287 293 def StressbalanceAnalysisEnum(): return StringToEnum("StressbalanceAnalysis")[0] 288 294 def StressbalanceSIAAnalysisEnum(): return StringToEnum("StressbalanceSIAAnalysis")[0] -
issm/trunk-jpl/src/m/solve/process_solve_options.m
r16008 r16181 13 13 BalancethicknessSolutionEnum(),BalancethicknessSoftSolutionEnum(),... 14 14 BalancevelocitySolutionEnum(),BedSlopeSolutionEnum(),... 15 SurfaceSlopeSolutionEnum(),HydrologySolutionEnum(),FlaimSolutionEnum(),GiaSolutionEnum() ]),15 SurfaceSlopeSolutionEnum(),HydrologySolutionEnum(),FlaimSolutionEnum(),GiaSolutionEnum(),DamageEvolutionSolutionEnum()]), 16 16 error(['process_solve_options error message: solution_type ' EnumToString(solution_type) ' not supported yet!']); 17 17 end -
issm/trunk-jpl/test/NightlyRun/IdToName.m
r16044 r16181 66 66 case 237, name='SquareShelfTranIspddIsdeltaSSA3d'; 67 67 case 270, name='SquareShelfStressSSA2dDamage'; 68 case 271, name='SquareShelfStressSSA2dDamageTran'; 68 69 case 272, name='SquareShelfCMZSSA2dDamage'; 69 70 case 274, name='SquareShelfStressSSA2dDamageRift';
Note:
See TracChangeset
for help on using the changeset viewer.