Index: /issm/trunk-jpl/test/NightlyRun/test230.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test230.m (revision 13581) +++ /issm/trunk-jpl/test/NightlyRun/test230.m (revision 13582) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',350000); +md=triangle(model(),'../Exp/Square.exp',350000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); @@ -11,17 +11,17 @@ %Set up transient -smb = ones(md.mesh.numberofvertices,1)*3.6; -smb=[ smb smb*-1 ]; +smb=ones(md.mesh.numberofvertices,1)*3.6; +smb=[ smb smb*-1. ]; -md.surfaceforcings.mass_balance= smb; -md.surfaceforcings.mass_balance(end+1,:)=[1.5 3]; +md.surfaceforcings.mass_balance=smb; +md.surfaceforcings.mass_balance(end+1,:)=[1.5 3.]; md.transient.isthermal=0; -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ... 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3',... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', ... 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassbalance4'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... @@ -29,5 +29,4 @@ 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; - field_values={... (md.results.TransientSolution(1).Vx),... Index: /issm/trunk-jpl/test/NightlyRun/test230.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test230.py (revision 13582) +++ /issm/trunk-jpl/test/NightlyRun/test230.py (revision 13582) @@ -0,0 +1,77 @@ +import numpy +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',350000.) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelf.py') +md.extrude(3,1) +md=setflowequation(md,'macayeal','all') +md.cluster=generic('name',oshostname(),'np',3) + +md.timestepping.time_step=1. +md.settings.output_frequency=1 +md.timestepping.final_time=4. + +#Set up transient +smb=numpy.ones((md.mesh.numberofvertices,1))*3.6 +smb=numpy.hstack((smb,smb*-1.)) + +md.surfaceforcings.mass_balance=numpy.vstack((smb,[1.5,3.])) +md.transient.isthermal=0 + +md=solve(md,TransientSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', \ + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', \ + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', \ + 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassbalance4'] +field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] +field_values=[\ + md.results['TransientSolution'][1]['Vx'],\ + md.results['TransientSolution'][1]['Vy'],\ + md.results['TransientSolution'][1]['Vz'],\ + md.results['TransientSolution'][1]['Vel'],\ + md.results['TransientSolution'][1]['Pressure'],\ + md.results['TransientSolution'][1]['Bed'],\ + md.results['TransientSolution'][1]['Surface'],\ + md.results['TransientSolution'][1]['Thickness'],\ + md.results['TransientSolution'][1]['SurfaceforcingsMassBalance'],\ + md.results['TransientSolution'][2]['Vx'],\ + md.results['TransientSolution'][2]['Vy'],\ + md.results['TransientSolution'][2]['Vz'],\ + md.results['TransientSolution'][2]['Vel'],\ + md.results['TransientSolution'][2]['Pressure'],\ + md.results['TransientSolution'][2]['Bed'],\ + md.results['TransientSolution'][2]['Surface'],\ + md.results['TransientSolution'][2]['Thickness'],\ + md.results['TransientSolution'][2]['SurfaceforcingsMassBalance'],\ + md.results['TransientSolution'][3]['Vx'],\ + md.results['TransientSolution'][3]['Vy'],\ + md.results['TransientSolution'][3]['Vz'],\ + md.results['TransientSolution'][3]['Vel'],\ + md.results['TransientSolution'][3]['Pressure'],\ + md.results['TransientSolution'][3]['Bed'],\ + md.results['TransientSolution'][3]['Surface'],\ + md.results['TransientSolution'][3]['Thickness'],\ + md.results['TransientSolution'][3]['SurfaceforcingsMassBalance'],\ + md.results['TransientSolution'][4]['Vx'],\ + md.results['TransientSolution'][4]['Vy'],\ + md.results['TransientSolution'][4]['Vz'],\ + md.results['TransientSolution'][4]['Vel'],\ + md.results['TransientSolution'][4]['Pressure'],\ + md.results['TransientSolution'][4]['Bed'],\ + md.results['TransientSolution'][4]['Surface'],\ + md.results['TransientSolution'][4]['Thickness'],\ + md.results['TransientSolution'][4]['SurfaceforcingsMassBalance'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test231.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test231.m (revision 13581) +++ /issm/trunk-jpl/test/NightlyRun/test231.m (revision 13582) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',350000); +md=triangle(model(),'../Exp/Square.exp',350000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); @@ -11,17 +11,17 @@ %Set up transient -smb = ones(md.mesh.numberofvertices,1)*3.6; -smb=[ smb smb*2 ]; +smb=ones(md.mesh.numberofvertices,1)*3.6; +smb=[ smb smb*2. ]; -md.surfaceforcings.mass_balance= smb; -md.surfaceforcings.mass_balance(end+1,:)=[1.5 3]; +md.surfaceforcings.mass_balance=smb; +md.surfaceforcings.mass_balance(end+1,:)=[1.5 3.]; md.transient.isthermal=0; -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ... 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3',... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', ... 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassbalance4'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... @@ -29,5 +29,4 @@ 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; - field_values={... (md.results.TransientSolution(1).Vx),... Index: /issm/trunk-jpl/test/NightlyRun/test231.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test231.py (revision 13582) +++ /issm/trunk-jpl/test/NightlyRun/test231.py (revision 13582) @@ -0,0 +1,77 @@ +import numpy +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',350000.) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelf.py') +md.extrude(3,1) +md=setflowequation(md,'macayeal','all') +md.cluster=generic('name',oshostname(),'np',3) + +md.timestepping.time_step=1. +md.settings.output_frequency=1 +md.timestepping.final_time=4. + +#Set up transient +smb=numpy.ones((md.mesh.numberofvertices,1))*3.6 +smb=numpy.hstack((smb,smb*2.)) + +md.surfaceforcings.mass_balance=numpy.vstack((smb,[1.5,3.])) +md.transient.isthermal=0 + +md=solve(md,TransientSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', \ + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SurfaceforcingsMassBalance2', \ + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SurfaceforcingsMassBalance3', \ + 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','SurfaceMassbalance4'] +field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\ + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] +field_values=[\ + md.results['TransientSolution'][1]['Vx'],\ + md.results['TransientSolution'][1]['Vy'],\ + md.results['TransientSolution'][1]['Vz'],\ + md.results['TransientSolution'][1]['Vel'],\ + md.results['TransientSolution'][1]['Pressure'],\ + md.results['TransientSolution'][1]['Bed'],\ + md.results['TransientSolution'][1]['Surface'],\ + md.results['TransientSolution'][1]['Thickness'],\ + md.results['TransientSolution'][1]['SurfaceforcingsMassBalance'],\ + md.results['TransientSolution'][2]['Vx'],\ + md.results['TransientSolution'][2]['Vy'],\ + md.results['TransientSolution'][2]['Vz'],\ + md.results['TransientSolution'][2]['Vel'],\ + md.results['TransientSolution'][2]['Pressure'],\ + md.results['TransientSolution'][2]['Bed'],\ + md.results['TransientSolution'][2]['Surface'],\ + md.results['TransientSolution'][2]['Thickness'],\ + md.results['TransientSolution'][2]['SurfaceforcingsMassBalance'],\ + md.results['TransientSolution'][3]['Vx'],\ + md.results['TransientSolution'][3]['Vy'],\ + md.results['TransientSolution'][3]['Vz'],\ + md.results['TransientSolution'][3]['Vel'],\ + md.results['TransientSolution'][3]['Pressure'],\ + md.results['TransientSolution'][3]['Bed'],\ + md.results['TransientSolution'][3]['Surface'],\ + md.results['TransientSolution'][3]['Thickness'],\ + md.results['TransientSolution'][3]['SurfaceforcingsMassBalance'],\ + md.results['TransientSolution'][4]['Vx'],\ + md.results['TransientSolution'][4]['Vy'],\ + md.results['TransientSolution'][4]['Vz'],\ + md.results['TransientSolution'][4]['Vel'],\ + md.results['TransientSolution'][4]['Pressure'],\ + md.results['TransientSolution'][4]['Bed'],\ + md.results['TransientSolution'][4]['Surface'],\ + md.results['TransientSolution'][4]['Thickness'],\ + md.results['TransientSolution'][4]['SurfaceforcingsMassBalance'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test232.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test232.m (revision 13581) +++ /issm/trunk-jpl/test/NightlyRun/test232.m (revision 13582) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model(),'../Exp/Square.exp',180000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); @@ -5,5 +5,5 @@ md=setflowequation(md,'macayeal','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]; +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.]; md.timestepping.time_step=1; md.timestepping.final_time=4; @@ -12,5 +12,5 @@ md.transient.isthermal=1; md.transient.isgroundingline=0; -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes Index: /issm/trunk-jpl/test/NightlyRun/test232.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test232.py (revision 13582) +++ /issm/trunk-jpl/test/NightlyRun/test232.py (revision 13582) @@ -0,0 +1,38 @@ +import numpy +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',180000.) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelf.py') +md.extrude(3,1) +md=setflowequation(md,'macayeal','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.])) +md.timestepping.time_step=1. +md.timestepping.final_time=4. +md.transient.isdiagnostic=0 +md.transient.isprognostic=0 +md.transient.isthermal=1 +md.transient.isgroundingline=0 +md=solve(md,TransientSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Temperature1','BasalforcingsMeltingRate1','Temperature2','BasalforcingsMeltingRate2','Temperature3','BasalforcingsMeltingRate3','Temperature4','BasalforcingsMeltingRate4'] +field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] +field_values=[\ + md.results['TransientSolution'][1]['Temperature'],\ + md.results['TransientSolution'][1]['BasalforcingsMeltingRate'],\ + md.results['TransientSolution'][2]['Temperature'],\ + md.results['TransientSolution'][2]['BasalforcingsMeltingRate'],\ + md.results['TransientSolution'][3]['Temperature'],\ + md.results['TransientSolution'][3]['BasalforcingsMeltingRate'],\ + md.results['TransientSolution'][4]['Temperature'],\ + md.results['TransientSolution'][4]['BasalforcingsMeltingRate'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test233.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test233.m (revision 13581) +++ /issm/trunk-jpl/test/NightlyRun/test233.m (revision 13582) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',200000); +md=triangle(model(),'../Exp/Square.exp',200000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); @@ -5,18 +5,18 @@ md=setflowequation(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); -md.thermal.spctemperature=[md.thermal.spctemperature, md.thermal.spctemperature+5; 1 2]; +md.thermal.spctemperature=[md.thermal.spctemperature, md.thermal.spctemperature+5.; 1. 2.]; md.timestepping.time_step=0.5; -md.timestepping.final_time=2; -md=solve(md,TransientSolutionEnum); +md.timestepping.final_time=2.; +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3', ... - 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','Temperature4','BasalforcingsMeltingRate4'}; + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3', ... + 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','Temperature4','BasalforcingsMeltingRate4'}; field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09, ... - 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-07, ... - 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06, ... - 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06}; + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-07, ... + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06, ... + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06}; field_values={... (md.results.TransientSolution(1).Vx),... Index: /issm/trunk-jpl/test/NightlyRun/test233.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test233.py (revision 13582) +++ /issm/trunk-jpl/test/NightlyRun/test233.py (revision 13582) @@ -0,0 +1,72 @@ +import numpy +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',200000.) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelf.py') +md.extrude(3,1) +md=setflowequation(md,'pattyn','all') +md.cluster=generic('name',oshostname(),'np',3) +md.thermal.spctemperature=numpy.vstack((numpy.hstack((md.thermal.spctemperature, md.thermal.spctemperature+5.)), [1.,2.])) +md.timestepping.time_step=0.5 +md.timestepping.final_time=2. +md=solve(md,TransientSolutionEnum()) + +#Fields and tolerances to track changes +field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \ + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \ + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3', \ + 'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','Temperature4','BasalforcingsMeltingRate4'] +field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09, \ + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-07, \ + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06, \ + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06] +field_values=[\ + md.results['TransientSolution'][1]['Vx'],\ + md.results['TransientSolution'][1]['Vy'],\ + md.results['TransientSolution'][1]['Vz'],\ + md.results['TransientSolution'][1]['Vel'],\ + md.results['TransientSolution'][1]['Pressure'],\ + md.results['TransientSolution'][1]['Bed'],\ + md.results['TransientSolution'][1]['Surface'],\ + md.results['TransientSolution'][1]['Thickness'],\ + md.results['TransientSolution'][1]['Temperature'],\ + md.results['TransientSolution'][1]['BasalforcingsMeltingRate'],\ + md.results['TransientSolution'][2]['Vx'],\ + md.results['TransientSolution'][2]['Vy'],\ + md.results['TransientSolution'][2]['Vz'],\ + md.results['TransientSolution'][2]['Vel'],\ + md.results['TransientSolution'][2]['Pressure'],\ + md.results['TransientSolution'][2]['Bed'],\ + md.results['TransientSolution'][2]['Surface'],\ + md.results['TransientSolution'][2]['Thickness'],\ + md.results['TransientSolution'][2]['Temperature'],\ + md.results['TransientSolution'][2]['BasalforcingsMeltingRate'],\ + md.results['TransientSolution'][3]['Vx'],\ + md.results['TransientSolution'][3]['Vy'],\ + md.results['TransientSolution'][3]['Vz'],\ + md.results['TransientSolution'][3]['Vel'],\ + md.results['TransientSolution'][3]['Pressure'],\ + md.results['TransientSolution'][3]['Bed'],\ + md.results['TransientSolution'][3]['Surface'],\ + md.results['TransientSolution'][3]['Thickness'],\ + md.results['TransientSolution'][3]['Temperature'],\ + md.results['TransientSolution'][3]['BasalforcingsMeltingRate'],\ + md.results['TransientSolution'][4]['Vx'],\ + md.results['TransientSolution'][4]['Vy'],\ + md.results['TransientSolution'][4]['Vz'],\ + md.results['TransientSolution'][4]['Vel'],\ + md.results['TransientSolution'][4]['Pressure'],\ + md.results['TransientSolution'][4]['Bed'],\ + md.results['TransientSolution'][4]['Surface'],\ + md.results['TransientSolution'][4]['Thickness'],\ + md.results['TransientSolution'][4]['Temperature'],\ + md.results['TransientSolution'][4]['BasalforcingsMeltingRate'],\ + ] Index: /issm/trunk-jpl/test/NightlyRun/test234.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test234.m (revision 13581) +++ /issm/trunk-jpl/test/NightlyRun/test234.m (revision 13582) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model(),'../Exp/Square.exp',180000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); @@ -55,5 +55,5 @@ %solve -md=solve(md,TransientSolutionEnum,'overwrite','y'); +md=solve(md,TransientSolutionEnum(),'overwrite','y'); md.qmu.results=md.results.dakota; Index: /issm/trunk-jpl/test/NightlyRun/test235.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test235.m (revision 13581) +++ /issm/trunk-jpl/test/NightlyRun/test235.m (revision 13582) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',180000); +md=triangle(model(),'../Exp/Square.exp',180000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareShelf.par'); @@ -55,5 +55,5 @@ %solve -md=solve(md,TransientSolutionEnum,'overwrite','y'); +md=solve(md,TransientSolutionEnum(),'overwrite','y'); md.qmu.results=md.results.dakota; Index: /issm/trunk-jpl/test/NightlyRun/test236.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test236.m (revision 13581) +++ /issm/trunk-jpl/test/NightlyRun/test236.m (revision 13582) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',150000); +md=triangle(model(),'../Exp/Square.exp',150000); md=setmask(md,'all',''); @@ -19,8 +19,8 @@ % Same temperature over the all region : imonth=0:11; -tmonth(1:12)=238.15+20; +tmonth(1:12)=238.15+20.; for imonth=0:11 md.surfaceforcings.temperatures_presentday(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1); - md.surfaceforcings.temperatures_lgm(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1)-20; + md.surfaceforcings.temperatures_lgm(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1)-20.; % Time for the last line: md.surfaceforcings.temperatures_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12); @@ -44,17 +44,16 @@ % time steps and resolution md.timestepping.time_step=20; -md.timestepping.final_time= 60; +md.timestepping.final_time=60; % md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,TransientSolutionEnum); - +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... - 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... (md.results.TransientSolution(1).Vx),... Index: /issm/trunk-jpl/test/NightlyRun/test237.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test237.m (revision 13581) +++ /issm/trunk-jpl/test/NightlyRun/test237.m (revision 13582) @@ -1,3 +1,3 @@ -md=triangle(model,'../Exp/Square.exp',600000);%180000 +md=triangle(model(),'../Exp/Square.exp',600000);%180000 md=setmask(md,'all',''); @@ -19,8 +19,8 @@ % Same temperature over the all region : imonth=0:11; -tmonth(1:12)=238.15+20; +tmonth(1:12)=238.15+20.; for imonth=0:11 md.surfaceforcings.temperatures_presentday(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1); - md.surfaceforcings.temperatures_lgm(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1)-20; + md.surfaceforcings.temperatures_lgm(1:md.mesh.numberofvertices,imonth+1)=tmonth(imonth+1)-20.; % Time for the last line: md.surfaceforcings.temperatures_presentday(md.mesh.numberofvertices+1,imonth+1)=((imonth+1)/12); @@ -45,5 +45,5 @@ md.timestepping.time_step=20; md.settings.output_frequency=1; -md.timestepping.final_time= 60; +md.timestepping.final_time=60; % @@ -51,15 +51,14 @@ md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'}; field_tolerances={... 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,... 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,... 1e-13,1e-13,1e-08,1e-13,1e-13,1e-10,1e-10,1e-10,1e-13,1e-8}; - field_values={... (md.results.TransientSolution(1).Vx),...