[17802] | 1 | Index: ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 17534)
|
---|
| 4 | +++ ../trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 17535)
|
---|
| 5 | @@ -3388,7 +3388,10 @@
|
---|
| 6 |
|
---|
| 7 | int i,tausize,meshtype,dim;
|
---|
| 8 | IssmDouble Jdet,r;
|
---|
| 9 | + IssmDouble epsxx,epsyy,epszz,epsxy,epsxz,epsyz;
|
---|
| 10 | + IssmDouble sigmapxx,sigmapyy,sigmapzz,sigmapxy,sigmapxz,sigmapyz;
|
---|
| 11 | IssmDouble *xyz_list = NULL;
|
---|
| 12 | + Gauss* gauss = NULL;
|
---|
| 13 |
|
---|
| 14 | /*Get problem dimension*/
|
---|
| 15 | element->FindParam(&meshtype,MeshTypeEnum);
|
---|
| 16 | @@ -3411,21 +3414,67 @@
|
---|
| 17 | int* cs_list = xNew<int>(vnumnodes+pnumnodes);
|
---|
| 18 | if(dim==2) for(i=0;i<vnumnodes;i++) cs_list[i] = XYEnum;
|
---|
| 19 | else for(i=0;i<vnumnodes;i++) cs_list[i] = XYZEnum;
|
---|
| 20 | - for(i=0;i<pnumnodes;i++) cs_list[vnumnodes+i] = PressureEnum;
|
---|
| 21 | + for(i=0;i<pnumnodes;i++) cs_list[vnumnodes+i] = PressureEnum;
|
---|
| 22 |
|
---|
| 23 | /*Initialize vectors*/
|
---|
| 24 | ElementVector* pe = element->NewElementVector(FSvelocityEnum);
|
---|
| 25 | - IssmDouble* Dstar = xNew<IssmDouble>(tausize*tnumnodes);
|
---|
| 26 | - IssmDouble* tau = xNew<IssmDouble>(tausize);
|
---|
| 27 | + IssmDouble* Dstar = xNew<IssmDouble>((dim*vnumnodes)*(tausize*tnumnodes));
|
---|
| 28 | + IssmDouble* tau = xNew<IssmDouble>(tausize*tnumnodes);
|
---|
| 29 | + IssmDouble* d = xNew<IssmDouble>(tausize*tnumnodes);
|
---|
| 30 |
|
---|
| 31 | /*Retrieve all inputs and parameters*/
|
---|
| 32 | element->GetVerticesCoordinates(&xyz_list);
|
---|
| 33 |
|
---|
| 34 | + /*Get d and tau*/
|
---|
| 35 | + Input* epsxx_input=element->GetInput(StrainRatexxEnum); _assert_(epsxx_input);
|
---|
| 36 | + Input* epsyy_input=element->GetInput(StrainRateyyEnum); _assert_(epsyy_input);
|
---|
| 37 | + Input* epsxy_input=element->GetInput(StrainRatexyEnum); _assert_(epsxy_input);
|
---|
| 38 | + Input* epszz_input=NULL; Input* epsxz_input=NULL; Input* epsyz_input=NULL;
|
---|
| 39 | + Input* sigmapxx_input=element->GetInput(DeviatoricStressxxEnum); _assert_(sigmapxx_input);
|
---|
| 40 | + Input* sigmapyy_input=element->GetInput(DeviatoricStressyyEnum); _assert_(sigmapyy_input);
|
---|
| 41 | + Input* sigmapxy_input=element->GetInput(DeviatoricStressxyEnum); _assert_(sigmapxy_input);
|
---|
| 42 | + Input* sigmapzz_input=NULL; Input* sigmapxz_input=NULL; Input* sigmapyz_input=NULL;
|
---|
| 43 | + if(dim==3){
|
---|
| 44 | + epszz_input=element->GetInput(StrainRatezzEnum); _assert_(epszz_input);
|
---|
| 45 | + epsxz_input=element->GetInput(StrainRatexzEnum); _assert_(epsxz_input);
|
---|
| 46 | + epsyz_input=element->GetInput(StrainRateyzEnum); _assert_(epsyz_input);
|
---|
| 47 | + sigmapzz_input=element->GetInput(DeviatoricStresszzEnum); _assert_(sigmapzz_input);
|
---|
| 48 | + sigmapxz_input=element->GetInput(DeviatoricStressxzEnum); _assert_(sigmapxz_input);
|
---|
| 49 | + sigmapyz_input=element->GetInput(DeviatoricStressyzEnum); _assert_(sigmapyz_input);
|
---|
| 50 | + }
|
---|
| 51 | + gauss = element->NewGauss();
|
---|
| 52 | + for(int i=0;i<tnumnodes;i++){
|
---|
| 53 | + gauss->GaussNode(P1DGEnum,i);
|
---|
| 54 | +
|
---|
| 55 | + epsxx_input->GetInputValue(&epsxx,gauss); sigmapxx_input->GetInputValue(&sigmapxx,gauss);
|
---|
| 56 | + epsyy_input->GetInputValue(&epsyy,gauss); sigmapyy_input->GetInputValue(&sigmapyy,gauss);
|
---|
| 57 | + epsxy_input->GetInputValue(&epsxy,gauss); sigmapxy_input->GetInputValue(&sigmapxy,gauss);
|
---|
| 58 | + if(dim==2){
|
---|
| 59 | + d[i*tausize+0]=epsxx; tau[i*tausize+0]=sigmapxx;
|
---|
| 60 | + d[i*tausize+1]=epsyy; tau[i*tausize+1]=sigmapyy;
|
---|
| 61 | + d[i*tausize+2]=epsxy; tau[i*tausize+2]=sigmapxy;
|
---|
| 62 | + }
|
---|
| 63 | + else{
|
---|
| 64 | + epszz_input->GetInputValue(&epszz,gauss); sigmapzz_input->GetInputValue(&sigmapzz,gauss);
|
---|
| 65 | + epsxz_input->GetInputValue(&epsxz,gauss); sigmapxz_input->GetInputValue(&sigmapxz,gauss);
|
---|
| 66 | + epsyz_input->GetInputValue(&epsyz,gauss); sigmapyz_input->GetInputValue(&sigmapyz,gauss);
|
---|
| 67 | + d[i*tausize+0]=epsxx; tau[i*tausize+0]=sigmapxx;
|
---|
| 68 | + d[i*tausize+1]=epsyy; tau[i*tausize+1]=sigmapyy;
|
---|
| 69 | + d[i*tausize+2]=epszz; tau[i*tausize+2]=sigmapzz;
|
---|
| 70 | + d[i*tausize+3]=epsxy; tau[i*tausize+3]=sigmapxy;
|
---|
| 71 | + d[i*tausize+4]=epsxz; tau[i*tausize+4]=sigmapxz;
|
---|
| 72 | + d[i*tausize+5]=epsyz; tau[i*tausize+5]=sigmapyz;
|
---|
| 73 | + }
|
---|
| 74 | + }
|
---|
| 75 | +
|
---|
| 76 | /* Start looping on the number of gaussian points: */
|
---|
| 77 | - Gauss* gauss=element->NewGauss(5);
|
---|
| 78 | + delete gauss;
|
---|
| 79 | + gauss=element->NewGauss(5);
|
---|
| 80 | for(int ig=gauss->begin();ig<gauss->end();ig++){
|
---|
| 81 | gauss->GaussPoint(ig);
|
---|
| 82 | element->JacobianDeterminant(&Jdet,xyz_list,gauss);
|
---|
| 83 | +
|
---|
| 84 | + /*Create Dstar*/
|
---|
| 85 | _error_("STOP");
|
---|
| 86 | }
|
---|
| 87 |
|
---|
| 88 | @@ -3436,6 +3485,9 @@
|
---|
| 89 | delete gauss;
|
---|
| 90 | xDelete<int>(cs_list);
|
---|
| 91 | xDelete<IssmDouble>(xyz_list);
|
---|
| 92 | + xDelete<IssmDouble>(Dstar);
|
---|
| 93 | + xDelete<IssmDouble>(d);
|
---|
| 94 | + xDelete<IssmDouble>(tau);
|
---|
| 95 | return pe;
|
---|
| 96 | }/*}}}*/
|
---|
| 97 | ElementVector* StressbalanceAnalysis::CreatePVectorFSShelf(Element* element){/*{{{*/
|
---|
| 98 | Index: ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
|
---|
| 99 | ===================================================================
|
---|
| 100 | --- ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17534)
|
---|
| 101 | +++ ../trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17535)
|
---|
| 102 | @@ -538,6 +538,20 @@
|
---|
| 103 | StressTensoryyEnum,
|
---|
| 104 | StressTensoryzEnum,
|
---|
| 105 | StressTensorzzEnum,
|
---|
| 106 | + DeviatoricStressEnum,
|
---|
| 107 | + DeviatoricStressxxEnum,
|
---|
| 108 | + DeviatoricStressxyEnum,
|
---|
| 109 | + DeviatoricStressxzEnum,
|
---|
| 110 | + DeviatoricStressyyEnum,
|
---|
| 111 | + DeviatoricStressyzEnum,
|
---|
| 112 | + DeviatoricStresszzEnum,
|
---|
| 113 | + StrainRateEnum,
|
---|
| 114 | + StrainRatexxEnum,
|
---|
| 115 | + StrainRatexyEnum,
|
---|
| 116 | + StrainRatexzEnum,
|
---|
| 117 | + StrainRateyyEnum,
|
---|
| 118 | + StrainRateyzEnum,
|
---|
| 119 | + StrainRatezzEnum,
|
---|
| 120 | DivergenceEnum,
|
---|
| 121 | GiaCrossSectionShapeEnum,
|
---|
| 122 | GiadWdtEnum,
|
---|
| 123 | Index: ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
|
---|
| 124 | ===================================================================
|
---|
| 125 | --- ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17534)
|
---|
| 126 | +++ ../trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17535)
|
---|
| 127 | @@ -527,6 +527,20 @@
|
---|
| 128 | case StressTensoryyEnum : return "StressTensoryy";
|
---|
| 129 | case StressTensoryzEnum : return "StressTensoryz";
|
---|
| 130 | case StressTensorzzEnum : return "StressTensorzz";
|
---|
| 131 | + case DeviatoricStressEnum : return "DeviatoricStress";
|
---|
| 132 | + case DeviatoricStressxxEnum : return "DeviatoricStressxx";
|
---|
| 133 | + case DeviatoricStressxyEnum : return "DeviatoricStressxy";
|
---|
| 134 | + case DeviatoricStressxzEnum : return "DeviatoricStressxz";
|
---|
| 135 | + case DeviatoricStressyyEnum : return "DeviatoricStressyy";
|
---|
| 136 | + case DeviatoricStressyzEnum : return "DeviatoricStressyz";
|
---|
| 137 | + case DeviatoricStresszzEnum : return "DeviatoricStresszz";
|
---|
| 138 | + case StrainRateEnum : return "StrainRate";
|
---|
| 139 | + case StrainRatexxEnum : return "StrainRatexx";
|
---|
| 140 | + case StrainRatexyEnum : return "StrainRatexy";
|
---|
| 141 | + case StrainRatexzEnum : return "StrainRatexz";
|
---|
| 142 | + case StrainRateyyEnum : return "StrainRateyy";
|
---|
| 143 | + case StrainRateyzEnum : return "StrainRateyz";
|
---|
| 144 | + case StrainRatezzEnum : return "StrainRatezz";
|
---|
| 145 | case DivergenceEnum : return "Divergence";
|
---|
| 146 | case GiaCrossSectionShapeEnum : return "GiaCrossSectionShape";
|
---|
| 147 | case GiadWdtEnum : return "GiadWdt";
|
---|
| 148 | Index: ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
|
---|
| 149 | ===================================================================
|
---|
| 150 | --- ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17534)
|
---|
| 151 | +++ ../trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17535)
|
---|
| 152 | @@ -539,6 +539,20 @@
|
---|
| 153 | else if (strcmp(name,"StressTensoryy")==0) return StressTensoryyEnum;
|
---|
| 154 | else if (strcmp(name,"StressTensoryz")==0) return StressTensoryzEnum;
|
---|
| 155 | else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum;
|
---|
| 156 | + else if (strcmp(name,"DeviatoricStress")==0) return DeviatoricStressEnum;
|
---|
| 157 | + else if (strcmp(name,"DeviatoricStressxx")==0) return DeviatoricStressxxEnum;
|
---|
| 158 | + else if (strcmp(name,"DeviatoricStressxy")==0) return DeviatoricStressxyEnum;
|
---|
| 159 | + else if (strcmp(name,"DeviatoricStressxz")==0) return DeviatoricStressxzEnum;
|
---|
| 160 | + else if (strcmp(name,"DeviatoricStressyy")==0) return DeviatoricStressyyEnum;
|
---|
| 161 | + else if (strcmp(name,"DeviatoricStressyz")==0) return DeviatoricStressyzEnum;
|
---|
| 162 | + else if (strcmp(name,"DeviatoricStresszz")==0) return DeviatoricStresszzEnum;
|
---|
| 163 | + else if (strcmp(name,"StrainRate")==0) return StrainRateEnum;
|
---|
| 164 | + else if (strcmp(name,"StrainRatexx")==0) return StrainRatexxEnum;
|
---|
| 165 | + else if (strcmp(name,"StrainRatexy")==0) return StrainRatexyEnum;
|
---|
| 166 | + else if (strcmp(name,"StrainRatexz")==0) return StrainRatexzEnum;
|
---|
| 167 | + else if (strcmp(name,"StrainRateyy")==0) return StrainRateyyEnum;
|
---|
| 168 | + else if (strcmp(name,"StrainRateyz")==0) return StrainRateyzEnum;
|
---|
| 169 | + else if (strcmp(name,"StrainRatezz")==0) return StrainRatezzEnum;
|
---|
| 170 | else if (strcmp(name,"Divergence")==0) return DivergenceEnum;
|
---|
| 171 | else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum;
|
---|
| 172 | else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum;
|
---|
| 173 | @@ -614,7 +628,10 @@
|
---|
| 174 | else if (strcmp(name,"FSSolver")==0) return FSSolverEnum;
|
---|
| 175 | else if (strcmp(name,"Adjoint")==0) return AdjointEnum;
|
---|
| 176 | else if (strcmp(name,"Colinear")==0) return ColinearEnum;
|
---|
| 177 | - else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum;
|
---|
| 178 | + else stage=6;
|
---|
| 179 | + }
|
---|
| 180 | + if(stage==6){
|
---|
| 181 | + if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum;
|
---|
| 182 | else if (strcmp(name,"Fset")==0) return FsetEnum;
|
---|
| 183 | else if (strcmp(name,"Gradient1")==0) return Gradient1Enum;
|
---|
| 184 | else if (strcmp(name,"Gradient2")==0) return Gradient2Enum;
|
---|
| 185 | @@ -628,10 +645,7 @@
|
---|
| 186 | else if (strcmp(name,"Nodal")==0) return NodalEnum;
|
---|
| 187 | else if (strcmp(name,"OldGradient")==0) return OldGradientEnum;
|
---|
| 188 | else if (strcmp(name,"OutputFilePointer")==0) return OutputFilePointerEnum;
|
---|
| 189 | - else stage=6;
|
---|
| 190 | - }
|
---|
| 191 | - if(stage==6){
|
---|
| 192 | - if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
|
---|
| 193 | + else if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum;
|
---|
| 194 | else if (strcmp(name,"LockFileName")==0) return LockFileNameEnum;
|
---|
| 195 | else if (strcmp(name,"ToolkitsOptionsAnalyses")==0) return ToolkitsOptionsAnalysesEnum;
|
---|
| 196 | else if (strcmp(name,"ToolkitsOptionsStrings")==0) return ToolkitsOptionsStringsEnum;
|
---|
| 197 | Index: ../trunk-jpl/src/m/enum/DeviatoricStressxzEnum.m
|
---|
| 198 | ===================================================================
|
---|
| 199 | --- ../trunk-jpl/src/m/enum/DeviatoricStressxzEnum.m (revision 0)
|
---|
| 200 | +++ ../trunk-jpl/src/m/enum/DeviatoricStressxzEnum.m (revision 17535)
|
---|
| 201 | @@ -0,0 +1,11 @@
|
---|
| 202 | +function macro=DeviatoricStressxzEnum()
|
---|
| 203 | +%DEVIATORICSTRESSXZENUM - Enum of DeviatoricStressxz
|
---|
| 204 | +%
|
---|
| 205 | +% WARNING: DO NOT MODIFY THIS FILE
|
---|
| 206 | +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
|
---|
| 207 | +% Please read src/c/shared/Enum/README for more information
|
---|
| 208 | +%
|
---|
| 209 | +% Usage:
|
---|
| 210 | +% macro=DeviatoricStressxzEnum()
|
---|
| 211 | +
|
---|
| 212 | +macro=StringToEnum('DeviatoricStressxz');
|
---|
| 213 | Index: ../trunk-jpl/src/m/enum/DeviatoricStressyyEnum.m
|
---|
| 214 | ===================================================================
|
---|
| 215 | --- ../trunk-jpl/src/m/enum/DeviatoricStressyyEnum.m (revision 0)
|
---|
| 216 | +++ ../trunk-jpl/src/m/enum/DeviatoricStressyyEnum.m (revision 17535)
|
---|
| 217 | @@ -0,0 +1,11 @@
|
---|
| 218 | +function macro=DeviatoricStressyyEnum()
|
---|
| 219 | +%DEVIATORICSTRESSYYENUM - Enum of DeviatoricStressyy
|
---|
| 220 | +%
|
---|
| 221 | +% WARNING: DO NOT MODIFY THIS FILE
|
---|
| 222 | +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
|
---|
| 223 | +% Please read src/c/shared/Enum/README for more information
|
---|
| 224 | +%
|
---|
| 225 | +% Usage:
|
---|
| 226 | +% macro=DeviatoricStressyyEnum()
|
---|
| 227 | +
|
---|
| 228 | +macro=StringToEnum('DeviatoricStressyy');
|
---|
| 229 | Index: ../trunk-jpl/src/m/enum/StrainRateyzEnum.m
|
---|
| 230 | ===================================================================
|
---|
| 231 | --- ../trunk-jpl/src/m/enum/StrainRateyzEnum.m (revision 0)
|
---|
| 232 | +++ ../trunk-jpl/src/m/enum/StrainRateyzEnum.m (revision 17535)
|
---|
| 233 | @@ -0,0 +1,11 @@
|
---|
| 234 | +function macro=StrainRateyzEnum()
|
---|
| 235 | +%STRAINRATEYZENUM - Enum of StrainRateyz
|
---|
| 236 | +%
|
---|
| 237 | +% WARNING: DO NOT MODIFY THIS FILE
|
---|
| 238 | +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
|
---|
| 239 | +% Please read src/c/shared/Enum/README for more information
|
---|
| 240 | +%
|
---|
| 241 | +% Usage:
|
---|
| 242 | +% macro=StrainRateyzEnum()
|
---|
| 243 | +
|
---|
| 244 | +macro=StringToEnum('StrainRateyz');
|
---|
| 245 | Index: ../trunk-jpl/src/m/enum/DeviatoricStressyzEnum.m
|
---|
| 246 | ===================================================================
|
---|
| 247 | --- ../trunk-jpl/src/m/enum/DeviatoricStressyzEnum.m (revision 0)
|
---|
| 248 | +++ ../trunk-jpl/src/m/enum/DeviatoricStressyzEnum.m (revision 17535)
|
---|
| 249 | @@ -0,0 +1,11 @@
|
---|
| 250 | +function macro=DeviatoricStressyzEnum()
|
---|
| 251 | +%DEVIATORICSTRESSYZENUM - Enum of DeviatoricStressyz
|
---|
| 252 | +%
|
---|
| 253 | +% WARNING: DO NOT MODIFY THIS FILE
|
---|
| 254 | +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
|
---|
| 255 | +% Please read src/c/shared/Enum/README for more information
|
---|
| 256 | +%
|
---|
| 257 | +% Usage:
|
---|
| 258 | +% macro=DeviatoricStressyzEnum()
|
---|
| 259 | +
|
---|
| 260 | +macro=StringToEnum('DeviatoricStressyz');
|
---|
| 261 | Index: ../trunk-jpl/src/m/enum/StrainRatezzEnum.m
|
---|
| 262 | ===================================================================
|
---|
| 263 | --- ../trunk-jpl/src/m/enum/StrainRatezzEnum.m (revision 0)
|
---|
| 264 | +++ ../trunk-jpl/src/m/enum/StrainRatezzEnum.m (revision 17535)
|
---|
| 265 | @@ -0,0 +1,11 @@
|
---|
| 266 | +function macro=StrainRatezzEnum()
|
---|
| 267 | +%STRAINRATEZZENUM - Enum of StrainRatezz
|
---|
| 268 | +%
|
---|
| 269 | +% WARNING: DO NOT MODIFY THIS FILE
|
---|
| 270 | +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
|
---|
| 271 | +% Please read src/c/shared/Enum/README for more information
|
---|
| 272 | +%
|
---|
| 273 | +% Usage:
|
---|
| 274 | +% macro=StrainRatezzEnum()
|
---|
| 275 | +
|
---|
| 276 | +macro=StringToEnum('StrainRatezz');
|
---|
| 277 | Index: ../trunk-jpl/src/m/enum/DeviatoricStresszzEnum.m
|
---|
| 278 | ===================================================================
|
---|
| 279 | --- ../trunk-jpl/src/m/enum/DeviatoricStresszzEnum.m (revision 0)
|
---|
| 280 | +++ ../trunk-jpl/src/m/enum/DeviatoricStresszzEnum.m (revision 17535)
|
---|
| 281 | @@ -0,0 +1,11 @@
|
---|
| 282 | +function macro=DeviatoricStresszzEnum()
|
---|
| 283 | +%DEVIATORICSTRESSZZENUM - Enum of DeviatoricStresszz
|
---|
| 284 | +%
|
---|
| 285 | +% WARNING: DO NOT MODIFY THIS FILE
|
---|
| 286 | +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
|
---|
| 287 | +% Please read src/c/shared/Enum/README for more information
|
---|
| 288 | +%
|
---|
| 289 | +% Usage:
|
---|
| 290 | +% macro=DeviatoricStresszzEnum()
|
---|
| 291 | +
|
---|
| 292 | +macro=StringToEnum('DeviatoricStresszz');
|
---|
| 293 | Index: ../trunk-jpl/src/m/enum/StrainRatexxEnum.m
|
---|
| 294 | ===================================================================
|
---|
| 295 | --- ../trunk-jpl/src/m/enum/StrainRatexxEnum.m (revision 0)
|
---|
| 296 | +++ ../trunk-jpl/src/m/enum/StrainRatexxEnum.m (revision 17535)
|
---|
| 297 | @@ -0,0 +1,11 @@
|
---|
| 298 | +function macro=StrainRatexxEnum()
|
---|
| 299 | +%STRAINRATEXXENUM - Enum of StrainRatexx
|
---|
| 300 | +%
|
---|
| 301 | +% WARNING: DO NOT MODIFY THIS FILE
|
---|
| 302 | +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
|
---|
| 303 | +% Please read src/c/shared/Enum/README for more information
|
---|
| 304 | +%
|
---|
| 305 | +% Usage:
|
---|
| 306 | +% macro=StrainRatexxEnum()
|
---|
| 307 | +
|
---|
| 308 | +macro=StringToEnum('StrainRatexx');
|
---|
| 309 | Index: ../trunk-jpl/src/m/enum/DeviatoricStressxxEnum.m
|
---|
| 310 | ===================================================================
|
---|
| 311 | --- ../trunk-jpl/src/m/enum/DeviatoricStressxxEnum.m (revision 0)
|
---|
| 312 | +++ ../trunk-jpl/src/m/enum/DeviatoricStressxxEnum.m (revision 17535)
|
---|
| 313 | @@ -0,0 +1,11 @@
|
---|
| 314 | +function macro=DeviatoricStressxxEnum()
|
---|
| 315 | +%DEVIATORICSTRESSXXENUM - Enum of DeviatoricStressxx
|
---|
| 316 | +%
|
---|
| 317 | +% WARNING: DO NOT MODIFY THIS FILE
|
---|
| 318 | +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
|
---|
| 319 | +% Please read src/c/shared/Enum/README for more information
|
---|
| 320 | +%
|
---|
| 321 | +% Usage:
|
---|
| 322 | +% macro=DeviatoricStressxxEnum()
|
---|
| 323 | +
|
---|
| 324 | +macro=StringToEnum('DeviatoricStressxx');
|
---|
| 325 | Index: ../trunk-jpl/src/m/enum/StrainRatexyEnum.m
|
---|
| 326 | ===================================================================
|
---|
| 327 | --- ../trunk-jpl/src/m/enum/StrainRatexyEnum.m (revision 0)
|
---|
| 328 | +++ ../trunk-jpl/src/m/enum/StrainRatexyEnum.m (revision 17535)
|
---|
| 329 | @@ -0,0 +1,11 @@
|
---|
| 330 | +function macro=StrainRatexyEnum()
|
---|
| 331 | +%STRAINRATEXYENUM - Enum of StrainRatexy
|
---|
| 332 | +%
|
---|
| 333 | +% WARNING: DO NOT MODIFY THIS FILE
|
---|
| 334 | +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
|
---|
| 335 | +% Please read src/c/shared/Enum/README for more information
|
---|
| 336 | +%
|
---|
| 337 | +% Usage:
|
---|
| 338 | +% macro=StrainRatexyEnum()
|
---|
| 339 | +
|
---|
| 340 | +macro=StringToEnum('StrainRatexy');
|
---|
| 341 | Index: ../trunk-jpl/src/m/enum/StrainRateEnum.m
|
---|
| 342 | ===================================================================
|
---|
| 343 | --- ../trunk-jpl/src/m/enum/StrainRateEnum.m (revision 0)
|
---|
| 344 | +++ ../trunk-jpl/src/m/enum/StrainRateEnum.m (revision 17535)
|
---|
| 345 | @@ -0,0 +1,11 @@
|
---|
| 346 | +function macro=StrainRateEnum()
|
---|
| 347 | +%STRAINRATEENUM - Enum of StrainRate
|
---|
| 348 | +%
|
---|
| 349 | +% WARNING: DO NOT MODIFY THIS FILE
|
---|
| 350 | +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
|
---|
| 351 | +% Please read src/c/shared/Enum/README for more information
|
---|
| 352 | +%
|
---|
| 353 | +% Usage:
|
---|
| 354 | +% macro=StrainRateEnum()
|
---|
| 355 | +
|
---|
| 356 | +macro=StringToEnum('StrainRate');
|
---|
| 357 | Index: ../trunk-jpl/src/m/enum/DeviatoricStressEnum.m
|
---|
| 358 | ===================================================================
|
---|
| 359 | --- ../trunk-jpl/src/m/enum/DeviatoricStressEnum.m (revision 0)
|
---|
| 360 | +++ ../trunk-jpl/src/m/enum/DeviatoricStressEnum.m (revision 17535)
|
---|
| 361 | @@ -0,0 +1,11 @@
|
---|
| 362 | +function macro=DeviatoricStressEnum()
|
---|
| 363 | +%DEVIATORICSTRESSENUM - Enum of DeviatoricStress
|
---|
| 364 | +%
|
---|
| 365 | +% WARNING: DO NOT MODIFY THIS FILE
|
---|
| 366 | +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
|
---|
| 367 | +% Please read src/c/shared/Enum/README for more information
|
---|
| 368 | +%
|
---|
| 369 | +% Usage:
|
---|
| 370 | +% macro=DeviatoricStressEnum()
|
---|
| 371 | +
|
---|
| 372 | +macro=StringToEnum('DeviatoricStress');
|
---|
| 373 | Index: ../trunk-jpl/src/m/enum/EnumDefinitions.py
|
---|
| 374 | ===================================================================
|
---|
| 375 | --- ../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17534)
|
---|
| 376 | +++ ../trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17535)
|
---|
| 377 | @@ -519,6 +519,20 @@
|
---|
| 378 | def StressTensoryyEnum(): return StringToEnum("StressTensoryy")[0]
|
---|
| 379 | def StressTensoryzEnum(): return StringToEnum("StressTensoryz")[0]
|
---|
| 380 | def StressTensorzzEnum(): return StringToEnum("StressTensorzz")[0]
|
---|
| 381 | +def DeviatoricStressEnum(): return StringToEnum("DeviatoricStress")[0]
|
---|
| 382 | +def DeviatoricStressxxEnum(): return StringToEnum("DeviatoricStressxx")[0]
|
---|
| 383 | +def DeviatoricStressxyEnum(): return StringToEnum("DeviatoricStressxy")[0]
|
---|
| 384 | +def DeviatoricStressxzEnum(): return StringToEnum("DeviatoricStressxz")[0]
|
---|
| 385 | +def DeviatoricStressyyEnum(): return StringToEnum("DeviatoricStressyy")[0]
|
---|
| 386 | +def DeviatoricStressyzEnum(): return StringToEnum("DeviatoricStressyz")[0]
|
---|
| 387 | +def DeviatoricStresszzEnum(): return StringToEnum("DeviatoricStresszz")[0]
|
---|
| 388 | +def StrainRateEnum(): return StringToEnum("StrainRate")[0]
|
---|
| 389 | +def StrainRatexxEnum(): return StringToEnum("StrainRatexx")[0]
|
---|
| 390 | +def StrainRatexyEnum(): return StringToEnum("StrainRatexy")[0]
|
---|
| 391 | +def StrainRatexzEnum(): return StringToEnum("StrainRatexz")[0]
|
---|
| 392 | +def StrainRateyyEnum(): return StringToEnum("StrainRateyy")[0]
|
---|
| 393 | +def StrainRateyzEnum(): return StringToEnum("StrainRateyz")[0]
|
---|
| 394 | +def StrainRatezzEnum(): return StringToEnum("StrainRatezz")[0]
|
---|
| 395 | def DivergenceEnum(): return StringToEnum("Divergence")[0]
|
---|
| 396 | def GiaCrossSectionShapeEnum(): return StringToEnum("GiaCrossSectionShape")[0]
|
---|
| 397 | def GiadWdtEnum(): return StringToEnum("GiadWdt")[0]
|
---|
| 398 | Index: ../trunk-jpl/src/m/enum/DeviatoricStressxyEnum.m
|
---|
| 399 | ===================================================================
|
---|
| 400 | --- ../trunk-jpl/src/m/enum/DeviatoricStressxyEnum.m (revision 0)
|
---|
| 401 | +++ ../trunk-jpl/src/m/enum/DeviatoricStressxyEnum.m (revision 17535)
|
---|
| 402 | @@ -0,0 +1,11 @@
|
---|
| 403 | +function macro=DeviatoricStressxyEnum()
|
---|
| 404 | +%DEVIATORICSTRESSXYENUM - Enum of DeviatoricStressxy
|
---|
| 405 | +%
|
---|
| 406 | +% WARNING: DO NOT MODIFY THIS FILE
|
---|
| 407 | +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
|
---|
| 408 | +% Please read src/c/shared/Enum/README for more information
|
---|
| 409 | +%
|
---|
| 410 | +% Usage:
|
---|
| 411 | +% macro=DeviatoricStressxyEnum()
|
---|
| 412 | +
|
---|
| 413 | +macro=StringToEnum('DeviatoricStressxy');
|
---|
| 414 | Index: ../trunk-jpl/src/m/enum/StrainRatexzEnum.m
|
---|
| 415 | ===================================================================
|
---|
| 416 | --- ../trunk-jpl/src/m/enum/StrainRatexzEnum.m (revision 0)
|
---|
| 417 | +++ ../trunk-jpl/src/m/enum/StrainRatexzEnum.m (revision 17535)
|
---|
| 418 | @@ -0,0 +1,11 @@
|
---|
| 419 | +function macro=StrainRatexzEnum()
|
---|
| 420 | +%STRAINRATEXZENUM - Enum of StrainRatexz
|
---|
| 421 | +%
|
---|
| 422 | +% WARNING: DO NOT MODIFY THIS FILE
|
---|
| 423 | +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
|
---|
| 424 | +% Please read src/c/shared/Enum/README for more information
|
---|
| 425 | +%
|
---|
| 426 | +% Usage:
|
---|
| 427 | +% macro=StrainRatexzEnum()
|
---|
| 428 | +
|
---|
| 429 | +macro=StringToEnum('StrainRatexz');
|
---|
| 430 | Index: ../trunk-jpl/src/m/enum/StrainRateyyEnum.m
|
---|
| 431 | ===================================================================
|
---|
| 432 | --- ../trunk-jpl/src/m/enum/StrainRateyyEnum.m (revision 0)
|
---|
| 433 | +++ ../trunk-jpl/src/m/enum/StrainRateyyEnum.m (revision 17535)
|
---|
| 434 | @@ -0,0 +1,11 @@
|
---|
| 435 | +function macro=StrainRateyyEnum()
|
---|
| 436 | +%STRAINRATEYYENUM - Enum of StrainRateyy
|
---|
| 437 | +%
|
---|
| 438 | +% WARNING: DO NOT MODIFY THIS FILE
|
---|
| 439 | +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh
|
---|
| 440 | +% Please read src/c/shared/Enum/README for more information
|
---|
| 441 | +%
|
---|
| 442 | +% Usage:
|
---|
| 443 | +% macro=StrainRateyyEnum()
|
---|
| 444 | +
|
---|
| 445 | +macro=StringToEnum('StrainRateyy');
|
---|