Index: ../trunk-jpl/test/NightlyRun/test801.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test801.m (revision 17467) +++ ../trunk-jpl/test/NightlyRun/test801.m (revision 17468) @@ -1,26 +1,26 @@ -md=triangle(model(),'../Exp/Square.exp',50000) -md=setmask(md,'','') -md=parameterize(md,'../Par/ValleyGlacierShelf.py') -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',oshostname(),'np',3) +md=triangle(model(),'../Exp/Square.exp',50000); +md=setmask(md,'',''); +md=parameterize(md,'../Par/ValleyGlacierShelf.py'); +md=setflowequation(md,'SSA','all'); +md.cluster=generic('name',oshostname(),'np',3); -%Transient -md.transient.isstressbalance=1 -md.transient.islevelset=1 -md.transient.ismasstransport=1 -md.transient.isthermal=0 -md.transient.isgroundingline=1 -md.transient.isgia=0 +%Transient; +md.transient.isstressbalance=1; +md.transient.islevelset=1; +md.transient.ismasstransport=1; +md.transient.isthermal=0; +md.transient.isgroundingline=1; +md.transient.isgia=0; -md=solve(md,TransientSolutionEnum()) +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1',... 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2',... - 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3'} + 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3'}; field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,... 1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,... - 1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12} + 1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12}; field_values={... md.results.TransientSolution(1).Vx,... md.results.TransientSolution(1).Vy,... @@ -43,4 +43,4 @@ md.results.TransientSolution(3).Thickness,... md.results.TransientSolution(3).Surface,... md.results.TransientSolution(3).MaskIceLevelset,... - } + }; Index: ../trunk-jpl/test/NightlyRun/test802.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test802.m (revision 17467) +++ ../trunk-jpl/test/NightlyRun/test802.m (revision 17468) @@ -1,31 +1,31 @@ -md=triangle(model(),'../Exp/Square.exp',50000) -md=setmask(md,'','') -md=parameterize(md,'../Par/ValleyGlacierShelf.py') -md=extrude(md,3,2.) -md=setflowequation(md,'SSA','all') -md.cluster=generic('name',oshostname(),'np',3) +md=triangle(model(),'../Exp/Square.exp',50000); +md=setmask(md,'',''); +md=parameterize(md,'../Par/ValleyGlacierShelf.py'); +md=extrude(md,3,2.); +md=setflowequation(md,'SSA','all'); +md.cluster=generic('name',oshostname(),'np',3); %Thermal model -pos_surf=find(md.mesh.vertexonsurface) -md.thermal.spctemperature(pos_surf)=md.initialization.temperature(pos_surf) +pos_surf=find(md.mesh.vertexonsurface); +md.thermal.spctemperature(pos_surf)=md.initialization.temperature(pos_surf); %Transient -md.transient.isstressbalance=1 -md.transient.islevelset=1 -md.transient.ismasstransport=1 -md.transient.isthermal=1 -md.transient.isgroundingline=1 -md.transient.isgia=0 +md.transient.isstressbalance=1; +md.transient.islevelset=1; +md.transient.ismasstransport=1; +md.transient.isthermal=1; +md.transient.isgroundingline=1; +md.transient.isgia=0; -md=solve(md,TransientSolutionEnum()) +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1','Temperature1',... 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2','Temperature2',... - 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','Temperature3'} + 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','Temperature3'}; field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,... 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11} + 1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11}; field_values={... md.results.TransientSolution(1).Vx,... md.results.TransientSolution(1).Vy,... @@ -51,4 +51,4 @@ md.results.TransientSolution(3).Surface,... md.results.TransientSolution(3).MaskIceLevelset,... md.results.TransientSolution(3).Temperature,... - } + }; Index: ../trunk-jpl/test/NightlyRun/test803.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test803.m (revision 17467) +++ ../trunk-jpl/test/NightlyRun/test803.m (revision 17468) @@ -1,32 +1,32 @@ -md=triangle(model(),'../Exp/Square.exp',50000) -md=setmask(md,'','') -md=parameterize(md,'../Par/ValleyGlacierShelf.py') -md=extrude(md,3,2.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',oshostname(),'np',3) +md=triangle(model(),'../Exp/Square.exp',50000); +md=setmask(md,'',''); +md=parameterize(md,'../Par/ValleyGlacierShelf.py'); +md=extrude(md,3,2.); +md=setflowequation(md,'HO','all'); +md.cluster=generic('name',oshostname(),'np',3); %Thermal model -pos_surf=find(md.mesh.vertexonsurface) -md.thermal.spctemperature(pos_surf)=md.initialization.temperature(pos_surf) -md.thermal.isenthalpy=1 +pos_surf=find(md.mesh.vertexonsurface); +md.thermal.spctemperature(pos_surf)=md.initialization.temperature(pos_surf); +md.thermal.isenthalpy=1; %Transient -md.transient.isstressbalance=1 -md.transient.islevelset=1 -md.transient.ismasstransport=1 -md.transient.isthermal=1 -md.transient.isgroundingline=1 -md.transient.isgia=0 +md.transient.isstressbalance=1; +md.transient.islevelset=1; +md.transient.ismasstransport=1; +md.transient.isthermal=1; +md.transient.isgroundingline=1; +md.transient.isgia=0; -md=solve(md,TransientSolutionEnum()) +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1','Enthalpy1','Watercolumn1',... 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2','Enthalpy2','Watercolumn2',... - 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','Enthalpy3','Watercolumn3'} + 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','Enthalpy3','Watercolumn3'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10} + 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; field_values={... md.results.TransientSolution(1).Vx,... md.results.TransientSolution(1).Vy,... @@ -55,4 +55,4 @@ md.results.TransientSolution(3).MaskIceLevelset,... md.results.TransientSolution(3).Enthalpy,... md.results.TransientSolution(3).Watercolumn,... - } + }; Index: ../trunk-jpl/test/NightlyRun/test804.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test804.m (revision 17467) +++ ../trunk-jpl/test/NightlyRun/test804.m (revision 17468) @@ -1,28 +1,28 @@ -md=triangle(model(),'../Exp/Square.exp',50000) -md=setmask(md,'','') -md=parameterize(md,'../Par/ValleyGlacierShelf.py') -md=setflowequation(md,'SIA','all') -md.cluster=generic('name',oshostname(),'np',3) +md=triangle(model(),'../Exp/Square.exp',50000); +md=setmask(md,'',''); +md=parameterize(md,'../Par/ValleyGlacierShelf.py'); +md=setflowequation(md,'SIA','all'); +md.cluster=generic('name',oshostname(),'np',3); %Transient -md.transient.isstressbalance=1 -md.transient.islevelset=1 -md.transient.ismasstransport=1 -md.transient.isthermal=0 -md.transient.isgroundingline=1 -md.transient.isgia=0 +md.transient.isstressbalance=1; +md.transient.islevelset=1; +md.transient.ismasstransport=1; +md.transient.isthermal=0; +md.transient.isgroundingline=1; +md.transient.isgia=0; -md.masstransport.calvingrate=1000.*ones(md.mesh.numberofvertices,1) +md.masstransport.calvingrate=1000.*ones(md.mesh.numberofvertices,1); -md=solve(md,TransientSolutionEnum()) +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1',... 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2',... - 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3'} + 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3'}; 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}; field_values={... md.results.TransientSolution(1).Vx,... md.results.TransientSolution(1).Vy,... @@ -45,4 +45,4 @@ md.results.TransientSolution(3).Thickness,... md.results.TransientSolution(3).Surface,... md.results.TransientSolution(3).MaskIceLevelset,... - } + }; Index: ../trunk-jpl/test/NightlyRun/test805.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test805.m (revision 17467) +++ ../trunk-jpl/test/NightlyRun/test805.m (revision 17468) @@ -1,34 +1,34 @@ -md=triangle(model(),'../Exp/Square.exp',50000) -md=setmask(md,'','') -md=parameterize(md,'../Par/ValleyGlacierShelf.py') -md=extrude(md,3,2.) -md=setflowequation(md,'HO','all') -md.cluster=generic('name',oshostname(),'np',3) +md=triangle(model(),'../Exp/Square.exp',50000); +md=setmask(md,'',''); +md=parameterize(md,'../Par/ValleyGlacierShelf.py'); +md=extrude(md,3,2.); +md=setflowequation(md,'HO','all'); +md.cluster=generic('name',oshostname(),'np',3); %Thermal model -pos_surf=find(md.mesh.vertexonsurface) -md.thermal.spctemperature(pos_surf)=md.initialization.temperature(pos_surf) -md.thermal.isenthalpy=1 +pos_surf=find(md.mesh.vertexonsurface); +md.thermal.spctemperature(pos_surf)=md.initialization.temperature(pos_surf); +md.thermal.isenthalpy=1; %Transient -md.transient.isstressbalance=1 -md.transient.islevelset=1 -md.transient.ismasstransport=1 -md.transient.isthermal=1 -md.transient.isgroundingline=1 -md.transient.isgia=0 +md.transient.isstressbalance=1; +md.transient.islevelset=1; +md.transient.ismasstransport=1; +md.transient.isthermal=1; +md.transient.isgroundingline=1; +md.transient.isgia=0; -md.masstransport.calvingrate=1000.*ones(md.mesh.numberofvertices,1) +md.masstransport.calvingrate=1000.*ones(md.mesh.numberofvertices,1); -md=solve(md,TransientSolutionEnum()) +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx1','Vy1','Vel1','Pressure1','Thickness1','Surface1','MaskIceLevelset1','Enthalpy1','Watercolumn1',... 'Vx2','Vy2','Vel2','Pressure2','Thickness2','Surface2','MaskIceLevelset2','Enthalpy2','Watercolumn2',... - 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','Enthalpy3','Watercolumn3'} + 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','Enthalpy3','Watercolumn3'}; field_tolerances={1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,1e-11,... 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... - 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10} + 1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10}; field_values={... md.results.TransientSolution(1).Vx,... md.results.TransientSolution(1).Vy,... @@ -57,4 +57,4 @@ md.results.TransientSolution(3).MaskIceLevelset,... md.results.TransientSolution(3).Enthalpy,... md.results.TransientSolution(3).Watercolumn,... - } + };