Index: /issm/trunk-jpl/test/NightlyRun/IdToName.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.m (revision 15565) @@ -6,7 +6,7 @@ switch id, - case 101, name='SquareShelfConstrainedDiagM2d'; - case 102, name='SquareShelfConstrainedDiagM3d'; - case 103, name='SquareShelfConstrainedDiagP3d'; + case 101, name='SquareShelfConstrainedDiagSSA2d'; + case 102, name='SquareShelfConstrainedDiagSSA3d'; + case 103, name='SquareShelfConstrainedDiagHO'; case 104, name='SquareShelfConstrainedDiagS3d'; case 105, name='SquareShelfConstrainedProg2d'; @@ -15,6 +15,6 @@ case 108, name='SquareShelfConstrainedTherStea'; case 109, name='SquareShelfConstrainedTherTran'; - case 110, name='SquareShelfConstrainedTranM2d'; - case 111, name='SquareShelfConstrainedTranP3d'; + case 110, name='SquareShelfConstrainedTranSSA2d'; + case 111, name='SquareShelfConstrainedTranHO'; case 112, name='SquareShelfConstrainedSurfSlop2d'; case 113, name='SquareShelfConstrainedSurfSlope3d'; @@ -27,32 +27,32 @@ case 120, name='SquareShelfConstrainedEnthalpyStea'; case 121, name='SquareShelfConstrainedEnthalpyTran'; - case 122, name='SquareShelfConstrainedTransP3dEnth'; - case 201, name='SquareShelfDiagM2d'; - case 202, name='SquareShelfDiagM3d'; - case 203, name='SquareShelfDiagP3d'; + case 122, name='SquareShelfConstrainedTransHOEnth'; + case 201, name='SquareShelfDiagSSA2d'; + case 202, name='SquareShelfDiagSSA3d'; + case 203, name='SquareShelfDiagHO'; case 204, name='SquareShelfDiagS3d'; - case 205, name='SquareShelfDiagMP3dPenalties'; + case 205, name='SquareShelfDiagMHOPenalties'; case 206, name='SquareShelfTherStea'; case 207, name='SquareShelfTherTran'; - case 208, name='SquareShelfTranM2d'; - case 209, name='SquareShelfTranM3d'; - case 210, name='SquareShelfTranP3d'; + case 208, name='SquareShelfTranSSA2d'; + case 209, name='SquareShelfTranSSA3d'; + case 210, name='SquareShelfTranHO'; case 211, name='SquareShelfTranS3d'; - case 212, name='SquareShelfCMBM2d'; - case 213, name='SquareShelfCMBM3d'; - case 214, name='SquareShelfCMBP3d'; + case 212, name='SquareShelfCMBSSA2d'; + case 213, name='SquareShelfCMBSSA3d'; + case 214, name='SquareShelfCMBHO'; case 215, name='SquareShelfCMBS3d'; - case 216, name='SquareShelfDiagM2dRift'; + case 216, name='SquareShelfDiagSSA2dRift'; case 217, name='SquareShelfConstrained'; case 218, name='SquareShelfConstrainedDakotaB'; - case 219, name='SquareShelfDiagMP3dTiling'; + case 219, name='SquareShelfDiagMHOTiling'; case 220, name='SquareShelfDiagPS3dTiling'; case 221, name='SquareShelfDiagMS3dTiling'; - case 222, name='SquareShelfDiagM2dTransientIncrHydro'; - case 223, name='SquareShelfDiagM2dTransientIncrNonHydro'; - case 224, name='SquareShelfDiagP3dTransientIncrHydro'; - case 225, name='SquareShelfDiagP3dTransientIncrNonHydro'; - case 226, name='SquareShelfTranCflM2d'; - case 227, name='SquareShelfTranCflP3d'; + case 222, name='SquareShelfDiagSSA2dTransientIncrHydro'; + case 223, name='SquareShelfDiagSSA2dTransientIncrNonHydro'; + case 224, name='SquareShelfDiagHOTransientIncrHydro'; + case 225, name='SquareShelfDiagHOTransientIncrNonHydro'; + case 226, name='SquareShelfTranCflSSA2d'; + case 227, name='SquareShelfTranCflHO'; case 228, name='SquareShelfTranForceNeg2d'; case 229, name='SquareShelfTranForcePos2d'; @@ -60,20 +60,20 @@ case 231, name='SquareShelfTranForcePos3d'; case 232, name='SquareShelfTherTranForcTemp'; - case 233, name='SquareShelfTranP3dForcTemp'; + case 233, name='SquareShelfTranHOForcTemp'; case 234, name='SquareShelfTranForceNeg2dDakotaSamp'; case 235, name='SquareShelfTranForceNeg2dDakotaLocal'; - case 236, name='SquareShelfTranIspddIsdeltaM2d'; - case 237, name='SquareShelfTranIspddIsdeltaM3d'; - case 270, name='SquareShelfDiagM2dDamage'; - case 272, name='SquareShelfCMZM2dDamage'; - case 274, name='SquareShelfDiagM2dDamageRift'; - case 280, name='SquareShelfDiagM2dP2'; - case 301, name='SquareSheetConstrainedDiagM2d'; - case 302, name='SquareSheetConstrainedDiagH2d'; - case 303, name='SquareSheetConstrainedDiagHM2d'; - case 304, name='SquareSheetConstrainedDiagM3d'; - case 305, name='SquareSheetConstrainedDiagH3d'; - case 306, name='SquareSheetConstrainedDiagHM3d'; - case 307, name='SquareSheetConstrainedDiagP3d'; + case 236, name='SquareShelfTranIspddIsdeltaSSA2d'; + case 237, name='SquareShelfTranIspddIsdeltaSSA3d'; + case 270, name='SquareShelfDiagSSA2dDamage'; + case 272, name='SquareShelfCMZSSA2dDamage'; + case 274, name='SquareShelfDiagSSA2dDamageRift'; + case 280, name='SquareShelfDiagSSA2dP2'; + case 301, name='SquareSheetConstrainedDiagSSA2d'; + case 302, name='SquareSheetConstrainedDiagSIA2d'; + case 303, name='SquareSheetConstrainedDiagHSSA2d'; + case 304, name='SquareSheetConstrainedDiagSSA3d'; + case 305, name='SquareSheetConstrainedDiagSIA3d'; + case 306, name='SquareSheetConstrainedDiagHSSA3d'; + case 307, name='SquareSheetConstrainedDiagHO'; case 308, name='SquareSheetConstrainedDiagS3d'; case 309, name='SquareSheetConstrainedProg2d'; @@ -82,18 +82,18 @@ case 312, name='SquareSheetConstrainedTherStea'; case 313, name='SquareSheetConstrainedTherTran'; - case 314, name='SquareSheetConstrainedTranH2d'; - case 315, name='SquareSheetConstrainedTranH3d'; - case 316, name='SquareSheetConstrainedTranM2d'; - case 317, name='SquareSheetConstrainedTranP3d'; - case 318, name='SquareSheetConstrainedSteaH3d'; - case 319, name='SquareSheetConstrainedCMDragM2d'; - case 320, name='SquareSheetConstrainedCMDragM3d'; - case 321, name='SquareSheetConstrainedCMDragP3d'; + case 314, name='SquareSheetConstrainedTranSIA2d'; + case 315, name='SquareSheetConstrainedTranSIA3d'; + case 316, name='SquareSheetConstrainedTranSSA2d'; + case 317, name='SquareSheetConstrainedTranHO'; + case 318, name='SquareSheetConstrainedSteaSIA3d'; + case 319, name='SquareSheetConstrainedCMDragSSA2d'; + case 320, name='SquareSheetConstrainedCMDragSSA3d'; + case 321, name='SquareSheetConstrainedCMDragHO'; case 322, name='SquareSheetConstrainedCMDragS3d'; - case 323, name='SquareSheetConstrainedTranCflM2d'; - case 324, name='SquareSheetConstrainedTranCflH3d'; + case 323, name='SquareSheetConstrainedTranCflSSA2d'; + case 324, name='SquareSheetConstrainedTranCflSIA3d'; case 325, name='SquareSheetConstrainedEnthalpyStea'; case 326, name='SquareSheetConstrainedEnthalpyTran'; - case 327, name='SquareSheetConstrainedTransP3dEnth'; + case 327, name='SquareSheetConstrainedTransHOEnth'; case 328, name='SquareSheetConstrainedSmbGradients2d'; case 329, name='SquareSheetConstrainedSmbGradients3d'; @@ -101,51 +101,51 @@ case 332, name='SquareSheetConstrainedHydrologyDC'; case 333, name='SquareSheetHydrologyDCTwoLayers'; - case 401, name='SquareSheetShelfDiagM2d'; - case 402, name='SquareSheetShelfDiagM3d'; - case 403, name='SquareSheetShelfDiagP3d'; + case 401, name='SquareSheetShelfDiagSSA2d'; + case 402, name='SquareSheetShelfDiagSSA3d'; + case 403, name='SquareSheetShelfDiagHO'; case 404, name='SquareSheetShelfDiagS3d'; - case 405, name='SquareSheetShelfDiagMP3dPenalties'; + case 405, name='SquareSheetShelfDiagMHOPenalties'; case 406, name='SquareSheetShelfTherStea'; case 407, name='SquareSheetShelfTherTran'; - case 408, name='SquareSheetShelfTranM2d'; - case 409, name='SquareSheetShelfTranMP3dPenalties'; - case 410, name='SquareSheetShelfSteaM3d'; - case 411, name='SquareSheetShelfSteaP3d'; - case 412, name='SquareSheetShelfDiadM3dDakota'; - case 413, name='SquareSheetShelfDiadM3dDakotaPart'; - case 414, name='SquareSheetShelfDiadM3dDakotaMassFlux'; - case 415, name='SquareSheetShelfCMDragSteaM3d'; - case 416, name='SquareSheetShelfCMDragSteaP3d'; - case 417, name='SquareSheetShelfDiadM3dDakotaSamp'; - case 418, name='SquareSheetShelfDiadM3dDakotaAreaAverage'; - case 419, name='SquareSheetShelfDiagMP3dTiling'; + case 408, name='SquareSheetShelfTranSSA2d'; + case 409, name='SquareSheetShelfTranMHOPenalties'; + case 410, name='SquareSheetShelfSteaSSA3d'; + case 411, name='SquareSheetShelfSteaHO'; + case 412, name='SquareSheetShelfDiadSSA3dDakota'; + case 413, name='SquareSheetShelfDiadSSA3dDakotaPart'; + case 414, name='SquareSheetShelfDiadSSA3dDakotaMassFlux'; + case 415, name='SquareSheetShelfCMDragSteaSSA3d'; + case 416, name='SquareSheetShelfCMDragSteaHO'; + case 417, name='SquareSheetShelfDiadSSA3dDakotaSamp'; + case 418, name='SquareSheetShelfDiadSSA3dDakotaAreaAverage'; + case 419, name='SquareSheetShelfDiagMHOTiling'; case 420, name='SquareSheetShelfDakotaScaledResponse'; case 421, name='SquareSheetShelfDiagPS3dTiling'; case 422, name='SquareSheetShelfDiagMS3dTiling'; - case 423, name='RoundSheetShelfGLMigrationM2d'; - case 424, name='SquareSheetShelfGroundingLine2dAgressice'; + case 423, name='RoundSheetShelfGLMigrationSSA2d'; + case 424, name='SquareSheetShelfGroundingLine2dAgressive'; case 425, name='SquareSheetShelfGroundingLine2dSoft'; - case 426, name='SquareSheetShelfGroundingLine3dAgressice'; + case 426, name='SquareSheetShelfGroundingLine3dAgressive'; case 427, name='SquareSheetShelfGroundingLine3dSoft'; - case 428, name='SquareSheetShelfDiagM2dNewton'; - case 429, name='SquareSheetShelfDiagP3dNewton'; + case 428, name='SquareSheetShelfDiagSSA2dNewton'; + case 429, name='SquareSheetShelfDiagHONewton'; case 430, name='SquareSheetShelfDiagS3dNewton'; - case 431, name='SquareSheetShelfSteaEnthalpyM3d'; - case 432, name='SquareSheetShelfSteaEnthalpyP3d'; - case 433, name='RoundSheetShelfGLMigrationM3d'; + case 431, name='SquareSheetShelfSteaEnthalpySSA3d'; + case 432, name='SquareSheetShelfSteaEnthalpyHO'; + case 433, name='RoundSheetShelfGLMigrationSSA3d'; case 434, name='SquareSheetShelfL1L2'; - case 501, name='PigDiagM2d'; - case 502, name='PigDiagP3d'; + case 501, name='PigDiagSSA2d'; + case 502, name='PigDiagHO'; case 503, name='PigDiagS3d'; - case 504, name='PigTranM2d'; - case 505, name='PigTranM3d'; - case 506, name='PigTranP3d'; + case 504, name='PigTranSSA2d'; + case 505, name='PigTranSSA3d'; + case 506, name='PigTranHO'; case 507, name='PigTranS3d'; - case 508, name='PigSteaM3d'; - case 509, name='PigSteaP3d'; + case 508, name='PigSteaSSA3d'; + case 509, name='PigSteaHO'; case 510, name='PigSteaS3d'; case 511, name='PigCMBS3d'; - case 512, name='PigCMDragP3d'; - case 513, name='PigCMDragSteaM3d'; + case 512, name='PigCMDragHO'; + case 513, name='PigCMDragSteaSSA3d'; case 514, name='PigBamgMesh'; case 515, name='PigTherTranSUPG'; @@ -163,13 +163,13 @@ case 611, name='79NorthCMBalThic2dCG'; case 612, name='79NorthCMBalThic2dDG'; - case 613, name='79NorthCMBalThicVxVyParalle'; - case 1101, name='ISMIPAPattyn'; - case 1102, name='ISMIPAStokes'; - case 1103, name='ISMIPBPattyn'; - case 1104, name='ISMIPBStokes'; - case 1105, name='ISMIPCPattyn'; - case 1106, name='ISMIPCStokes'; - case 1107, name='ISMIPDPattyn'; - case 1108, name='ISMIPDStokes'; + case 613, name='79NorthCMBalThicVxVy'; + case 1101, name='ISMIPAHO'; + case 1102, name='ISMIPAFS'; + case 1103, name='ISMIPBHO'; + case 1104, name='ISMIPBFS'; + case 1105, name='ISMIPCHO'; + case 1106, name='ISMIPCFS'; + case 1107, name='ISMIPDHO'; + case 1108, name='ISMIPDFS'; case 1109, name='ISMIPE'; case 1110, name='ISMIPF'; @@ -178,7 +178,7 @@ case 1203, name='EISMINTDiag2'; case 1204, name='EISMINTTran2'; - case 1205, name='EISMINTRoundIceSheetStaticHutter'; - case 1206, name='EISMINTRoundIceSheetStaticPattyn'; - case 1207, name='EISMINTRoundIceSheetStaticStokes'; + case 1205, name='EISMINTRoundIceSheetStaticSIA'; + case 1206, name='EISMINTRoundIceSheetStaticHO'; + case 1207, name='EISMINTRoundIceSheetStaticFS'; case 1208, name='EISMINTA'; case 1301, name='ThermalMelting'; @@ -190,6 +190,6 @@ case 1501, name='SquareShelfTranSawTooth2d'; case 1502, name='SquareShelfTranSawTooth3d'; - case 1601, name='SquareShelfM2dRotation'; - case 1602, name='SquareSheetShelfP3dRotation'; + case 1601, name='SquareShelfSSA2dRotation'; + case 1602, name='SquareSheetShelfHORotation'; case 2001, name='SquareSheetConstrainedGia2d'; case 2051, name='GiaBenchmarksAB2dA1'; @@ -205,7 +205,7 @@ case 2082, name='GiaBenchmarksAB2dD2'; case 2083, name='GiaBenchmarksAB2dD3'; - case 3001, name='SquareShelfConstrainedDiagM2dAdolc'; - case 3002, name='SquareShelfConstrainedDiagM3dAdolc'; - case 3003, name='SquareShelfConstrainedDiagP3dAdolc'; + case 3001, name='SquareShelfConstrainedDiagSSA2dAdolc'; + case 3002, name='SquareShelfConstrainedDiagSSA3dAdolc'; + case 3003, name='SquareShelfConstrainedDiagHOAdolc'; case 3004, name='SquareShelfConstrainedDiagS3dAdolc'; case 3005, name='SquareShelfConstrainedProg2dAdolc'; @@ -214,5 +214,5 @@ case 3008, name='SquareShelfConstrainedTherSteaAdolc'; case 3009, name='SquareShelfConstrainedTherTranAdolc'; - case 3010, name='SquareShelfConstrainedTranM2dAdolc'; + case 3010, name='SquareShelfConstrainedTranSSA2dAdolc'; case 3015, name='SquareShelfConstrainedProg2dAdolcForwardDifference'; case 3019, name='SquareShelfConstrainedTherTranAdolcReverseVsForward'; Index: /issm/trunk-jpl/test/NightlyRun/IdToName.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/IdToName.py (revision 15565) @@ -10,199 +10,215 @@ idname={ - 101 : 'SquareShelfConstrainedDiagM2d', - 102 : 'SquareShelfConstrainedDiagM3d', - 103 : 'SquareShelfConstrainedDiagP3d', - 104 : 'SquareShelfConstrainedDiagS3d', - 105 : 'SquareShelfConstrainedProg2d', - 106 : 'SquareShelfConstrainedProg2dDG', - 107 : 'SquareShelfConstrainedProg3d', - 108 : 'SquareShelfConstrainedTherStea', - 109 : 'SquareShelfConstrainedTherTran', - 110 : 'SquareShelfConstrainedTranM2d', - 111 : 'SquareShelfConstrainedTranP3d', - 112 : 'SquareShelfConstrainedSurfSlop2d', - 113 : 'SquareShelfConstrainedSurfSlope3d', - 114 : 'SquareShelfConstrainedBedSlop2d', - 115 : 'SquareShelfConstrainedBedSlop3d', - 116 : 'SquareShelfConstrainedBalThic2d', - 117 : 'SquareShelfConstrainedBalThic3d', - 118 : 'SquareShelfConstrainedBalThic2dDG', - 119 : 'SquareBamgMesh', - 120 : 'SquareShelfConstrainedEnthalpyStea', - 121 : 'SquareShelfConstrainedEnthalpyTran', - 122 : 'SquareShelfConstrainedTransP3dEnth', - 201 : 'SquareShelfDiagM2d', - 202 : 'SquareShelfDiagM3d', - 203 : 'SquareShelfDiagP3d', - 204 : 'SquareShelfDiagS3d', - 205 : 'SquareShelfDiagMP3dPenalties', - 206 : 'SquareShelfTherStea', - 207 : 'SquareShelfTherTran', - 208 : 'SquareShelfTranM2d', - 209 : 'SquareShelfTranM3d', - 210 : 'SquareShelfTranP3d', - 211 : 'SquareShelfTranS3d', - 212 : 'SquareShelfCMBM2d', - 213 : 'SquareShelfCMBM3d', - 214 : 'SquareShelfCMBP3d', - 215 : 'SquareShelfCMBS3d', - 216 : 'SquareShelfDiagM2dRift', - 217 : 'SquareShelfConstrained', - 218 : 'SquareShelfConstrainedDakotaB', - 219 : 'SquareShelfDiagMP3dTiling', - 220 : 'SquareShelfDiagPS3dTiling', - 221 : 'SquareShelfDiagMS3dTiling', - 222 : 'SquareShelfDiagM2dTransientIncrHydro', - 223 : 'SquareShelfDiagM2dTransientIncrNonHydro', - 224 : 'SquareShelfDiagP3dTransientIncrHydro', - 225 : 'SquareShelfDiagP3dTransientIncrNonHydro', - 226 : 'SquareShelfTranCflM2d', - 227 : 'SquareShelfTranCflP3d', - 228 : 'SquareShelfTranForceNeg2d', - 229 : 'SquareShelfTranForcePos2d', - 230 : 'SquareShelfTranForceNeg3d', - 231 : 'SquareShelfTranForcePos3d', - 232 : 'SquareShelfTherTranForcTemp', - 233 : 'SquareShelfTranP3dForcTemp', - 234 : 'SquareShelfTranForceNeg2dDakotaSamp', - 235 : 'SquareShelfTranForceNeg2dDakotaLocal', - 236 : 'SquareShelfTranIspddIsdeltaM2d', - 237 : 'SquareShelfTranIspddIsdeltaM3d', - 280 : 'SquareShelfDiagM2dP2', - 301 : 'SquareSheetConstrainedDiagM2d', - 302 : 'SquareSheetConstrainedDiagH2d', - 303 : 'SquareSheetConstrainedDiagHM2d', - 304 : 'SquareSheetConstrainedDiagM3d', - 305 : 'SquareSheetConstrainedDiagH3d', - 306 : 'SquareSheetConstrainedDiagHM3d', - 307 : 'SquareSheetConstrainedDiagP3d', - 308 : 'SquareSheetConstrainedDiagS3d', - 309 : 'SquareSheetConstrainedProg2d', - 310 : 'SquareSheetConstrainedProg2dDG', - 311 : 'SquareSheetConstrainedProg3d', - 312 : 'SquareSheetConstrainedTherStea', - 313 : 'SquareSheetConstrainedTherTran', - 314 : 'SquareSheetConstrainedTranH2d', - 315 : 'SquareSheetConstrainedTranH3d', - 316 : 'SquareSheetConstrainedTranM2d', - 317 : 'SquareSheetConstrainedTranP3d', - 318 : 'SquareSheetConstrainedSteaH3d', - 319 : 'SquareSheetConstrainedCMDragM2d', - 320 : 'SquareSheetConstrainedCMDragM3d', - 321 : 'SquareSheetConstrainedCMDragP3d', - 322 : 'SquareSheetConstrainedCMDragS3d', - 323 : 'SquareSheetConstrainedTranCflM2d', - 324 : 'SquareSheetConstrainedTranCflH3d', - 325 : 'SquareSheetConstrainedEnthalpyStea', - 326 : 'SquareSheetConstrainedEnthalpyTran', - 327 : 'SquareSheetConstrainedTransP3dEnth', - 328 : 'SquareSheetConstrainedSmbGradients2d', - 329 : 'SquareSheetConstrainedSmbGradients3d', - 331 : 'SquareSheetConstrainedHydrology', - 333 : 'SquareSheetConstrainedTranCflM3d', - 401 : 'SquareSheetShelfDiagM2d', - 402 : 'SquareSheetShelfDiagM3d', - 403 : 'SquareSheetShelfDiagP3d', - 404 : 'SquareSheetShelfDiagS3d', - 405 : 'SquareSheetShelfDiagMP3dPenalties', - 406 : 'SquareSheetShelfTherStea', - 407 : 'SquareSheetShelfTherTran', - 408 : 'SquareSheetShelfTranM2d', - 409 : 'SquareSheetShelfTranMP3dPenalties', - 410 : 'SquareSheetShelfSteaM3d', - 411 : 'SquareSheetShelfSteaP3d', - 412 : 'SquareSheetShelfDiadM3dDakota', - 413 : 'SquareSheetShelfDiadM3dDakotaPart', - 414 : 'SquareSheetShelfDiadM3dDakotaMassFlux', - 415 : 'SquareSheetShelfCMDragSteaM3d', - 416 : 'SquareSheetShelfCMDragSteaP3d', - 417 : 'SquareSheetShelfDiadM3dDakotaSamp', - 418 : 'SquareSheetShelfDiadM3dDakotaAreaAverage', - 419 : 'SquareSheetShelfDiagMP3dTiling', - 420 : 'SquareSheetShelfDakotaScaledResponse', - 421 : 'SquareSheetShelfDiagPS3dTiling', - 422 : 'SquareSheetShelfDiagMS3dTiling', - 423 : 'RoundSheetShelfGLMigrationM2d', - 424 : 'SquareSheetShelfGroundingLine2dAgressice', - 425 : 'SquareSheetShelfGroundingLine2dSoft', - 426 : 'SquareSheetShelfGroundingLine3dAgressice', - 427 : 'SquareSheetShelfGroundingLine3dSoft', - 428 : 'SquareSheetShelfDiagM2dNewton', - 429 : 'SquareSheetShelfDiagP3dNewton', - 430 : 'SquareSheetShelfDiagS3dNewton', - 431 : 'SquareSheetShelfSteaEnthalpyM3d', - 432 : 'SquareSheetShelfSteaEnthalpyP3d', - 433 : 'RoundSheetShelfGLMigrationM3d', - 434 : 'SquareSheetShelfDiagL1L2', - 501 : 'PigDiagM2d', - 502 : 'PigDiagP3d', - 503 : 'PigDiagS3d', - 504 : 'PigTranM2d', - 505 : 'PigTranM3d', - 506 : 'PigTranP3d', - 507 : 'PigTranS3d', - 508 : 'PigSteaM3d', - 509 : 'PigSteaP3d', - 510 : 'PigSteaS3d', - 511 : 'PigCMBS3d', - 512 : 'PigCMDragP3d', - 513 : 'PigCMDragSteaM3d', - 514 : 'PigBamgMesh', - 515 : 'PigTherTranSUPG', - 516 : 'PigTherSteaSUPG', - 601 : '79NorthProg2d', - 602 : '79NorthProg2dDG', - 603 : '79NorthProg3d', - 604 : '79NorthSurfSlop2d', - 605 : '79NorthSurfSlop3d', - 606 : '79NorthBedSlop2d', - 607 : '79NorthBedSlop3d', - 608 : '79NorthBalThic2d', - 609 : '79NorthBalThic2dDG', - 610 : '79NorthBalThic3d', - 611 : '79NorthCMBalThic2dCG', - 612 : '79NorthCMBalThic2dDG', - 613 : '79NorthCMBalThicVxVy', - 1101 : 'ISMIPAPattyn', - 1102 : 'ISMIPAStokes', - 1103 : 'ISMIPBPattyn', - 1104 : 'ISMIPBStokes', - 1105 : 'ISMIPCPattyn', - 1106 : 'ISMIPCStokes', - 1107 : 'ISMIPDPattyn', - 1108 : 'ISMIPDStokes', - 1109 : 'ISMIPE', - 1110 : 'ISMIPF', - 1201 : 'EISMINTMassConservation', - 1202 : 'EISMINTDiag1', - 1203 : 'EISMINTDiag2', - 1204 : 'EISMINTTran2', - 1205 : 'EISMINTRoundIceSheetStaticHutter', - 1206 : 'EISMINTRoundIceSheetStaticPattyn', - 1207 : 'EISMINTRoundIceSheetStaticStokes', - 1208 : 'EISMINTA', - 1301 : 'ThermalMelting', - 1302 : 'ThermalAdvection', - 1303 : 'ThermalConduction', - 1304 : 'ThermalGeothermalFlux', - 1401 : 'AdaptiveMeshRefinement1', - 1402 : 'AdaptiveMeshRefinement2', - 1501 : 'SquareShelfTranSawTooth2d', - 1502 : 'SquareShelfTranSawTooth3d', - 1601 : 'SquareShelfM2dRotation', - 1602 : 'SquareSheetShelfP3dRotation', - 2001 : 'SquareSheetConstrainedGia2d', - 3001 : 'SquareShelfConstrainedDiagM2dAdolc', - 3002 : 'SquareShelfConstrainedDiagM3dAdolc', - 3003 : 'SquareShelfConstrainedDiagP3dAdolc', - 3004 : 'SquareShelfConstrainedDiagS3dAdolc', - 3005 : 'SquareShelfConstrainedProg2dAdolc', - 3006 : 'SquareShelfConstrainedProg2dDGAdolc', - 3007 : 'SquareShelfConstrainedProg3dAdolc', - 3008 : 'SquareShelfConstrainedTherSteaAdolc', - 3009 : 'SquareShelfConstrainedTherTranAdolc', - 3010 : 'SquareShelfConstrainedTranM2dAdolc', - 3015 : 'SquareShelfConstrainedProg2dAdolcForwardDifference', - 3019 : 'SquareShelfConstrainedTherTranAdolcReverseVsForward', + 101 : 'SquareShelfConstrainedDiagSSA2d', + 102 : 'SquareShelfConstrainedDiagSSA3d', + 103 : 'SquareShelfConstrainedDiagHO', + 104 : 'SquareShelfConstrainedDiagS3d', + 105 : 'SquareShelfConstrainedProg2d', + 106 : 'SquareShelfConstrainedProg2dDG', + 107 : 'SquareShelfConstrainedProg3d', + 108 : 'SquareShelfConstrainedTherStea', + 109 : 'SquareShelfConstrainedTherTran', + 110 : 'SquareShelfConstrainedTranSSA2d', + 111 : 'SquareShelfConstrainedTranHO', + 112 : 'SquareShelfConstrainedSurfSlop2d', + 113 : 'SquareShelfConstrainedSurfSlope3d', + 114 : 'SquareShelfConstrainedBedSlop2d', + 115 : 'SquareShelfConstrainedBedSlop3d', + 116 : 'SquareShelfConstrainedBalThic2d', + 117 : 'SquareShelfConstrainedBalThic3d', + 118 : 'SquareShelfConstrainedBalThic2dDG', + 119 : 'SquareBamgMesh', + 120 : 'SquareShelfConstrainedEnthalpyStea', + 121 : 'SquareShelfConstrainedEnthalpyTran', + 122 : 'SquareShelfConstrainedTransHOEnth', + 201 : 'SquareShelfDiagSSA2d', + 202 : 'SquareShelfDiagSSA3d', + 203 : 'SquareShelfDiagHO', + 204 : 'SquareShelfDiagS3d', + 205 : 'SquareShelfDiagMHOPenalties', + 206 : 'SquareShelfTherStea', + 207 : 'SquareShelfTherTran', + 208 : 'SquareShelfTranSSA2d', + 209 : 'SquareShelfTranSSA3d', + 210 : 'SquareShelfTranHO', + 211 : 'SquareShelfTranS3d', + 212 : 'SquareShelfCMBSSA2d', + 213 : 'SquareShelfCMBSSA3d', + 214 : 'SquareShelfCMBHO', + 215 : 'SquareShelfCMBS3d', + 216 : 'SquareShelfDiagSSA2dRift', + 217 : 'SquareShelfConstrained', + 218 : 'SquareShelfConstrainedDakotaB', + 219 : 'SquareShelfDiagMHOTiling', + 220 : 'SquareShelfDiagPS3dTiling', + 221 : 'SquareShelfDiagMS3dTiling', + 222 : 'SquareShelfDiagSSA2dTransientIncrHydro', + 223 : 'SquareShelfDiagSSA2dTransientIncrNonHydro', + 224 : 'SquareShelfDiagHOTransientIncrHydro', + 225 : 'SquareShelfDiagHOTransientIncrNonHydro', + 226 : 'SquareShelfTranCflSSA2d', + 227 : 'SquareShelfTranCflHO', + 228 : 'SquareShelfTranForceNeg2d', + 229 : 'SquareShelfTranForcePos2d', + 230 : 'SquareShelfTranForceNeg3d', + 231 : 'SquareShelfTranForcePos3d', + 232 : 'SquareShelfTherTranForcTemp', + 233 : 'SquareShelfTranHOForcTemp', + 234 : 'SquareShelfTranForceNeg2dDakotaSamp', + 235 : 'SquareShelfTranForceNeg2dDakotaLocal', + 236 : 'SquareShelfTranIspddIsdeltaSSA2d', + 237 : 'SquareShelfTranIspddIsdeltaSSA3d', + 270 : 'SquareShelfDiagSSA2dDamage', + 272 : 'SquareShelfCMZSSA2dDamage', + 274 : 'SquareShelfDiagSSA2dDamageRift', + 280 : 'SquareShelfDiagSSA2dP2', + 301 : 'SquareSheetConstrainedDiagSSA2d', + 302 : 'SquareSheetConstrainedDiagSIA2d', + 303 : 'SquareSheetConstrainedDiagHSSA2d', + 304 : 'SquareSheetConstrainedDiagSSA3d', + 305 : 'SquareSheetConstrainedDiagSIA3d', + 306 : 'SquareSheetConstrainedDiagHSSA3d', + 307 : 'SquareSheetConstrainedDiagHO', + 308 : 'SquareSheetConstrainedDiagS3d', + 309 : 'SquareSheetConstrainedProg2d', + 320 : 'SquareSheetConstrainedProg2dDG', + 311 : 'SquareSheetConstrainedProg3d', + 312 : 'SquareSheetConstrainedTherStea', + 313 : 'SquareSheetConstrainedTherTran', + 314 : 'SquareSheetConstrainedTranSIA2d', + 315 : 'SquareSheetConstrainedTranSIA3d', + 316 : 'SquareSheetConstrainedTranSSA2d', + 317 : 'SquareSheetConstrainedTranHO', + 318 : 'SquareSheetConstrainedSteaSIA3d', + 319 : 'SquareSheetConstrainedCMDragSSA2d', + 320 : 'SquareSheetConstrainedCMDragSSA3d', + 321 : 'SquareSheetConstrainedCMDragHO', + 322 : 'SquareSheetConstrainedCMDragS3d', + 323 : 'SquareSheetConstrainedTranCflSSA2d', + 324 : 'SquareSheetConstrainedTranCflSIA3d', + 325 : 'SquareSheetConstrainedEnthalpyStea', + 326 : 'SquareSheetConstrainedEnthalpyTran', + 327 : 'SquareSheetConstrainedTransHOEnth', + 328 : 'SquareSheetConstrainedSmbGradients2d', + 329 : 'SquareSheetConstrainedSmbGradients3d', + 331 : 'SquareSheetConstrainedHydrologyShreve', + 332 : 'SquareSheetConstrainedHydrologyDC', + 333 : 'SquareSheetHydrologyDCTwoLayers', + 401 : 'SquareSheetShelfDiagSSA2d', + 402 : 'SquareSheetShelfDiagSSA3d', + 403 : 'SquareSheetShelfDiagHO', + 404 : 'SquareSheetShelfDiagS3d', + 405 : 'SquareSheetShelfDiagMHOPenalties', + 406 : 'SquareSheetShelfTherStea', + 407 : 'SquareSheetShelfTherTran', + 408 : 'SquareSheetShelfTranSSA2d', + 409 : 'SquareSheetShelfTranMHOPenalties', + 410 : 'SquareSheetShelfSteaSSA3d', + 411 : 'SquareSheetShelfSteaHO', + 412 : 'SquareSheetShelfDiadSSA3dDakota', + 413 : 'SquareSheetShelfDiadSSA3dDakotaPart', + 414 : 'SquareSheetShelfDiadSSA3dDakotaMassFlux', + 415 : 'SquareSheetShelfCMDragSteaSSA3d', + 416 : 'SquareSheetShelfCMDragSteaHO', + 417 : 'SquareSheetShelfDiadSSA3dDakotaSamp', + 418 : 'SquareSheetShelfDiadSSA3dDakotaAreaAverage', + 419 : 'SquareSheetShelfDiagMHOTiling', + 420 : 'SquareSheetShelfDakotaScaledResponse', + 421 : 'SquareSheetShelfDiagPS3dTiling', + 422 : 'SquareSheetShelfDiagMS3dTiling', + 423 : 'RoundSheetShelfGLMigrationSSA2d', + 424 : 'SquareSheetShelfGroundingLine2dAgressive', + 425 : 'SquareSheetShelfGroundingLine2dSoft', + 426 : 'SquareSheetShelfGroundingLine3dAgressive', + 427 : 'SquareSheetShelfGroundingLine3dSoft', + 428 : 'SquareSheetShelfDiagSSA2dNewton', + 429 : 'SquareSheetShelfDiagHONewton', + 430 : 'SquareSheetShelfDiagS3dNewton', + 431 : 'SquareSheetShelfSteaEnthalpySSA3d', + 432 : 'SquareSheetShelfSteaEnthalpyHO', + 433 : 'RoundSheetShelfGLMigrationSSA3d', + 434 : 'SquareSheetShelfL1L2', + 501 : 'PigDiagSSA2d', + 502 : 'PigDiagHO', + 503 : 'PigDiagS3d', + 504 : 'PigTranSSA2d', + 505 : 'PigTranSSA3d', + 506 : 'PigTranHO', + 507 : 'PigTranS3d', + 508 : 'PigSteaSSA3d', + 509 : 'PigSteaHO', + 510 : 'PigSteaS3d', + 511 : 'PigCMBS3d', + 512 : 'PigCMDragHO', + 513 : 'PigCMDragSteaSSA3d', + 514 : 'PigBamgMesh', + 515 : 'PigTherTranSUPG', + 516 : 'PigTherSteaSUPG', + 601 : '79NorthProg2d', + 602 : '79NorthProg2dDG', + 603 : '79NorthProg3d', + 604 : '79NorthSurfSlop2d', + 605 : '79NorthSurfSlop3d', + 606 : '79NorthBedSlop2d', + 607 : '79NorthBedSlop3d', + 608 : '79NorthBalThic2d', + 609 : '79NorthBalThic2dDG', + 610 : '79NorthBalThic3d', + 611 : '79NorthCMBalThic2dCG', + 612 : '79NorthCMBalThic2dDG', + 613 : '79NorthCMBalThicVxVy', + 1101 : 'ISMIPAHO', + 1102 : 'ISMIPAFS', + 1103 : 'ISMIPBHO', + 1104 : 'ISMIPBFS', + 1105 : 'ISMIPCHO', + 1106 : 'ISMIPCFS', + 1107 : 'ISMIPDHO', + 1108 : 'ISMIPDFS', + 1109 : 'ISMIPE', + 1110 : 'ISMIPF', + 1201 : 'EISMINTMassConservation', + 1202 : 'EISMINTDiag1', + 1203 : 'EISMINTDiag2', + 1204 : 'EISMINTTran2', + 1205 : 'EISMINTRoundIceSheetStaticSIA', + 1206 : 'EISMINTRoundIceSheetStaticHO', + 1207 : 'EISMINTRoundIceSheetStaticFS', + 1208 : 'EISMINTA', + 1301 : 'ThermalMelting', + 1302 : 'ThermalAdvection', + 1303 : 'ThermalConduction', + 1304 : 'ThermalGeothermalFlux', + 1401 : 'AdaptiveMeshRefinement1', + 1402 : 'AdaptiveMeshRefinement2', + 1501 : 'SquareShelfTranSawTooth2d', + 1502 : 'SquareShelfTranSawTooth3d', + 1601 : 'SquareShelfSSA2dRotation', + 1602 : 'SquareSheetShelfHORotation', + 2001 : 'SquareSheetConstrainedGia2d', + 2051 : 'GiaBenchmarksAB2dA1', + 2052 : 'GiaBenchmarksAB2dA2', + 2053 : 'GiaBenchmarksAB2dA3', + 2061 : 'GiaBenchmarksAB2dB1', + 2062 : 'GiaBenchmarksAB2dB2', + 2063 : 'GiaBenchmarksAB2dB3', + 2071 : 'GiaBenchmarksAB2dC1', + 2072 : 'GiaBenchmarksAB2dC2', + 2073 : 'GiaBenchmarksAB2dC3', + 2081 : 'GiaBenchmarksAB2dD1', + 2082 : 'GiaBenchmarksAB2dD2', + 2083 : 'GiaBenchmarksAB2dD3', + 3001 : 'SquareShelfConstrainedDiagSSA2dAdolc', + 3002 : 'SquareShelfConstrainedDiagSSA3dAdolc', + 3003 : 'SquareShelfConstrainedDiagHOAdolc', + 3004 : 'SquareShelfConstrainedDiagS3dAdolc', + 3005 : 'SquareShelfConstrainedProg2dAdolc', + 3006 : 'SquareShelfConstrainedProg2dDGAdolc', + 3007 : 'SquareShelfConstrainedProg3dAdolc', + 3008 : 'SquareShelfConstrainedTherSteaAdolc', + 3009 : 'SquareShelfConstrainedTherTranAdolc', + 3010 : 'SquareShelfConstrainedTranSSA2dAdolc', + 3015 : 'SquareShelfConstrainedProg2dAdolcForwardDifference', + 3019 : 'SquareShelfConstrainedTherTranAdolcReverseVsForward', } @@ -211,3 +227,2 @@ else: return idname - Index: /issm/trunk-jpl/test/NightlyRun/ad.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/ad.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/ad.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/ad_maxalloc.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/ad_maxalloc.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/ad_maxalloc.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/android.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/android.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/android.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.verbose=verbose('mprocessor',true,'module',true,'solution',true,'solver',true,'convergence',true,'control',true,'qmu',true,'autodiff',true); Index: /issm/trunk-jpl/test/NightlyRun/test101.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test101.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test101.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.diagnostic.requested_outputs=StressTensorEnum(); Index: /issm/trunk-jpl/test/NightlyRun/test101.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test101.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test101.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md.diagnostic.requested_outputs=StressTensorEnum() Index: /issm/trunk-jpl/test/NightlyRun/test102.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test102.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test102.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,2.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test102.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test102.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test102.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.py') md.extrude(3,2.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test103.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test103.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test103.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,2.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md.diagnostic.requested_outputs=StressTensorEnum(); Index: /issm/trunk-jpl/test/NightlyRun/test103.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test103.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test103.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.py') md.extrude(3,2.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md.diagnostic.requested_outputs=StressTensorEnum() Index: /issm/trunk-jpl/test/NightlyRun/test104.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test104.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test104.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,2.); -md=setflowequation(md,'stokes','all'); +md=setflowequation(md,'FS','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test104.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test104.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test104.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.py') md.extrude(3,2.) -md=setflowequation(md,'stokes','all') +md=setflowequation(md,'FS','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test105.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test105.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test105.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,PrognosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test105.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test105.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test105.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,PrognosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test106.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test106.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test106.m (revision 15565) @@ -3,5 +3,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.prognostic.stabilization=3; Index: /issm/trunk-jpl/test/NightlyRun/test106.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test106.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test106.py (revision 15565) @@ -13,5 +13,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md.prognostic.stabilization=3 Index: /issm/trunk-jpl/test/NightlyRun/test107.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test107.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test107.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md=extrude(md,5,3.); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test107.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test107.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test107.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.extrude(5,3.) md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test108.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test108.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test108.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.timestepping.time_step=0; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test108.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test108.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test108.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.timestepping.time_step=0 md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test109.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test109.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test109.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.transient.isdiagnostic=0; Index: /issm/trunk-jpl/test/NightlyRun/test109.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test109.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test109.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md.transient.isdiagnostic=False Index: /issm/trunk-jpl/test/NightlyRun/test110.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test110.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test110.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.transient.requested_outputs=IceVolumeEnum(); Index: /issm/trunk-jpl/test/NightlyRun/test110.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test110.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test110.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md.transient.requested_outputs=IceVolumeEnum() Index: /issm/trunk-jpl/test/NightlyRun/test1101.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1101.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1101.m (revision 15565) @@ -18,5 +18,5 @@ md=extrude(md,9,1.); - md=setflowequation(md,'pattyn','all'); + md=setflowequation(md,'HO','all'); %Create dirichlet on the bed only @@ -54,18 +54,18 @@ if printingflag, set(gcf,'Color','w') - printmodel(['ismipapattynvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipapattynvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); + printmodel(['ismipaHOvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipaHOvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); end plotmodel(md,'data',vy,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km') if printingflag, set(gcf,'Color','w') - printmodel(['ismipapattynvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipapattynvy' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); + printmodel(['ismipaHOvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipaHOvy' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); end plotmodel(md,'data',vz,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km') if printingflag, set(gcf,'Color','w') - printmodel(['ismipapattynvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipapattynvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); + printmodel(['ismipaHOvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipaHOvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); end @@ -91,6 +91,6 @@ if printingflag, set(gcf,'Color','w') - printmodel(['ismipapattynvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipapattynvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); + printmodel(['ismipaHOvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipaHOvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); end end @@ -100,12 +100,12 @@ if printingflag, set(gcf,'Color','w') - printmodel('ismipapattynminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipapattynminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); + printmodel('ismipaHOminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipaHOminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); end plot([5 10 20 40 80 160],maxvx);ylim([0 120]);xlim([0 160]) if printingflag, set(gcf,'Color','w') - printmodel('ismipapattynmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipapattynmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); + printmodel('ismipaHOmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipaHOmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); end Index: /issm/trunk-jpl/test/NightlyRun/test1101.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1101.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1101.py (revision 15565) @@ -32,5 +32,5 @@ md.extrude(9,1.) - md=setflowequation(md,'pattyn','all') + md=setflowequation(md,'HO','all') #Create dirichlet on the bed only @@ -69,18 +69,18 @@ pass # set(gcf,'Color','w') -# printmodel(['ismipapattynvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move("ismipapattynvx%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') +# printmodel(['ismipaHOvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move("ismipaHOvx%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') # plotmodel(md,'data',vy,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km') if printingflag: pass # set(gcf,'Color','w') -# printmodel(['ismipapattynvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move("ismipapattynvy%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') +# printmodel(['ismipaHOvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move("ismipaHOvy%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') # plotmodel(md,'data',vz,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km') if printingflag: pass # set(gcf,'Color','w') -# printmodel(['ismipapattynvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move("ismipapattynvz%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') +# printmodel(['ismipaHOvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move("ismipaHOvz%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') if (L==5000.): @@ -111,6 +111,6 @@ pass # set(gcf,'Color','w') -# printmodel(['ismipapattynvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move("ismipapattynvxsec%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') +# printmodel(['ismipaHOvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move("ismipaHOvxsec%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') #Now plot the min and max values of vx for each size of the square @@ -119,12 +119,12 @@ pass # set(gcf,'Color','w') -# printmodel('ismipapattynminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move('ismipapattynminvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') +# printmodel('ismipaHOminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move('ismipaHOminvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') #plot([5 10 20 40 80 160],maxvx);ylim([0 120]);xlim([0 160]) if printingflag: pass # set(gcf,'Color','w') -# printmodel('ismipapattynmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move('ismipapattynmaxvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') +# printmodel('ismipaHOmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move('ismipaHOmaxvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') #Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test1102.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1102.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1102.m (revision 15565) @@ -25,5 +25,5 @@ md=parameterize(md,'../Par/ISMIPA.par'); md=extrude(md,10,1.); - md=setflowequation(md,'stokes','all'); + md=setflowequation(md,'FS','all'); %Create dirichlet on the bed only @@ -64,18 +64,18 @@ if printingflag, set(gcf,'Color','w') - printmodel(['ismipastokesvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipastokesvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); + printmodel(['ismipaFSvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipaFSvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); end plotmodel(md,'data',vy,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',3) if printingflag, set(gcf,'Color','w') - printmodel(['ismipastokesvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipastokesvy' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); + printmodel(['ismipaFSvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipaFSvy' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); end plotmodel(md,'data',vz,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',4) if printingflag, set(gcf,'Color','w') - printmodel(['ismipastokesvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipastokesvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); + printmodel(['ismipaFSvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipaFSvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); end @@ -101,6 +101,6 @@ if printingflag, set(gcf,'Color','w') - printmodel(['ismipastokesvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipastokesvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); + printmodel(['ismipaFSvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipaFSvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); end end @@ -110,12 +110,12 @@ if printingflag, set(gcf,'Color','w') - printmodel('ismipastokesminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipastokesminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); + printmodel('ismipaFSminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipaFSminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); end plot([5 10 20 40 80 160],maxvx);ylim([0 120]) if printingflag, set(gcf,'Color','w') - printmodel('ismipastokesmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipastokesmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); + printmodel('ismipaFSmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipaFSmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestA']); end Index: /issm/trunk-jpl/test/NightlyRun/test1102.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1102.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1102.py (revision 15565) @@ -39,5 +39,5 @@ md=parameterize(md,'../Par/ISMIPA.py') md.extrude(10,1.) - md=setflowequation(md,'stokes','all') + md=setflowequation(md,'FS','all') #Create dirichlet on the bed only @@ -79,18 +79,18 @@ pass # set(gcf,'Color','w') -# printmodel(['ismipastokesvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move("ismipastokesvx%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') +# printmodel(['ismipaFSvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move("ismipaFSvx%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') # plotmodel(md,'data',vy,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',3) if printingflag: pass # set(gcf,'Color','w') -# printmodel(['ismipastokesvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move("ismipastokesvy%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') +# printmodel(['ismipaFSvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move("ismipaFSvy%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') # plotmodel(md,'data',vz,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',4) if printingflag: pass # set(gcf,'Color','w') -# printmodel(['ismipastokesvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move("ismipastokesvz%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') +# printmodel(['ismipaFSvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move("ismipaFSvz%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') if (L==5000.): @@ -121,6 +121,6 @@ pass # set(gcf,'Color','w') -# printmodel(['ismipastokesvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move("ismipastokesvxsec.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') +# printmodel(['ismipaFSvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move("ismipaFSvxsec.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') #Now plot the min and max values of vx for each size of the square @@ -129,12 +129,12 @@ pass # set(gcf,'Color','w') -# printmodel('ismipastokesminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move('ismipastokesminvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') +# printmodel('ismipaFSminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move('ismipaFSminvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') #plot([5 10 20 40 80 160],maxvx);ylim([0 120]) if printingflag: pass # set(gcf,'Color','w') -# printmodel('ismipastokesmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move('ismipastokesmaxvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') +# printmodel('ismipaFSmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move('ismipaFSmaxvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestA') #Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test1103.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1103.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1103.m (revision 15565) @@ -18,5 +18,5 @@ md=extrude(md,10,1.); - md=setflowequation(md,'pattyn','all'); + md=setflowequation(md,'HO','all'); %Create dirichlet on the bed only @@ -53,12 +53,12 @@ if printingflag, set(gcf,'Color','w') - printmodel(['ismipbpattynvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipbpattynvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB']); + printmodel(['ismipbHOvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipbHOvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB']); end plotmodel(md,'data',vz,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km') if printingflag, set(gcf,'Color','w') - printmodel(['ismipbpattynvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipbpattynvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB']); + printmodel(['ismipbHOvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipbHOvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB']); end @@ -84,6 +84,6 @@ if printingflag, set(gcf,'Color','w') - printmodel(['ismipbpattynvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipbpattynvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB']); + printmodel(['ismipbHOvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipbHOvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB']); end end @@ -93,12 +93,12 @@ if printingflag, set(gcf,'Color','w') - printmodel('ismipbpattynminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipbpattynminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB']); + printmodel('ismipbHOminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipbHOminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB']); end plot([5 10 20 40 80 160],maxvx);ylim([0 120]);xlim([0 160]) if printingflag, set(gcf,'Color','w') - printmodel('ismipbpattynmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipbpattynmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB']); + printmodel('ismipbHOmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipbHOmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestB']); end Index: /issm/trunk-jpl/test/NightlyRun/test1103.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1103.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1103.py (revision 15565) @@ -32,5 +32,5 @@ md.extrude(10,1.) - md=setflowequation(md,'pattyn','all') + md=setflowequation(md,'HO','all') #Create dirichlet on the bed only @@ -68,12 +68,12 @@ pass # set(gcf,'Color','w') -# printmodel(['ismipbpattynvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move("ismipbpattynvx%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestB') +# printmodel(['ismipbHOvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move("ismipbHOvx%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestB') # plotmodel(md,'data',vz,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km') if printingflag: pass # set(gcf,'Color','w') -# printmodel(['ismipbpattynvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move("ismipbpattynvz%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestB') +# printmodel(['ismipbHOvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move("ismipbHOvz%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestB') if (L==5000.): @@ -104,6 +104,6 @@ pass # set(gcf,'Color','w') -# printmodel(['ismipbpattynvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move("ismipbpattynvxsec%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestB') +# printmodel(['ismipbHOvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move("ismipbHOvxsec%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestB') #Now plot the min and max values of vx for each size of the square @@ -112,12 +112,12 @@ pass # set(gcf,'Color','w') -# printmodel('ismipbpattynminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move('ismipbpattynminvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestB') +# printmodel('ismipbHOminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move('ismipbHOminvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestB') #plot([5 10 20 40 80 160],maxvx);ylim([0 120]);xlim([0 160]) if printingflag: pass # set(gcf,'Color','w') -# printmodel('ismipbpattynmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move('ismipbpattynmaxvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestB') +# printmodel('ismipbHOmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move('ismipbHOmaxvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestB') #Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test1104.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1104.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1104.m (revision 15565) @@ -14,5 +14,5 @@ md=parameterize(md,'../Par/ISMIPB.par'); md=extrude(md,10,1.); - md=setflowequation(md,'pattyn','all'); + md=setflowequation(md,'HO','all'); %Create dirichlet on the bed only @@ -42,5 +42,5 @@ md.diagnostic.spcvy(pos)=md.results.DiagnosticSolution.Vy(pos); md.diagnostic.vertex_pairing=[]; - md=setflowequation(md,'stokes','all'); + md=setflowequation(md,'FS','all'); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test1104.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1104.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1104.py (revision 15565) @@ -26,5 +26,5 @@ md=parameterize(md,'../Par/ISMIPB.py') md.extrude(10,1.) - md=setflowequation(md,'pattyn','all') + md=setflowequation(md,'HO','all') #Create dirichlet on the bed only @@ -54,5 +54,5 @@ md.diagnostic.spcvy[pos]=md.results.DiagnosticSolution.Vy[pos] md.diagnostic.vertex_pairing=numpy.empty((0,2),int) - md=setflowequation(md,'stokes','all') + md=setflowequation(md,'FS','all') md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test1105.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1105.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1105.m (revision 15565) @@ -18,5 +18,5 @@ md=extrude(md,10,1.); - md=setflowequation(md,'pattyn','all'); + md=setflowequation(md,'HO','all'); %Create MPCs to have periodic boundary conditions @@ -77,18 +77,18 @@ if printingflag, set(gcf,'Color','w') - printmodel(['ismipcpattynvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipcpattynvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC']); + printmodel(['ismipcHOvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipcHOvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC']); end plotmodel(md,'data',vy,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',3) if printingflag, set(gcf,'Color','w') - printmodel(['ismipcpattynvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipcpattynvy' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC']); + printmodel(['ismipcHOvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipcHOvy' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC']); end plotmodel(md,'data',vz,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',4) if printingflag, set(gcf,'Color','w') - printmodel(['ismipcpattynvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipcpattynvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC']); + printmodel(['ismipcHOvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipcHOvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC']); end @@ -114,6 +114,6 @@ if printingflag, set(gcf,'Color','w') - printmodel(['ismipcpattynvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipcpattynvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC']); + printmodel(['ismipcHOvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipcHOvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC']); end end @@ -123,12 +123,12 @@ if printingflag, set(gcf,'Color','w') - printmodel('ismipcpattynminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipcpattynminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC']); + printmodel('ismipcHOminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipcHOminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC']); end plot([5 10 20 40 80 160],maxvx);ylim([0 200]); xlim([0 160]) if printingflag, set(gcf,'Color','w') - printmodel('ismipcpattynmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipcpattynmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC']); + printmodel('ismipcHOmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipcHOmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestC']); end Index: /issm/trunk-jpl/test/NightlyRun/test1105.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1105.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1105.py (revision 15565) @@ -32,5 +32,5 @@ md.extrude(10,1.) - md=setflowequation(md,'pattyn','all') + md=setflowequation(md,'HO','all') #Create MPCs to have periodic boundary conditions @@ -91,18 +91,18 @@ pass # set(gcf,'Color','w') -# printmodel(['ismipcpattynvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move("ismipcpattynvx%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC') +# printmodel(['ismipcHOvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move("ismipcHOvx%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC') # plotmodel(md,'data',vy,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',3) if printingflag: pass # set(gcf,'Color','w') -# printmodel(['ismipcpattynvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move("ismipcpattynvy%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC') +# printmodel(['ismipcHOvy' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move("ismipcHOvy%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC') # plotmodel(md,'data',vz,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',4) if printingflag: pass # set(gcf,'Color','w') -# printmodel(['ismipcpattynvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move("ismipcpattynvz%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC') +# printmodel(['ismipcHOvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move("ismipcHOvz%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC') if (L==5000.): @@ -133,6 +133,6 @@ pass # set(gcf,'Color','w') -# printmodel(['ismipcpattynvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move("ismipcpattynvxsec%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC') +# printmodel(['ismipcHOvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move("ismipcHOvxsec%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC') #Now plot the min and max values of vx for each size of the square @@ -141,12 +141,12 @@ pass # set(gcf,'Color','w') -# printmodel('ismipcpattynminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move('ismipcpattynminvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC') +# printmodel('ismipcHOminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move('ismipcHOminvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC') #plot([5 10 20 40 80 160],maxvx);ylim([0 200]); xlim([0 160]) if printingflag: pass # set(gcf,'Color','w') -# printmodel('ismipcpattynmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move('ismipcpattynmaxvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC') +# printmodel('ismipcHOmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move('ismipcHOmaxvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestC') #Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test1106.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1106.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1106.m (revision 15565) @@ -37,5 +37,5 @@ end - md=setflowequation(md,'stokes','all'); + md=setflowequation(md,'FS','all'); %Compute the diagnostic Index: /issm/trunk-jpl/test/NightlyRun/test1106.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1106.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1106.py (revision 15565) @@ -48,5 +48,5 @@ md.diagnostic.spcvy[pos]=-1.27 - md=setflowequation(md,'stokes','all') + md=setflowequation(md,'FS','all') #Compute the diagnostic Index: /issm/trunk-jpl/test/NightlyRun/test1107.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1107.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1107.m (revision 15565) @@ -18,5 +18,5 @@ md=extrude(md,10,1.); - md=setflowequation(md,'pattyn','all'); + md=setflowequation(md,'HO','all'); %We need one grd on dirichlet: the 4 corners are set to zero @@ -72,12 +72,12 @@ if printingflag, set(gcf,'Color','w') - printmodel(['ismipdpattynvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipdpattynvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD']); + printmodel(['ismipdHOvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipdHOvx' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD']); end plotmodel(md,'data',vz,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',3) if printingflag, set(gcf,'Color','w') - printmodel(['ismipdpattynvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipdpattynvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD']); + printmodel(['ismipdHOvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipdHOvz' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD']); end @@ -103,6 +103,6 @@ if printingflag, set(gcf,'Color','w') - printmodel(['ismipdpattynvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipdpattynvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD']); + printmodel(['ismipdHOvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipdHOvxsec' num2str(L) '.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD']); end end @@ -112,12 +112,12 @@ if printingflag, set(gcf,'Color','w') - printmodel('ismipdpattynminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipdpattynminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD']); + printmodel('ismipdHOminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipdHOminvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD']); end plot([5 10 20 40 80 160],maxvx);ylim([0 300]);xlim([0 160]) if printingflag, set(gcf,'Color','w') - printmodel('ismipdpattynmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipdpattynmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD']); + printmodel('ismipdHOmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipdHOmaxvx.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestD']); end Index: /issm/trunk-jpl/test/NightlyRun/test1107.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1107.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1107.py (revision 15565) @@ -32,5 +32,5 @@ md.extrude(10,1.) - md=setflowequation(md,'pattyn','all') + md=setflowequation(md,'HO','all') #We need one grd on dirichlet: the 4 corners are set to zero @@ -88,12 +88,12 @@ pass # set(gcf,'Color','w') -# printmodel(['ismipdpattynvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move("ismipdpattynvx%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestD') +# printmodel(['ismipdHOvx' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move("ismipdHOvx%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestD') # plotmodel(md,'data',vz,'layer#all',md.mesh.numberoflayers,'xlim',[0 L/10^3],'ylim',[0 L/10^3],'unit','km','figure',3) if printingflag: pass # set(gcf,'Color','w') -# printmodel(['ismipdpattynvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move("ismipdpattynvz%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestD') +# printmodel(['ismipdHOvz' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move("ismipdHOvz%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestD') if (L==5000.): @@ -124,6 +124,6 @@ pass # set(gcf,'Color','w') -# printmodel(['ismipdpattynvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move("ismipdpattynvxsec%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestD') +# printmodel(['ismipdHOvxsec' num2str(L)],'png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move("ismipdHOvxsec%d.png" % L,ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestD') #Now plot the min and max values of vx for each size of the square @@ -132,12 +132,12 @@ pass # set(gcf,'Color','w') -# printmodel('ismipdpattynminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move('ismipdpattynminvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestD') +# printmodel('ismipdHOminvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move('ismipdHOminvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestD') #plot([5 10 20 40 80 160],maxvx);ylim([0 300]);xlim([0 160]) if printingflag: pass # set(gcf,'Color','w') -# printmodel('ismipdpattynmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); -# shutil.move('ismipdpattynmaxvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestD') +# printmodel('ismipdHOmaxvx','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); +# shutil.move('ismipdHOmaxvx.png',ISSM_DIR+'/website/doc_pdf/validation/Images/ISMIP/TestD') #Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test1108.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1108.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1108.m (revision 15565) @@ -15,5 +15,5 @@ md=extrude(md,10,1.); - md=setflowequation(md,'pattyn','all'); + md=setflowequation(md,'HO','all'); %We need one grid on dirichlet: the 4 corners are set to zero @@ -50,5 +50,5 @@ md.diagnostic.spcvx(pos)=md.results.DiagnosticSolution.Vx(pos); md.diagnostic.spcvy(pos)=md.results.DiagnosticSolution.Vy(pos); - md=setflowequation(md,'stokes','all'); + md=setflowequation(md,'FS','all'); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test1108.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1108.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1108.py (revision 15565) @@ -27,5 +27,5 @@ md.extrude(10,1.) - md=setflowequation(md,'pattyn','all') + md=setflowequation(md,'HO','all') #We need one grd on dirichlet: the 4 corners are set to zero @@ -62,5 +62,5 @@ md.diagnostic.spcvx[pos]=md.results.DiagnosticSolution.Vx[pos] md.diagnostic.spcvy[pos]=md.results.DiagnosticSolution.Vy[pos] - md=setflowequation(md,'stokes','all') + md=setflowequation(md,'FS','all') md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test1109.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1109.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1109.m (revision 15565) @@ -20,7 +20,7 @@ if i==1 | i==3, - md=setflowequation(md,'pattyn','all'); + md=setflowequation(md,'HO','all'); elseif i==2 | i==4, - md=setflowequation(md,'stokes','all'); + md=setflowequation(md,'FS','all'); end @@ -60,6 +60,6 @@ if printingflag, set(gcf,'Color','w') - printmodel('ismipepattynvxfrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipepattynvxfrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestE']); + printmodel('ismipeHOvxfrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipeHOvxfrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestE']); end elseif i==2, @@ -67,6 +67,6 @@ if printingflag, set(gcf,'Color','w') - printmodel('ismipestokesvxfrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipestokesvxfrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestE']); + printmodel('ismipeFSvxfrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipeFSvxfrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestE']); end elseif i==3, @@ -74,6 +74,6 @@ if printingflag, set(gcf,'Color','w') - printmodel('ismipepattynvxsliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipepattynvxsliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestE']); + printmodel('ismipeHOvxsliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipeHOvxsliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestE']); end elseif i==4, @@ -81,6 +81,6 @@ if printingflag, set(gcf,'Color','w') - printmodel('ismipestokesvxsliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipestokesvxsliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestE']); + printmodel('ismipeFSvxsliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipeFSvxsliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestE']); end end Index: /issm/trunk-jpl/test/NightlyRun/test111.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test111.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test111.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md.transient.requested_outputs=IceVolumeEnum(); Index: /issm/trunk-jpl/test/NightlyRun/test111.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test111.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test111.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.py') md.extrude(3,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md.transient.requested_outputs=IceVolumeEnum() Index: /issm/trunk-jpl/test/NightlyRun/test1110.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1110.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1110.m (revision 15565) @@ -16,7 +16,7 @@ if (i==1 | i==2), - md=setflowequation(md,'pattyn','all'); + md=setflowequation(md,'HO','all'); else - md=setflowequation(md,'stokes','all'); + md=setflowequation(md,'FS','all'); end @@ -72,15 +72,15 @@ set(gcf,'Color','w') if i==1, - printmodel('ismipfpattynvxfrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipfpattynvxfrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']); + printmodel('ismipfHOvxfrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipfHOvxfrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']); elseif i==2, - printmodel('ismipfpattynvxsliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipfpattynvxsliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']); + printmodel('ismipfHOvxsliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipfHOvxsliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']); elseif i==3, - printmodel('ismipfstokesvxfrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipfstokesvxfrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']); + printmodel('ismipfFSvxfrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipfFSvxfrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']); elseif i==4, - printmodel('ismipfstokesvxsliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipfstokesvxsliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']); + printmodel('ismipfFSvxsliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipfFSvxsliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']); end end @@ -90,15 +90,15 @@ set(gcf,'Color','w') if i==1, - printmodel('ismipfpattyndeltasurfacefrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipfpattyndeltasurfacefrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']); + printmodel('ismipfHOdeltasurfacefrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipfHOdeltasurfacefrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']); elseif i==2, - printmodel('ismipfpattyndeltasurfacesliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipfpattyndeltasurfacesliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']); + printmodel('ismipfHOdeltasurfacesliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipfHOdeltasurfacesliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']); elseif i==3, - printmodel('ismipfstokesdeltasurfacefrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipfstokesdeltasurfacefrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']); + printmodel('ismipfFSdeltasurfacefrozen','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipfFSdeltasurfacefrozen.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']); elseif i==4, - printmodel('ismipfstokesdeltasurfacesliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); - system(['mv ismipfstokesdeltasurfacesliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']); + printmodel('ismipfFSdeltasurfacesliding','png','margin','on','marginsize',25,'frame','off','resolution',1.5,'hardcopy','off'); + system(['mv ismipfFSdeltasurfacesliding.png ' ISSM_DIR '/website/doc_pdf/validation/Images/ISMIP/TestF']); end end Index: /issm/trunk-jpl/test/NightlyRun/test112.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test112.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test112.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,SurfaceSlopeSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test112.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test112.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test112.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,SurfaceSlopeSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test113.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test113.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test113.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,5,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,SurfaceSlopeSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test113.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test113.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test113.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.py') md.extrude(5,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,SurfaceSlopeSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test114.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test114.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test114.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,BedSlopeSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test114.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test114.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test114.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,BedSlopeSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test115.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test115.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test115.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,5,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,BedSlopeSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test115.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test115.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test115.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.py') md.extrude(5,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,BedSlopeSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test116.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test116.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test116.m (revision 15565) @@ -5,5 +5,5 @@ pos=find(md.mesh.vertexonboundary); md.balancethickness.spcthickness(pos)=md.geometry.thickness(pos); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,BalancethicknessSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test116.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test116.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test116.py (revision 15565) @@ -15,5 +15,5 @@ pos=numpy.nonzero(md.mesh.vertexonboundary) md.balancethickness.spcthickness[pos]=md.geometry.thickness[pos] -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,BalancethicknessSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test117.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test117.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test117.m (revision 15565) @@ -6,5 +6,5 @@ pos=find(md.mesh.vertexonboundary); md.balancethickness.spcthickness(pos)=md.geometry.thickness(pos); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,BalancethicknessSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test117.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test117.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test117.py (revision 15565) @@ -16,5 +16,5 @@ pos=numpy.nonzero(md.mesh.vertexonboundary) md.balancethickness.spcthickness[pos]=md.geometry.thickness[pos] -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,BalancethicknessSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test118.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test118.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test118.m (revision 15565) @@ -5,5 +5,5 @@ md.balancethickness.stabilization=3; md.initialization.vy=md.initialization.vy+400; -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,BalancethicknessSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test118.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test118.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test118.py (revision 15565) @@ -15,5 +15,5 @@ md.balancethickness.stabilization=3 md.initialization.vy=md.initialization.vy+400. -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,BalancethicknessSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test120.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test120.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test120.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.timestepping.time_step=0; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test120.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test120.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test120.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.timestepping.time_step=0 md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test1201.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1201.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1201.m (revision 15565) @@ -10,5 +10,5 @@ md=parameterize(md,'../Par/SquareEISMINT.par'); md.surfaceforcings.mass_balance(:)=0.; - md=setflowequation(md,'macayeal','all'); + md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',8); Index: /issm/trunk-jpl/test/NightlyRun/test1201.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1201.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1201.py (revision 15565) @@ -23,5 +23,5 @@ md=parameterize(md,'../Par/SquareEISMINT.py') md.surfaceforcings.mass_balance[:]=0. - md=setflowequation(md,'macayeal','all') + md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',8) Index: /issm/trunk-jpl/test/NightlyRun/test1202.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1202.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1202.m (revision 15565) @@ -7,5 +7,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareEISMINT.par'); -md=setflowequation(md,'macayeal','all'); %MacAyeal's model and 2d +md=setflowequation(md,'SSA','all'); %MacAyeal's model and 2d %Compute solution for MacAyeal's model Index: /issm/trunk-jpl/test/NightlyRun/test1202.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1202.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1202.py (revision 15565) @@ -20,5 +20,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareEISMINT.py') -md=setflowequation(md,'macayeal','all') #MacAyeal's model and 2d +md=setflowequation(md,'SSA','all') #MacAyeal's model and 2d #Compute solution for MacAyeal's model Index: /issm/trunk-jpl/test/NightlyRun/test1203.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1203.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1203.m (revision 15565) @@ -7,5 +7,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareEISMINT.par'); -md=setflowequation(md,'macayeal','all'); %MacAyeal's model and 2d +md=setflowequation(md,'SSA','all'); %MacAyeal's model and 2d %Impose a non zero velocity on the upper boundary condition (y=max(y)) Index: /issm/trunk-jpl/test/NightlyRun/test1203.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1203.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1203.py (revision 15565) @@ -21,5 +21,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareEISMINT.py') -md=setflowequation(md,'macayeal','all') #MacAyeal's model and 2d +md=setflowequation(md,'SSA','all') #MacAyeal's model and 2d #Impose a non zero velocity on the upper boundary condition (y=max(y)) Index: /issm/trunk-jpl/test/NightlyRun/test1204.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1204.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1204.m (revision 15565) @@ -7,5 +7,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareEISMINT.par'); -md=setflowequation(md,'macayeal','all'); %MacAyeal's model and 2d +md=setflowequation(md,'SSA','all'); %MacAyeal's model and 2d %Impose a non zero velocity on the upper boundary condition (y=max(y)) Index: /issm/trunk-jpl/test/NightlyRun/test1204.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1204.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1204.py (revision 15565) @@ -21,5 +21,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareEISMINT.py') -md=setflowequation(md,'macayeal','all') #MacAyeal's model and 2d +md=setflowequation(md,'SSA','all') #MacAyeal's model and 2d #Impose a non zero velocity on the upper boundary condition (y=max(y)) Index: /issm/trunk-jpl/test/NightlyRun/test1205.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1205.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1205.m (revision 15565) @@ -19,5 +19,5 @@ %We extrude the model to have a 3d model md=extrude(md,numlayers,1.); -md=setflowequation(md,'hutter','all'); +md=setflowequation(md,'SIA','all'); %Spc the nodes on the bed @@ -83,6 +83,6 @@ if printingflag, set(gcf,'Color','w') - printmodel('hutterstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off'); - system(['mv hutterstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']); + printmodel('SIAstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off'); + system(['mv SIAstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']); end Index: /issm/trunk-jpl/test/NightlyRun/test1205.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1205.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1205.py (revision 15565) @@ -32,5 +32,5 @@ #We extrude the model to have a 3d model md.extrude(numlayers,1.); -md=setflowequation(md,'hutter','all') +md=setflowequation(md,'SIA','all') #Spc the nodes on the bed @@ -95,6 +95,6 @@ pass # set(gcf,'Color','w') -# printmodel('hutterstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off'); -# system(['mv hutterstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']); +# printmodel('SIAstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off'); +# system(['mv SIAstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']); #Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test1206.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1206.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1206.m (revision 15565) @@ -19,5 +19,5 @@ %We extrude the model to have a 3d model md=extrude(md,numlayers,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); %Spc the nodes on the bed @@ -82,6 +82,6 @@ if printingflag, set(gcf,'Color','w') - printmodel('pattynstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off'); - system(['mv pattynstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']); + printmodel('HOstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off'); + system(['mv HOstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']); end Index: /issm/trunk-jpl/test/NightlyRun/test1206.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1206.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1206.py (revision 15565) @@ -32,5 +32,5 @@ #We extrude the model to have a 3d model md.extrude(numlayers,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') #Spc the nodes on the bed @@ -94,6 +94,6 @@ pass # set(gcf,'Color','w') -# printmodel('pattynstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off'); -# system(['mv pattynstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']); +# printmodel('HOstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off'); +# system(['mv HOstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']); #Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test1207.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1207.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1207.m (revision 15565) @@ -19,5 +19,5 @@ %We extrude the model to have a 3d model md=extrude(md,numlayers,1.); -md=setflowequation(md,'stokes','all'); +md=setflowequation(md,'FS','all'); %Spc the nodes on the bed @@ -82,6 +82,6 @@ if printingflag, set(gcf,'Color','w') - printmodel('stokesstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off'); - system(['mv stokesstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']); + printmodel('FSstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off'); + system(['mv FSstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']); end Index: /issm/trunk-jpl/test/NightlyRun/test1207.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1207.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1207.py (revision 15565) @@ -32,5 +32,5 @@ #We extrude the model to have a 3d model md.extrude(numlayers,1.) -md=setflowequation(md,'stokes','all') +md=setflowequation(md,'FS','all') #Spc the nodes on the bed @@ -94,6 +94,6 @@ pass # set(gcf,'Color','w') -# printmodel('stokesstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off'); -# system(['mv stokesstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']); +# printmodel('FSstatic','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off'); +# system(['mv FSstatic.png ' ISSM_DIR '/website/doc_pdf/validation/Images/EISMINT/IceSheet']); #Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test1208.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1208.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1208.m (revision 15565) @@ -10,5 +10,5 @@ %We extrude the model to have a 3d model md=extrude(md,numlayers,1.); -md=setflowequation(md,'hutter','all'); +md=setflowequation(md,'SIA','all'); %Spc the nodes on the bed Index: /issm/trunk-jpl/test/NightlyRun/test1208.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1208.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1208.py (revision 15565) @@ -23,5 +23,5 @@ #We extrude the model to have a 3d model md.extrude(numlayers,1.) -md=setflowequation(md,'hutter','all') +md=setflowequation(md,'SIA','all') #Spc the nodes on the bed Index: /issm/trunk-jpl/test/NightlyRun/test121.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test121.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test121.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/NightlyRun/test121.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test121.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test121.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3); md.initialization.waterfraction=numpy.zeros((md.mesh.numberofvertices,1)) Index: /issm/trunk-jpl/test/NightlyRun/test122.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test122.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test122.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); md.thermal.isenthalpy=1; Index: /issm/trunk-jpl/test/NightlyRun/test122.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test122.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test122.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.py') md.extrude(3,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.initialization.waterfraction=numpy.zeros((md.mesh.numberofvertices,1)) md.thermal.isenthalpy=1 Index: /issm/trunk-jpl/test/NightlyRun/test1301.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1301.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1301.m (revision 15565) @@ -10,5 +10,5 @@ md=parameterize(md,'../Par/SquareThermal.par'); md=extrude(md,3,2.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); %Some conditions specific to melting test Index: /issm/trunk-jpl/test/NightlyRun/test1301.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1301.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1301.py (revision 15565) @@ -24,5 +24,5 @@ md=parameterize(md,'../Par/SquareThermal.py') md.extrude(3,2.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') #Some conditions specific to melting test Index: /issm/trunk-jpl/test/NightlyRun/test1302.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1302.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1302.m (revision 15565) @@ -9,5 +9,5 @@ md=parameterize(md,'../Par/SquareThermal.par'); md=extrude(md,30,1.); %NB: the more one extrudes, the better (10-> relative~0.35%, 20->0.1%, 30->0.05%) -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); %Thermal boundary conditions Index: /issm/trunk-jpl/test/NightlyRun/test1302.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1302.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1302.py (revision 15565) @@ -23,5 +23,5 @@ md=parameterize(md,'../Par/SquareThermal.py') md.extrude(30,1.) #NB: the more one extrudes, the better (10-> relative~0.35%, 20->0.1%, 30->0.05%) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') #Thermal boundary conditions Index: /issm/trunk-jpl/test/NightlyRun/test1303.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1303.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1303.m (revision 15565) @@ -10,5 +10,5 @@ md=parameterize(md,'../Par/SquareThermal.par'); md=extrude(md,11,2.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); pos1=find(md.mesh.elementonbed); md.thermal.spctemperature(md.mesh.elements(pos1,1:3))=10.; Index: /issm/trunk-jpl/test/NightlyRun/test1303.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1303.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1303.py (revision 15565) @@ -24,5 +24,5 @@ md=parameterize(md,'../Par/SquareThermal.py') md.extrude(11,2.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') pos1=numpy.nonzero(md.mesh.elementonbed)[0] Index: /issm/trunk-jpl/test/NightlyRun/test1304.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1304.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1304.m (revision 15565) @@ -10,5 +10,5 @@ md=parameterize(md,'../Par/SquareThermal.par'); md=extrude(md,11,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); pos2=find(md.mesh.elementonsurface); md.thermal.spctemperature(md.mesh.elements(pos2,4:6))=0.; Index: /issm/trunk-jpl/test/NightlyRun/test1304.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1304.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1304.py (revision 15565) @@ -24,5 +24,5 @@ md=parameterize(md,'../Par/SquareThermal.py') md.extrude(11,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') pos2=numpy.nonzero(md.mesh.elementonsurface)[0] Index: /issm/trunk-jpl/test/NightlyRun/test1501.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1501.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1501.m (revision 15565) @@ -4,5 +4,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.transient.isthermal=0; Index: /issm/trunk-jpl/test/NightlyRun/test1501.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1501.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1501.py (revision 15565) @@ -15,5 +15,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md.transient.isthermal=False Index: /issm/trunk-jpl/test/NightlyRun/test1502.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1502.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1502.m (revision 15565) @@ -4,5 +4,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md=extrude(md,3,1.); md.cluster=generic('name',oshostname(),'np',2); Index: /issm/trunk-jpl/test/NightlyRun/test1502.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1502.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1502.py (revision 15565) @@ -15,5 +15,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.extrude(3,1.) md.cluster=generic('name',oshostname(),'np',2) Index: /issm/trunk-jpl/test/NightlyRun/test1601.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1601.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1601.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.diagnostic.spcvx(find(md.mesh.y>0.))=NaN; md.initialization.vx(:)=0.; Index: /issm/trunk-jpl/test/NightlyRun/test1601.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1601.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1601.py (revision 15565) @@ -13,5 +13,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.diagnostic.spcvx[numpy.nonzero(md.mesh.y>0.)]=float('NaN') md.initialization.vx[:]=0. Index: /issm/trunk-jpl/test/NightlyRun/test1602.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1602.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1602.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,5,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.diagnostic.spcvx(find(md.mesh.y>0.))=NaN; md.initialization.vx(:)=0.; Index: /issm/trunk-jpl/test/NightlyRun/test1602.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1602.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test1602.py (revision 15565) @@ -14,5 +14,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(5,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.diagnostic.spcvx[numpy.nonzero(md.mesh.y>0.)]=float('NaN') md.initialization.vx[:]=0. Index: /issm/trunk-jpl/test/NightlyRun/test201.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test201.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test201.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.verbose=verbose('all'); Index: /issm/trunk-jpl/test/NightlyRun/test201.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test201.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test201.py (revision 15565) @@ -12,5 +12,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test202.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test202.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test202.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,2.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test202.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test202.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test202.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(3,2.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test203.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test203.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test203.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,2.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test203.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test203.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test203.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(3,2.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test204.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test204.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test204.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,2.); -md=setflowequation(md,'stokes','all'); +md=setflowequation(md,'FS','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test204.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test204.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test204.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(3,2.) -md=setflowequation(md,'stokes','all') +md=setflowequation(md,'FS','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test205.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test205.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test205.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,2.); -md=setflowequation(md,'pattyn','../Exp/SquareHalfRight.exp','fill','macayeal','coupling','penalties'); +md=setflowequation(md,'HO','../Exp/SquareHalfRight.exp','fill','SSA','coupling','penalties'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test205.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test205.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test205.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(3,2.) -md=setflowequation(md,'pattyn','../Exp/SquareHalfRight.exp','fill','macayeal','coupling','penalties') +md=setflowequation(md,'HO','../Exp/SquareHalfRight.exp','fill','SSA','coupling','penalties') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test206.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test206.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test206.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.timestepping.time_step=0; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test206.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test206.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test206.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.timestepping.time_step=0 md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test207.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test207.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test207.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.transient.isdiagnostic=0; Index: /issm/trunk-jpl/test/NightlyRun/test207.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test207.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test207.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md.transient.isdiagnostic=False Index: /issm/trunk-jpl/test/NightlyRun/test208.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test208.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test208.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,TransientSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test208.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test208.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test208.py (revision 15565) @@ -12,5 +12,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,TransientSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test209.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test209.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test209.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,TransientSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test209.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test209.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test209.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,TransientSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test210.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test210.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test210.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,TransientSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test210.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test210.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test210.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(3,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,TransientSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test211.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test211.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test211.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1.); -md=setflowequation(md,'stokes','all'); +md=setflowequation(md,'FS','all'); md.diagnostic.reltol=NaN; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test211.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test211.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test211.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(3,1.) -md=setflowequation(md,'stokes','all') +md=setflowequation(md,'FS','all') md.diagnostic.reltol=NaN md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test212.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test212.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test212.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); %control parameters Index: /issm/trunk-jpl/test/NightlyRun/test212.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test212.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test212.py (revision 15565) @@ -12,5 +12,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') Index: /issm/trunk-jpl/test/NightlyRun/test213.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test213.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test213.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); %control parameters Index: /issm/trunk-jpl/test/NightlyRun/test213.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test213.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test213.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') Index: /issm/trunk-jpl/test/NightlyRun/test214.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test214.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test214.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); %control parameters Index: /issm/trunk-jpl/test/NightlyRun/test214.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test214.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test214.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(3,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') Index: /issm/trunk-jpl/test/NightlyRun/test215.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test215.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test215.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1.); -md=setflowequation(md,'stokes','all'); +md=setflowequation(md,'FS','all'); %control parameters Index: /issm/trunk-jpl/test/NightlyRun/test215.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test215.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test215.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(3,1.) -md=setflowequation(md,'stokes','all') +md=setflowequation(md,'FS','all') Index: /issm/trunk-jpl/test/NightlyRun/test216.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test216.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test216.m (revision 15565) @@ -3,5 +3,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf2.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test216.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test216.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test216.py (revision 15565) @@ -14,5 +14,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test217.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test217.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test217.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test217.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test217.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test217.py (revision 15565) @@ -13,5 +13,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test218.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test218.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test218.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf2.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test219.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test219.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test219.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,2.); -md=setflowequation(md,'pattyn','../Exp/SquareHalfRight.exp','fill','macayeal'); +md=setflowequation(md,'HO','../Exp/SquareHalfRight.exp','fill','SSA'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test219.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test219.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test219.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(3,2.) -md=setflowequation(md,'pattyn','../Exp/SquareHalfRight.exp','fill','macayeal') +md=setflowequation(md,'HO','../Exp/SquareHalfRight.exp','fill','SSA') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test220.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test220.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test220.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,2,1.); -md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','pattyn'); +md=setflowequation(md,'FS','../Exp/SquareHalfRight.exp','fill','HO'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test220.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test220.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test220.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(2,1.) -md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','pattyn') +md=setflowequation(md,'FS','../Exp/SquareHalfRight.exp','fill','HO') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test221.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test221.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test221.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,2,1.); -md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','macayeal'); +md=setflowequation(md,'FS','../Exp/SquareHalfRight.exp','fill','SSA'); md.cluster=generic('name',oshostname(),'np',3); md.diagnostic.viscosity_overshoot=0; Index: /issm/trunk-jpl/test/NightlyRun/test221.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test221.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test221.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(2,1.) -md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','macayeal') +md=setflowequation(md,'FS','../Exp/SquareHalfRight.exp','fill','SSA') md.cluster=generic('name',oshostname(),'np',3) md.diagnostic.viscosity_overshoot=0 Index: /issm/trunk-jpl/test/NightlyRun/test222.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test222.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test222.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.prognostic.hydrostatic_adjustment='Incremental'; Index: /issm/trunk-jpl/test/NightlyRun/test222.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test222.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test222.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md.prognostic.hydrostatic_adjustment='Incremental' Index: /issm/trunk-jpl/test/NightlyRun/test223.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test223.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test223.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.geometry.bed=md.geometry.bed+50.; md.geometry.surface=md.geometry.surface+50.; md.cluster=generic('name',oshostname(),'np',1); Index: /issm/trunk-jpl/test/NightlyRun/test223.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test223.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test223.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.geometry.bed=md.geometry.bed+50. md.geometry.surface=md.geometry.surface+50. Index: /issm/trunk-jpl/test/NightlyRun/test224.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test224.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test224.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md.prognostic.hydrostatic_adjustment='Incremental'; Index: /issm/trunk-jpl/test/NightlyRun/test224.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test224.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test224.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(3,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md.prognostic.hydrostatic_adjustment='Incremental' Index: /issm/trunk-jpl/test/NightlyRun/test225.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test225.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test225.m (revision 15565) @@ -4,5 +4,5 @@ md.geometry.bed=md.geometry.bed+50.; md.geometry.surface=md.geometry.surface+50.; md=extrude(md,3,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md.prognostic.hydrostatic_adjustment='Incremental'; Index: /issm/trunk-jpl/test/NightlyRun/test225.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test225.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test225.py (revision 15565) @@ -14,5 +14,5 @@ md.geometry.surface=md.geometry.surface+50. md.extrude(3,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md.prognostic.hydrostatic_adjustment='Incremental' Index: /issm/trunk-jpl/test/NightlyRun/test226.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test226.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test226.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.timestepping.time_adapt=1.; Index: /issm/trunk-jpl/test/NightlyRun/test226.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test226.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test226.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md.timestepping.time_adapt=1. Index: /issm/trunk-jpl/test/NightlyRun/test227.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test227.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test227.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md.timestepping.time_adapt=1.; Index: /issm/trunk-jpl/test/NightlyRun/test227.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test227.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test227.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(3,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md.timestepping.time_adapt=1. Index: /issm/trunk-jpl/test/NightlyRun/test228.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test228.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test228.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test228.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test228.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test228.py (revision 15565) @@ -12,5 +12,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test229.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test229.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test229.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test229.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test229.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test229.py (revision 15565) @@ -12,5 +12,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test230.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test230.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test230.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test230.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test230.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test230.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test231.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test231.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test231.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test231.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test231.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test231.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test232.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test232.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test232.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.thermal.spctemperature=[md.thermal.spctemperature, md.thermal.spctemperature+5., md.thermal.spctemperature+10., md.thermal.spctemperature+15.; 1.5 2.5 3.5 4.]; Index: /issm/trunk-jpl/test/NightlyRun/test232.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test232.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test232.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md.thermal.spctemperature=numpy.vstack((numpy.hstack((md.thermal.spctemperature, md.thermal.spctemperature+5., md.thermal.spctemperature+10., md.thermal.spctemperature+15.)), [1.5,2.5,3.5,4.])) Index: /issm/trunk-jpl/test/NightlyRun/test233.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test233.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test233.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelf.par'); md=extrude(md,3,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md.thermal.spctemperature=[md.thermal.spctemperature, md.thermal.spctemperature+5.; 1. 2.]; Index: /issm/trunk-jpl/test/NightlyRun/test233.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test233.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test233.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareShelf.py') md.extrude(3,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md.thermal.spctemperature=numpy.vstack((numpy.hstack((md.thermal.spctemperature, md.thermal.spctemperature+5.)), [1.,2.])) Index: /issm/trunk-jpl/test/NightlyRun/test234.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test234.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test234.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test235.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test235.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test235.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test236.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test236.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test236.m (revision 15565) @@ -46,5 +46,5 @@ % -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,TransientSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test236.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test236.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test236.py (revision 15565) @@ -57,5 +57,5 @@ # -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,TransientSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test237.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test237.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test237.m (revision 15565) @@ -48,5 +48,5 @@ % md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,TransientSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test237.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test237.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test237.py (revision 15565) @@ -59,5 +59,5 @@ # md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,TransientSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test270.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test270.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test270.m (revision 15565) @@ -6,5 +6,5 @@ md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1); md.materials.rheology_Z=0.5*ones(md.mesh.numberofvertices,1); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test270.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test270.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test270.py (revision 15565) @@ -18,5 +18,5 @@ md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1)) md.materials.rheology_Z=0.5*numpy.ones((md.mesh.numberofvertices,1)) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test272.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test272.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test272.m (revision 15565) @@ -6,5 +6,5 @@ md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1); md.materials.rheology_Z=0.5*ones(md.mesh.numberofvertices,1); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); %control parameters Index: /issm/trunk-jpl/test/NightlyRun/test272.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test272.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test272.py (revision 15565) @@ -18,5 +18,5 @@ md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1)) md.materials.rheology_Z=0.5*numpy.ones((md.mesh.numberofvertices,1)) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') #control parameters Index: /issm/trunk-jpl/test/NightlyRun/test274.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test274.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test274.m (revision 15565) @@ -7,5 +7,5 @@ md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1); md.materials.rheology_Z=0.5*ones(md.mesh.numberofvertices,1); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test274.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test274.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test274.py (revision 15565) @@ -20,5 +20,5 @@ md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements,1)) md.materials.rheology_Z=0.5*numpy.ones((md.mesh.numberofvertices,1)) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test280.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test280.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test280.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.flowequation.fe_ssa=1; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test280.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test280.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test280.py (revision 15565) @@ -12,5 +12,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.flowequation.fe_ssa=1 md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test3001.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3001.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3001.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',1); md.toolkits.DefaultAnalysis=issmsolver(); Index: /issm/trunk-jpl/test/NightlyRun/test3001.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3001.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3001.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',1) md.diagnostic.requested_outputs=StressTensorEnum() Index: /issm/trunk-jpl/test/NightlyRun/test3002.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3002.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3002.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,2.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',1); md.autodiff.isautodiff=true; Index: /issm/trunk-jpl/test/NightlyRun/test3002.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3002.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3002.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.py') md.extrude(3,2.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',1) md.autodiff.isautodiff=True Index: /issm/trunk-jpl/test/NightlyRun/test3003.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3003.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3003.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,2.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',1); md.diagnostic.requested_outputs=StressTensorEnum(); Index: /issm/trunk-jpl/test/NightlyRun/test3003.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3003.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3003.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.py') md.extrude(3,2.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',1) md.diagnostic.requested_outputs=StressTensorEnum() Index: /issm/trunk-jpl/test/NightlyRun/test3004.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3004.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3004.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,2.); -md=setflowequation(md,'stokes','all'); +md=setflowequation(md,'FS','all'); md.cluster=generic('name',oshostname(),'np',1); md.autodiff.isautodiff=true; Index: /issm/trunk-jpl/test/NightlyRun/test3004.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3004.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3004.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.py') md.extrude(3,2.) -md=setflowequation(md,'stokes','all') +md=setflowequation(md,'FS','all') md.cluster=generic('name',oshostname(),'np',1) md.toolkits.DefaultAnalysis=issmsolver() Index: /issm/trunk-jpl/test/NightlyRun/test3005.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3005.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3005.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',1); md.autodiff.isautodiff=true; Index: /issm/trunk-jpl/test/NightlyRun/test3005.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3005.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3005.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',1) md.toolkits.DefaultAnalysis=issmsolver() Index: /issm/trunk-jpl/test/NightlyRun/test3006.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3006.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3006.m (revision 15565) @@ -3,5 +3,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',1); md.prognostic.stabilization=3; Index: /issm/trunk-jpl/test/NightlyRun/test3006.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3006.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3006.py (revision 15565) @@ -13,5 +13,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',1) md.prognostic.stabilization=3 Index: /issm/trunk-jpl/test/NightlyRun/test3007.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3007.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3007.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md=extrude(md,5,3.); md.cluster=generic('name',oshostname(),'np',1); Index: /issm/trunk-jpl/test/NightlyRun/test3007.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3007.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3007.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.extrude(5,3.) md.cluster=generic('name',oshostname(),'np',1) Index: /issm/trunk-jpl/test/NightlyRun/test3008.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3008.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3008.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.timestepping.time_step=0; md.cluster=generic('name',oshostname(),'np',1); Index: /issm/trunk-jpl/test/NightlyRun/test3008.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3008.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3008.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.timestepping.time_step=0 md.cluster=generic('name',oshostname(),'np',1) Index: /issm/trunk-jpl/test/NightlyRun/test3009.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3009.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3009.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',1); md.transient.isdiagnostic=0; Index: /issm/trunk-jpl/test/NightlyRun/test3009.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3009.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3009.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareShelfConstrained.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',1) md.transient.isdiagnostic=False Index: /issm/trunk-jpl/test/NightlyRun/test301.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test301.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test301.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test301.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test301.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test301.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'','') md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test3010.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3010.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3010.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',1); md.transient.requested_outputs=IceVolumeEnum(); Index: /issm/trunk-jpl/test/NightlyRun/test3010.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3010.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3010.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',1) md.toolkits.DefaultAnalysis=issmsolver() Index: /issm/trunk-jpl/test/NightlyRun/test3015.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3015.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3015.m (revision 15565) @@ -6,5 +6,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',1); md.prognostic.requested_outputs=IceVolumeEnum(); Index: /issm/trunk-jpl/test/NightlyRun/test3015.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3015.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3015.py (revision 15565) @@ -20,5 +20,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md.prognostic.requested_outputs=IceVolumeEnum() Index: /issm/trunk-jpl/test/NightlyRun/test3019.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3019.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3019.m (revision 15565) @@ -3,5 +3,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',1); md.toolkits.DefaultAnalysis=issmsolver(); Index: /issm/trunk-jpl/test/NightlyRun/test3019.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3019.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3019.py (revision 15565) @@ -15,5 +15,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test302.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test302.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test302.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'hutter','all'); +md=setflowequation(md,'SIA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test302.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test302.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test302.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'','') md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'hutter','all') +md=setflowequation(md,'SIA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test3020.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3020.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3020.m (revision 15565) @@ -6,5 +6,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',1); md.transient.requested_outputs=[IceVolumeEnum();MaxVelEnum()]; Index: /issm/trunk-jpl/test/NightlyRun/test3020.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3020.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3020.py (revision 15565) @@ -20,5 +20,5 @@ md=setmask(md,'all','') md=parameterize(md,'../Par/SquareShelfConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',1) md.transient.requested_outputs=[IceVolumeEnum(),MaxVelEnum()] Index: /issm/trunk-jpl/test/NightlyRun/test3021.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3021.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test3021.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelfConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.diagnostic.requested_outputs=StressTensorEnum(); Index: /issm/trunk-jpl/test/NightlyRun/test303.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test303.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test303.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'hutter','../Exp/SquareHalfRight.exp','fill','macayeal'); +md=setflowequation(md,'SIA','../Exp/SquareHalfRight.exp','fill','SSA'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test303.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test303.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test303.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'','') md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'hutter','../Exp/SquareHalfRight.exp','fill','macayeal') +md=setflowequation(md,'SIA','../Exp/SquareHalfRight.exp','fill','SSA') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test304.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test304.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test304.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,2.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test304.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test304.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test304.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.py') md.extrude(3,2.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test305.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test305.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test305.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,5,2.); -md=setflowequation(md,'hutter','all'); +md=setflowequation(md,'SIA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test305.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test305.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test305.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.py') md.extrude(5,2.) -md=setflowequation(md,'hutter','all') +md=setflowequation(md,'SIA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test306.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test306.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test306.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,4,2.); -md=setflowequation(md,'hutter','../Exp/SquareHalfRight.exp','fill','macayeal'); +md=setflowequation(md,'SIA','../Exp/SquareHalfRight.exp','fill','SSA'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test306.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test306.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test306.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.py') md.extrude(4,2.) -md=setflowequation(md,'hutter','../Exp/SquareHalfRight.exp','fill','macayeal') +md=setflowequation(md,'SIA','../Exp/SquareHalfRight.exp','fill','SSA') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test307.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test307.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test307.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test307.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test307.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test307.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.py') md.extrude(3,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test308.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test308.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test308.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'stokes','all'); +md=setflowequation(md,'FS','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test308.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test308.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test308.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.py') md.extrude(3,1.) -md=setflowequation(md,'stokes','all') +md=setflowequation(md,'FS','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test309.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test309.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test309.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,PrognosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test309.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test309.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test309.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'','') md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,PrognosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test310.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test310.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test310.m (revision 15565) @@ -3,5 +3,5 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.prognostic.stabilization=3; md.prognostic.spcthickness=md.geometry.thickness; Index: /issm/trunk-jpl/test/NightlyRun/test310.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test310.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test310.py (revision 15565) @@ -13,5 +13,5 @@ md=setmask(md,'','') md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.prognostic.stabilization=3 md.prognostic.spcthickness=md.geometry.thickness Index: /issm/trunk-jpl/test/NightlyRun/test311.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test311.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test311.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md=extrude(md,5,0.5); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test311.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test311.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test311.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'','') md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.extrude(5,0.5) md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test312.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test312.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test312.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.timestepping.time_step=0.; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test312.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test312.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test312.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.timestepping.time_step=0. md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test313.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test313.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test313.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.verbose=verbose('convergence',true,'solution',true); Index: /issm/trunk-jpl/test/NightlyRun/test313.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test313.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test313.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md.verbose=verbose('convergence',True,'solution',True) Index: /issm/trunk-jpl/test/NightlyRun/test314.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test314.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test314.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'hutter','all'); +md=setflowequation(md,'SIA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,TransientSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test314.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test314.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test314.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'','') md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'hutter','all') +md=setflowequation(md,'SIA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,TransientSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test315.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test315.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test315.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,5,1.2); -md=setflowequation(md,'hutter','all'); +md=setflowequation(md,'SIA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,TransientSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test315.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test315.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test315.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.py') md.extrude(5,1.2) -md=setflowequation(md,'hutter','all') +md=setflowequation(md,'SIA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,TransientSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test316.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test316.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test316.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,TransientSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test316.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test316.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test316.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'','') md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,TransientSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test317.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test317.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test317.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,TransientSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test317.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test317.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test317.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.py') md.extrude(3,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,TransientSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test318.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test318.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test318.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,4,1.); -md=setflowequation(md,'hutter','all'); +md=setflowequation(md,'SIA','all'); md.cluster=generic('name',oshostname(),'np',3); md.timestepping.time_step=0; Index: /issm/trunk-jpl/test/NightlyRun/test318.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test318.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test318.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.py') md.extrude(4,1.) -md=setflowequation(md,'hutter','all') +md=setflowequation(md,'SIA','all') md.cluster=generic('name',oshostname(),'np',3) md.timestepping.time_step=0 Index: /issm/trunk-jpl/test/NightlyRun/test319.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test319.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test319.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); %control parameters Index: /issm/trunk-jpl/test/NightlyRun/test319.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test319.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test319.py (revision 15565) @@ -12,5 +12,5 @@ md=setmask(md,'','') md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') #control parameters Index: /issm/trunk-jpl/test/NightlyRun/test320.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test320.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test320.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); %control parameters Index: /issm/trunk-jpl/test/NightlyRun/test320.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test320.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test320.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') #control parameters Index: /issm/trunk-jpl/test/NightlyRun/test321.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test321.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test321.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); %control parameters Index: /issm/trunk-jpl/test/NightlyRun/test321.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test321.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test321.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.py') md.extrude(3,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') #control parameters Index: /issm/trunk-jpl/test/NightlyRun/test322.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test322.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test322.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'stokes','all'); +md=setflowequation(md,'FS','all'); %control parameters Index: /issm/trunk-jpl/test/NightlyRun/test322.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test322.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test322.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.py') md.extrude(3,1.) -md=setflowequation(md,'stokes','all') +md=setflowequation(md,'FS','all') #control parameters Index: /issm/trunk-jpl/test/NightlyRun/test323.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test323.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test323.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.timestepping.time_adapt=1; Index: /issm/trunk-jpl/test/NightlyRun/test323.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test323.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test323.py (revision 15565) @@ -12,5 +12,5 @@ md=setmask(md,'','') md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md.timestepping.time_adapt=1 Index: /issm/trunk-jpl/test/NightlyRun/test324.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test324.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test324.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,5,1.2); -md=setflowequation(md,'hutter','all'); +md=setflowequation(md,'SIA','all'); md.cluster=generic('name',oshostname(),'np',3); md.timestepping.time_adapt=1; Index: /issm/trunk-jpl/test/NightlyRun/test324.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test324.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test324.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.py') md.extrude(5,1.2) -md=setflowequation(md,'hutter','all') +md=setflowequation(md,'SIA','all') md.cluster=generic('name',oshostname(),'np',3) md.timestepping.time_adapt=1 Index: /issm/trunk-jpl/test/NightlyRun/test325.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test325.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test325.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.timestepping.time_step=0.; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test325.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test325.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test325.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.timestepping.time_step=0. md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test326.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test326.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test326.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/NightlyRun/test326.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test326.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test326.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md.initialization.waterfraction=numpy.zeros((md.mesh.numberofvertices,1)) Index: /issm/trunk-jpl/test/NightlyRun/test327.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test327.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test327.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/NightlyRun/test327.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test327.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test327.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.py') md.extrude(3,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md.initialization.waterfraction=numpy.zeros((md.mesh.numberofvertices,1)) Index: /issm/trunk-jpl/test/NightlyRun/test328.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test328.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test328.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.surfaceforcings.issmbgradients=1; md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y; Index: /issm/trunk-jpl/test/NightlyRun/test328.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test328.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test328.py (revision 15565) @@ -13,5 +13,5 @@ md=setmask(md,'','') md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.surfaceforcings.issmbgradients=1 md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y Index: /issm/trunk-jpl/test/NightlyRun/test329.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test329.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test329.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.surfaceforcings.issmbgradients=1; md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y; Index: /issm/trunk-jpl/test/NightlyRun/test329.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test329.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test329.py (revision 15565) @@ -14,5 +14,5 @@ md=parameterize(md,'../Par/SquareSheetConstrained.py') md.extrude(3,1) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.surfaceforcings.issmbgradients=1 md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y Index: /issm/trunk-jpl/test/NightlyRun/test331.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test331.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test331.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.initialization.watercolumn=10^-3*ones(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/NightlyRun/test331.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test331.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test331.py (revision 15565) @@ -13,5 +13,5 @@ md=setmask(md,'','') md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md.initialization.watercolumn=1e-3*numpy.ones((md.mesh.numberofvertices,1)) Index: /issm/trunk-jpl/test/NightlyRun/test332.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test332.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test332.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',1); md.hydrology=(hydrologydc); Index: /issm/trunk-jpl/test/NightlyRun/test333.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test333.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test333.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',1); md.hydrology=(hydrologydc); Index: /issm/trunk-jpl/test/NightlyRun/test401.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test401.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test401.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test401.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test401.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test401.py (revision 15565) @@ -12,5 +12,5 @@ md=setmask(md,'../Exp/SquareShelf.exp','') md=parameterize(md,'../Par/SquareSheetShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test402.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test402.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test402.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,4,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test402.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test402.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test402.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(4,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test403.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test403.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test403.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,5,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test403.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test403.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test403.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(5,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test404.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test404.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test404.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,1.); -md=setflowequation(md,'stokes','all'); +md=setflowequation(md,'FS','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test404.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test404.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test404.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(3,1.) -md=setflowequation(md,'stokes','all') +md=setflowequation(md,'FS','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test405.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test405.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test405.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,5,1.); -md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn','coupling','penalties'); +md=setflowequation(md,'SSA','../Exp/SquareHalfRight.exp','fill','HO','coupling','penalties'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test405.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test405.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test405.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(5,1.) -md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn','coupling','penalties') +md=setflowequation(md,'SSA','../Exp/SquareHalfRight.exp','fill','HO','coupling','penalties') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test406.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test406.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test406.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,4,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md.timestepping.time_step=0.; Index: /issm/trunk-jpl/test/NightlyRun/test406.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test406.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test406.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(4,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md.timestepping.time_step=0. Index: /issm/trunk-jpl/test/NightlyRun/test407.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test407.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test407.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,4,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md.transient.isdiagnostic=0; Index: /issm/trunk-jpl/test/NightlyRun/test407.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test407.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test407.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(4,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md.transient.isdiagnostic=False Index: /issm/trunk-jpl/test/NightlyRun/test408.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test408.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test408.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,TransientSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test408.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test408.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test408.py (revision 15565) @@ -12,5 +12,5 @@ md=setmask(md,'../Exp/SquareShelf.exp','') md=parameterize(md,'../Par/SquareSheetShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,TransientSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test409.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test409.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test409.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn','coupling','penalties'); +md=setflowequation(md,'SSA','../Exp/SquareHalfRight.exp','fill','HO','coupling','penalties'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,TransientSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test409.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test409.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test409.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn','coupling','penalties') +md=setflowequation(md,'SSA','../Exp/SquareHalfRight.exp','fill','HO','coupling','penalties') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,TransientSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test410.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test410.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test410.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,2.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.timestepping.time_step=0; Index: /issm/trunk-jpl/test/NightlyRun/test410.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test410.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test410.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(3,2.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md.timestepping.time_step=0 Index: /issm/trunk-jpl/test/NightlyRun/test411.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test411.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test411.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,2.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md.timestepping.time_step=0; Index: /issm/trunk-jpl/test/NightlyRun/test411.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test411.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test411.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(3,2.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md.timestepping.time_step=0 Index: /issm/trunk-jpl/test/NightlyRun/test412.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test412.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test412.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test413.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test413.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test413.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test414.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test414.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test414.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.materials.rho_ice=10^7; %involved in the mass flux, make it easy Index: /issm/trunk-jpl/test/NightlyRun/test415.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test415.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test415.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); %control parameters Index: /issm/trunk-jpl/test/NightlyRun/test415.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test415.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test415.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') #control parameters Index: /issm/trunk-jpl/test/NightlyRun/test416.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test416.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test416.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); %control parameters Index: /issm/trunk-jpl/test/NightlyRun/test416.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test416.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test416.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(3,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') #control parameters Index: /issm/trunk-jpl/test/NightlyRun/test417.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test417.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test417.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.materials.rho_ice=10^7; %involved in the mass flux, make it easy Index: /issm/trunk-jpl/test/NightlyRun/test418.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test418.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test418.m (revision 15565) @@ -3,5 +3,5 @@ md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test419.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test419.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test419.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,5,1.); -md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn'); +md=setflowequation(md,'SSA','../Exp/SquareHalfRight.exp','fill','HO'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test419.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test419.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test419.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(5,1.) -md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn') +md=setflowequation(md,'SSA','../Exp/SquareHalfRight.exp','fill','HO') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test420.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test420.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test420.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test421.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test421.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test421.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,5,1.); -md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','pattyn'); +md=setflowequation(md,'FS','../Exp/SquareHalfRight.exp','fill','HO'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test421.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test421.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test421.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(5,1.) -md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','pattyn') +md=setflowequation(md,'FS','../Exp/SquareHalfRight.exp','fill','HO') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test422.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test422.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test422.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,5,1.); -md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','macayeal'); +md=setflowequation(md,'FS','../Exp/SquareHalfRight.exp','fill','SSA'); md.cluster=generic('name',oshostname(),'np',3); md.diagnostic.reltol=0.4; Index: /issm/trunk-jpl/test/NightlyRun/test422.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test422.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test422.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(5,1.) -md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','macayeal') +md=setflowequation(md,'FS','../Exp/SquareHalfRight.exp','fill','SSA') md.cluster=generic('name',oshostname(),'np',3) md.diagnostic.reltol=0.4 Index: /issm/trunk-jpl/test/NightlyRun/test423.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test423.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test423.m (revision 15565) @@ -15,5 +15,5 @@ md=setmask(md,flags,''); md=parameterize(md,'../Par/RoundSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test423.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test423.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test423.py (revision 15565) @@ -26,5 +26,5 @@ md=setmask(md,flags,'') md=parameterize(md,'../Par/RoundSheetShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test424.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test424.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test424.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.initialization.vx(:)=0.; md.initialization.vy(:)=0.; Index: /issm/trunk-jpl/test/NightlyRun/test424.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test424.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test424.py (revision 15565) @@ -12,5 +12,5 @@ md=setmask(md,'../Exp/SquareShelf.exp','') md=parameterize(md,'../Par/SquareSheetShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.initialization.vx[:]=0. md.initialization.vy[:]=0. Index: /issm/trunk-jpl/test/NightlyRun/test425.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test425.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test425.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.initialization.vx(:)=0.; md.initialization.vy(:)=0.; Index: /issm/trunk-jpl/test/NightlyRun/test425.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test425.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test425.py (revision 15565) @@ -12,5 +12,5 @@ md=setmask(md,'../Exp/SquareShelf.exp','') md=parameterize(md,'../Par/SquareSheetShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.initialization.vx[:]=0. md.initialization.vy[:]=0. Index: /issm/trunk-jpl/test/NightlyRun/test426.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test426.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test426.m (revision 15565) @@ -10,5 +10,5 @@ md.surfaceforcings.mass_balance(:)=100.; md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.transient.isdiagnostic=0; md.transient.isgroundingline=1; Index: /issm/trunk-jpl/test/NightlyRun/test426.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test426.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test426.py (revision 15565) @@ -20,5 +20,5 @@ md.surfaceforcings.mass_balance[:]=100. md.extrude(3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.transient.isdiagnostic=False md.transient.isgroundingline=True Index: /issm/trunk-jpl/test/NightlyRun/test427.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test427.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test427.m (revision 15565) @@ -8,5 +8,5 @@ md.geometry.thickness(:)=1300; md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md=extrude(md,3,1.); Index: /issm/trunk-jpl/test/NightlyRun/test427.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test427.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test427.py (revision 15565) @@ -18,5 +18,5 @@ md.geometry.thickness[:]=1300 md.geometry.surface=md.geometry.bed+md.geometry.thickness -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.extrude(3,1.) Index: /issm/trunk-jpl/test/NightlyRun/test428.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test428.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test428.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'../Exp/SquareShelf.exp',''); md=parameterize(md,'../Par/SquareSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.diagnostic.isnewton=1; md.diagnostic.restol=0.0001; Index: /issm/trunk-jpl/test/NightlyRun/test428.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test428.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test428.py (revision 15565) @@ -12,5 +12,5 @@ md=setmask(md,'../Exp/SquareShelf.exp','') md=parameterize(md,'../Par/SquareSheetShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.diagnostic.isnewton=1 md.diagnostic.restol=0.0001 Index: /issm/trunk-jpl/test/NightlyRun/test429.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test429.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test429.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,5,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.diagnostic.isnewton=1; md.diagnostic.restol=0.0001; Index: /issm/trunk-jpl/test/NightlyRun/test429.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test429.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test429.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(5,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.diagnostic.isnewton=1 md.diagnostic.restol=0.0001 Index: /issm/trunk-jpl/test/NightlyRun/test430.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test430.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test430.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,1.); -md=setflowequation(md,'stokes','all'); +md=setflowequation(md,'FS','all'); md.diagnostic.isnewton=1; md.diagnostic.restol=0.0001; Index: /issm/trunk-jpl/test/NightlyRun/test430.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test430.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test430.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(3,1.) -md=setflowequation(md,'stokes','all') +md=setflowequation(md,'FS','all') md.diagnostic.isnewton=1 md.diagnostic.restol=0.0001 Index: /issm/trunk-jpl/test/NightlyRun/test431.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test431.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test431.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,2.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.timestepping.time_step=0.; Index: /issm/trunk-jpl/test/NightlyRun/test431.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test431.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test431.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(3,2.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md.timestepping.time_step=0. Index: /issm/trunk-jpl/test/NightlyRun/test432.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test432.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test432.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,3,2.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md.timestepping.time_step=0.; Index: /issm/trunk-jpl/test/NightlyRun/test432.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test432.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test432.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(3,2.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md.timestepping.time_step=0. Index: /issm/trunk-jpl/test/NightlyRun/test433.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test433.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test433.m (revision 15565) @@ -15,5 +15,5 @@ md=setmask(md,flags,''); md=parameterize(md,'../Par/RoundSheetShelf.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md=extrude(md,3,1); md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test433.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test433.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test433.py (revision 15565) @@ -26,5 +26,5 @@ md=setmask(md,flags,'') md=parameterize(md,'../Par/RoundSheetShelf.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.extrude(3,1.) md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test434.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test434.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test434.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=extrude(md,4,1.); -md=setflowequation(md,'l1l2','all'); +md=setflowequation(md,'L1L2','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test434.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test434.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test434.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/SquareSheetShelf.py') md.extrude(4,1.) -md=setflowequation(md,'l1l2','all') +md=setflowequation(md,'L1L2','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test501.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test501.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test501.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test501.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test501.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test501.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') md=parameterize(md,'../Par/Pig.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test502.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test502.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test502.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,0.9); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test502.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test502.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test502.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/Pig.py') md.extrude(3,0.9) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test503.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test503.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test503.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,0.9); -md=setflowequation(md,'stokes','all'); +md=setflowequation(md,'FS','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,DiagnosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test503.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test503.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test503.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/Pig.py') md.extrude(3,0.9) -md=setflowequation(md,'stokes','all') +md=setflowequation(md,'FS','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,DiagnosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test504.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test504.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test504.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,TransientSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test504.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test504.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test504.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') md=parameterize(md,'../Par/Pig.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,TransientSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test505.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test505.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test505.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,TransientSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test505.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test505.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test505.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/Pig.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,TransientSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test506.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test506.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test506.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/Pig.par'); md=extrude(md,2,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,TransientSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test506.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test506.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test506.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/Pig.py') md.extrude(2,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,TransientSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test507.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test507.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test507.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/Pig.par'); md=extrude(md,2,1.); -md=setflowequation(md,'stokes','all'); +md=setflowequation(md,'FS','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,TransientSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test507.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test507.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test507.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/Pig.py') md.extrude(2,1.) -md=setflowequation(md,'stokes','all') +md=setflowequation(md,'FS','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,TransientSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test508.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test508.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test508.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/Pig.par'); md=extrude(md,4,1.1); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md.timestepping.time_step=0.; Index: /issm/trunk-jpl/test/NightlyRun/test508.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test508.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test508.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/Pig.py') md.extrude(4,1.1) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md.timestepping.time_step=0. Index: /issm/trunk-jpl/test/NightlyRun/test509.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test509.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test509.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md.timestepping.time_step=0.; Index: /issm/trunk-jpl/test/NightlyRun/test509.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test509.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test509.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/Pig.py') md.extrude(3,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md.timestepping.time_step=0. Index: /issm/trunk-jpl/test/NightlyRun/test510.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test510.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test510.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/Pig.par'); md=extrude(md,2,1.); -md=setflowequation(md,'stokes','all'); +md=setflowequation(md,'FS','all'); md.cluster=generic('name',oshostname(),'np',3); md.timestepping.time_step=0.; Index: /issm/trunk-jpl/test/NightlyRun/test510.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test510.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test510.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/Pig.py') md.extrude(2,1.) -md=setflowequation(md,'stokes','all') +md=setflowequation(md,'FS','all') md.cluster=generic('name',oshostname(),'np',3) md.timestepping.time_step=0. Index: /issm/trunk-jpl/test/NightlyRun/test511.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test511.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test511.m (revision 15565) @@ -7,5 +7,5 @@ md.geometry.surface=md.geometry.bed+md.geometry.thickness; md=extrude(md,3,1.); -md=setflowequation(md,'stokes','all'); +md=setflowequation(md,'FS','all'); md=extract(md,md.mask.elementonfloatingice); Index: /issm/trunk-jpl/test/NightlyRun/test511.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test511.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test511.py (revision 15565) @@ -17,5 +17,5 @@ md.geometry.surface=md.geometry.bed+md.geometry.thickness md.extrude(3,1.) -md=setflowequation(md,'stokes','all') +md=setflowequation(md,'FS','all') md=md.extract(md.mask.elementonfloatingice) Index: /issm/trunk-jpl/test/NightlyRun/test512.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test512.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test512.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); %control parameters Index: /issm/trunk-jpl/test/NightlyRun/test512.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test512.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test512.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/Pig.py') md.extrude(3,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') # control parameters Index: /issm/trunk-jpl/test/NightlyRun/test513.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test513.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test513.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); %control parameters Index: /issm/trunk-jpl/test/NightlyRun/test513.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test513.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test513.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/Pig.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') # control parameters Index: /issm/trunk-jpl/test/NightlyRun/test515.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test515.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test515.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.thermal.stabilization=2; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test515.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test515.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test515.py (revision 15565) @@ -12,5 +12,5 @@ md=parameterize(md,'../Par/Pig.py') md.extrude(3,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.thermal.stabilization=2 md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test516.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test516.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test516.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,1.); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.thermal.stabilization=2; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test516.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test516.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test516.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/Pig.py') md.extrude(3,1.) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.thermal.stabilization=2 md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test601.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test601.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test601.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,PrognosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test601.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test601.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test601.py (revision 15565) @@ -11,5 +11,5 @@ md=setmask(md,'../Exp/79NorthShelf.exp','') md=parameterize(md,'../Par/79North.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,PrognosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test602.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test602.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test602.m (revision 15565) @@ -3,5 +3,5 @@ md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.prognostic.stabilization=3; md.prognostic.spcthickness=md.geometry.thickness; Index: /issm/trunk-jpl/test/NightlyRun/test602.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test602.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test602.py (revision 15565) @@ -14,5 +14,5 @@ md=setmask(md,'../Exp/79NorthShelf.exp','') md=parameterize(md,'../Par/79North.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.prognostic.stabilization=3 md.prognostic.spcthickness=md.geometry.thickness Index: /issm/trunk-jpl/test/NightlyRun/test603.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test603.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test603.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/79North.par'); md=extrude(md,6,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,PrognosticSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test603.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test603.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test603.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/79North.py') md.extrude(6,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,PrognosticSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test604.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test604.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test604.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,SurfaceSlopeSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test604.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test604.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test604.py (revision 15565) @@ -12,5 +12,5 @@ md=setmask(md,'../Exp/79NorthShelf.exp','') md=parameterize(md,'../Par/79North.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,SurfaceSlopeSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test605.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test605.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test605.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/79North.par'); md=extrude(md,5,1.5); -md=setflowequation(md,'pattyn','all'); +md=setflowequation(md,'HO','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,SurfaceSlopeSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test605.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test605.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test605.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/79North.py') md.extrude(5,1.5) -md=setflowequation(md,'pattyn','all') +md=setflowequation(md,'HO','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,SurfaceSlopeSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test606.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test606.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test606.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,BedSlopeSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test606.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test606.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test606.py (revision 15565) @@ -12,5 +12,5 @@ md=setmask(md,'../Exp/79NorthShelf.exp','') md=parameterize(md,'../Par/79North.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,BedSlopeSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test607.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test607.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test607.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/79North.par'); md=extrude(md,2,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,BedSlopeSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test607.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test607.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test607.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/79North.py') md.extrude(2,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,BedSlopeSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test608.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test608.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test608.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,BalancethicknessSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test608.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test608.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test608.py (revision 15565) @@ -12,5 +12,5 @@ md=setmask(md,'../Exp/79NorthShelf.exp','') md=parameterize(md,'../Par/79North.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,BalancethicknessSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test609.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test609.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test609.m (revision 15565) @@ -3,5 +3,5 @@ md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.balancethickness.stabilization=3; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test609.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test609.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test609.py (revision 15565) @@ -14,5 +14,5 @@ md=setmask(md,'../Exp/79NorthShelf.exp','') md=parameterize(md,'../Par/79North.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.balancethickness.stabilization=3 md.cluster=generic('name',oshostname(),'np',3) Index: /issm/trunk-jpl/test/NightlyRun/test610.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test610.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test610.m (revision 15565) @@ -3,5 +3,5 @@ md=parameterize(md,'../Par/79North.par'); md=extrude(md,3,1.); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',3); md=solve(md,BalancethicknessSolutionEnum()); Index: /issm/trunk-jpl/test/NightlyRun/test610.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test610.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test610.py (revision 15565) @@ -13,5 +13,5 @@ md=parameterize(md,'../Par/79North.py') md.extrude(3,1.) -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,BalancethicknessSolutionEnum()) Index: /issm/trunk-jpl/test/NightlyRun/test611.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test611.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test611.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); %control parameters Index: /issm/trunk-jpl/test/NightlyRun/test611.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test611.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test611.py (revision 15565) @@ -12,5 +12,5 @@ md=setmask(md,'../Exp/79NorthShelf.exp','') md=parameterize(md,'../Par/79North.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') #control parameters Index: /issm/trunk-jpl/test/NightlyRun/test612.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test612.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test612.m (revision 15565) @@ -3,5 +3,5 @@ md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); %control parameters Index: /issm/trunk-jpl/test/NightlyRun/test612.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test612.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test612.py (revision 15565) @@ -14,5 +14,5 @@ md=setmask(md,'../Exp/79NorthShelf.exp','') md=parameterize(md,'../Par/79North.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') #control parameters Index: /issm/trunk-jpl/test/NightlyRun/test613.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test613.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test613.m (revision 15565) @@ -3,5 +3,5 @@ md=setmask(md,'../Exp/79NorthShelf.exp',''); md=parameterize(md,'../Par/79North.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); %Ice sheet only Index: /issm/trunk-jpl/test/NightlyRun/test613.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test613.py (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/test613.py (revision 15565) @@ -15,5 +15,5 @@ md=setmask(md,'../Exp/79NorthShelf.exp','') md=parameterize(md,'../Par/79North.py') -md=setflowequation(md,'macayeal','all') +md=setflowequation(md,'SSA','all') #Ice sheet only Index: /issm/trunk-jpl/test/NightlyRun/tmp332.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/tmp332.m (revision 15564) +++ /issm/trunk-jpl/test/NightlyRun/tmp332.m (revision 15565) @@ -2,5 +2,5 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); +md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',2); md.hydrology=(hydrologydc);