Index: ../trunk-jpl/test/NightlyRun/test330.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test330.m (revision 14739) +++ ../trunk-jpl/test/NightlyRun/test330.m (revision 14740) @@ -1,13 +0,0 @@ -%GIA test, inspired on test101 -md=triangle(model(),'../Exp/Square.exp',50000.); -md=setmask(md,'',''); -md=parameterize(md,'../Par/SquareSheetConstrained.par'); -md=setflowequation(md,'macayeal','all'); -md.cluster=generic('name',oshostname(),'np',8); -md.verbose=verbose('1111111'); -md=solve(md,GiaSolutionEnum()); - -%Fields and tolerances to track changes -field_names ={'GiaW'}; -field_tolerances={1e-13}; -field_values ={(md.results.GiaSolution.GiaW)}; Index: ../trunk-jpl/test/NightlyRun/test330.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test330.py (revision 14739) +++ ../trunk-jpl/test/NightlyRun/test330.py (revision 14740) @@ -1,22 +0,0 @@ -import numpy -import copy -from model import * -from triangle import * -from setmask import * -from parameterize import * -from setflowequation import * -from EnumDefinitions import * -from solve import * -from MatlabFuncs import * - -md=triangle(model(),'../Exp/Square.exp',50000.) -md=setmask(md,'','') -md=parameterize(md,'../Par/SquareSheetConstrained.py') -md=setflowequation(md,'macayeal','all') -md.cluster=generic('name',oshostname(),'np',3) -md=solve(md,GiaSolutionEnum()) - -#Fields and tolerances to track changes -field_names =['GiaW'] -field_tolerances=[1e-13] -field_values =[md.results.GiaSolution.GiaW] Index: ../trunk-jpl/test/NightlyRun/test2001.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test2001.py (revision 0) +++ ../trunk-jpl/test/NightlyRun/test2001.py (revision 14740) @@ -0,0 +1,22 @@ +import numpy +import copy +from model import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from EnumDefinitions import * +from solve import * +from MatlabFuncs import * + +md=triangle(model(),'../Exp/Square.exp',50000.) +md=setmask(md,'','') +md=parameterize(md,'../Par/SquareSheetConstrained.py') +md=setflowequation(md,'macayeal','all') +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,GiaSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['GiaW'] +field_tolerances=[1e-13] +field_values =[md.results.GiaSolution.GiaW] Index: ../trunk-jpl/test/NightlyRun/test2001.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test2001.m (revision 0) +++ ../trunk-jpl/test/NightlyRun/test2001.m (revision 14740) @@ -0,0 +1,13 @@ +%GIA test, inspired on test101 +md=triangle(model(),'../Exp/Square.exp',50000.); +md=setmask(md,'',''); +md=parameterize(md,'../Par/SquareSheetConstrained.par'); +md=setflowequation(md,'macayeal','all'); +md.cluster=generic('name',oshostname(),'np',8); +md.verbose=verbose('1111111'); +md=solve(md,GiaSolutionEnum()); + +%Fields and tolerances to track changes +field_names ={'GiaW'}; +field_tolerances={1e-13}; +field_values ={(md.results.GiaSolution.GiaW)}; Index: ../trunk-jpl/test/NightlyRun/IdToName.m =================================================================== --- ../trunk-jpl/test/NightlyRun/IdToName.m (revision 14739) +++ ../trunk-jpl/test/NightlyRun/IdToName.m (revision 14740) @@ -96,7 +96,6 @@ case 327, name='SquareSheetConstrainedTransP3dEnth'; case 328, name='SquareSheetConstrainedSmbGradients2d'; case 329, name='SquareSheetConstrainedSmbGradients3d'; - case 330, name='SquareSheetConstrainedGia2d'; case 331, name='SquareSheetConstrainedHydrologyShreve'; case 332, name='SquareSheetConstrainedHydrologyDC'; case 401, name='SquareSheetShelfDiagM2d'; @@ -189,6 +188,7 @@ case 1502, name='SquareShelfTranSawTooth3d'; case 1601, name='SquareShelfM2dRotation'; case 1602, name='SquareSheetShelfP3dRotation'; + case 2001, name='SquareSheetConstrainedGia2d'; case 3001, name='SquareShelfConstrainedDiagM2dAdolc'; case 3002, name='SquareShelfConstrainedDiagM3dAdolc'; case 3003, name='SquareShelfConstrainedDiagP3dAdolc'; Index: ../trunk-jpl/test/NightlyRun/IdToName.py =================================================================== --- ../trunk-jpl/test/NightlyRun/IdToName.py (revision 14739) +++ ../trunk-jpl/test/NightlyRun/IdToName.py (revision 14740) @@ -97,7 +97,6 @@ 327 : 'SquareSheetConstrainedTransP3dEnth', 328 : 'SquareSheetConstrainedSmbGradients2d', 329 : 'SquareSheetConstrainedSmbGradients3d', - 330 : 'SquareSheetConstrainedGia2d', 331 : 'SquareSheetConstrainedHydrology', 333 : 'SquareSheetConstrainedTranCflM3d', 401 : 'SquareSheetShelfDiagM2d', @@ -190,6 +189,7 @@ 1502 : 'SquareShelfTranSawTooth3d', 1601 : 'SquareShelfM2dRotation', 1602 : 'SquareSheetShelfP3dRotation', + 2001 : 'SquareSheetConstrainedGia2d', 3001 : 'SquareShelfConstrainedDiagM2dAdolc', 3002 : 'SquareShelfConstrainedDiagM3dAdolc', 3003 : 'SquareShelfConstrainedDiagP3dAdolc',