Index: ../trunk-jpl/test/NightlyRun/test401.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test401.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test401.m (revision 13663) @@ -3,7 +3,7 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vel','Pressure'}; Index: ../trunk-jpl/test/NightlyRun/test605.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test605.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test605.m (revision 13663) @@ -4,7 +4,7 @@ md=extrude(md,5,1.5); md=setflowequation(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,SurfaceSlopeSolutionEnum); +md=solve(md,SurfaceSlopeSolutionEnum()); %Fields and tolerances to track changes field_names ={'SurfaceSlopeX','SurfaceSlopeY'}; Index: ../trunk-jpl/test/NightlyRun/test507.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test507.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test507.m (revision 13663) @@ -1,10 +1,10 @@ -md=triangle(model,'../Exp/Pig.exp',30000); +md=triangle(model,'../Exp/Pig.exp',30000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,2,1); +md=extrude(md,2,1.); md=setflowequation(md,'stokes','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', ... Index: ../trunk-jpl/test/NightlyRun/test426.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test426.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test426.m (revision 13663) @@ -17,7 +17,7 @@ md.groundingline.migration='AgressiveMigration'; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names ={'Bed1','Surface1','Thickness1','Floatingice1',... Index: ../trunk-jpl/test/NightlyRun/test328.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test328.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test328.m (revision 13663) @@ -21,7 +21,7 @@ end md.surfaceforcings.smbref=smbref'; 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','Bed1','Surface1','Thickness1','SMB1','TotalSmb1','Vx2','Vy2','Vel2','Bed2','Surface2','Thickness2','SMB2','TotalSmb2','Vx3','Vy3','Vel3','Bed3','Surface3','Thickness3','SMB3','TotalSmb3'}; Index: ../trunk-jpl/test/NightlyRun/test409.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test409.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test409.m (revision 13663) @@ -4,7 +4,7 @@ md=extrude(md,3,1); md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn','coupling','penalties'); 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', ... Index: ../trunk-jpl/test/NightlyRun/test3001.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test3001.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test3001.m (revision 13663) @@ -3,10 +3,10 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md.diagnostic.requested_outputs=StressTensorEnum; +md.diagnostic.requested_outputs=StressTensorEnum(); md.autodiff.isautodiff=true; md.verbose=verbose('autodiff',true); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vel','Pressure',... Index: ../trunk-jpl/test/NightlyRun/test1202.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1202.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1202.m (revision 13663) @@ -2,7 +2,7 @@ printingflag=false; %tests 3 and 4: using Glen's flow law -md=model; +md=model(); md=triangle(md,'../Exp/SquareEISMINT.exp',3550); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareEISMINT.par'); @@ -10,7 +10,7 @@ %Compute solution for MacAyeal's model md.cluster=generic('name',oshostname(),'np',8); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %plot results vx=(md.results.DiagnosticSolution.Vx); Index: ../trunk-jpl/test/NightlyRun/test1104.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1104.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1104.m (revision 13663) @@ -8,7 +8,7 @@ L=L_list{i}; nx=20; %numberof nodes in x direction ny=20; - md=model; + md=model(); md=squaremesh(md,L,L,nx,ny); md=setmask(md,'',''); %ice sheet test md=parameterize(md,'../Par/ISMIPB.par'); @@ -36,13 +36,13 @@ %Compute the diagnostic md.diagnostic.abstol=NaN; md.cluster=generic('name',oshostname(),'np',8); - md=solve(md,DiagnosticSolutionEnum); + md=solve(md,DiagnosticSolutionEnum()); pos=find(md.mesh.x==0 | md.mesh.y==0 | md.mesh.x==max(md.mesh.x) | md.mesh.y==max(md.mesh.y)); md.diagnostic.spcvx(pos)=md.results.DiagnosticSolution.Vx(pos); md.diagnostic.spcvy(pos)=md.results.DiagnosticSolution.Vy(pos); md.diagnostic.vertex_pairing=[]; md=setflowequation(md,'stokes','all'); - md=solve(md,DiagnosticSolutionEnum); + md=solve(md,DiagnosticSolutionEnum()); %Plot the results and save them vx=(md.results.DiagnosticSolution.Vx); Index: ../trunk-jpl/test/NightlyRun/test1602.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1602.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1602.m (revision 13663) @@ -9,7 +9,7 @@ md.initialization.vel(:)=0; md.cluster=generic('name',oshostname,'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); vel0=md.results.DiagnosticSolution.Vel; theta=30*pi/180; @@ -20,7 +20,7 @@ md.diagnostic.referential(:,1:3)=repmat([cos(theta),sin(theta),0],md.mesh.numberofvertices,1); md.diagnostic.referential(:,4:6)=repmat([0,0,1],md.mesh.numberofvertices,1); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); vel1=md.results.DiagnosticSolution.Vel; plotmodel(md,'data',vel0,'data',vel1,'data',vel1-vel0,'title','Cartesian CS','title','Rotated CS','title','difference','view#all',2) Index: ../trunk-jpl/test/NightlyRun/test3009.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test3009.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test3009.m (revision 13663) @@ -10,7 +10,7 @@ md.transient.isgroundingline=0; md.autodiff.isautodiff=true; md.verbose=verbose('autodiff',true); -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names ={'Temperature','BasalforcingsMeltingRate'}; Index: ../trunk-jpl/test/NightlyRun/test410.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test410.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test410.m (revision 13663) @@ -5,7 +5,7 @@ md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); md.timestepping.time_step=0; -md=solve(md,SteadystateSolutionEnum); +md=solve(md,SteadystateSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; Index: ../trunk-jpl/test/NightlyRun/test508.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test508.py (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test508.py (revision 13663) @@ -7,13 +7,13 @@ from solve import * from MatlabFuncs import * -md=triangle(model(),'../Exp/Pig.exp',30000) +md=triangle(model(),'../Exp/Pig.exp',30000.) md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') md=parameterize(md,'../Par/Pig.py') md.extrude(4,1.1) md=setflowequation(md,'macayeal','all') md.cluster=generic('name',oshostname(),'np',3) -md.timestepping.time_step=0 +md.timestepping.time_step=0. md=solve(md,SteadystateSolutionEnum()) # Fields and tolerances to track changes Index: ../trunk-jpl/test/NightlyRun/test516.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test516.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test516.m (revision 13663) @@ -1,13 +1,13 @@ -md=triangle(model,'../Exp/Pig.exp',30000); +md=triangle(model,'../Exp/Pig.exp',30000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,1); +md=extrude(md,3,1.); md=setflowequation(md,'pattyn','all'); md.thermal.stabilization=2; md.cluster=generic('name',oshostname(),'np',3); md.timestepping.time_step=0; md.thermal.penalty_threshold=40; -md=solve(md,ThermalSolutionEnum); +md=solve(md,ThermalSolutionEnum()); %Fields and tolerances to track changes field_names ={'Temperature','BasalforcingsMeltingRate'}; Index: ../trunk-jpl/test/NightlyRun/test3010.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test3010.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test3010.m (revision 13663) @@ -7,7 +7,7 @@ md.autodiff.isautodiff=true; md.verbose=verbose('autodiff',true); -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Volume1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Volume2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Volume3'}; Index: ../trunk-jpl/test/NightlyRun/test503.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test503.py (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test503.py (revision 13663) @@ -7,7 +7,7 @@ from solve import * from MatlabFuncs import * -md=triangle(model(),'../Exp/Pig.exp',20000) +md=triangle(model(),'../Exp/Pig.exp',20000.) md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') md=parameterize(md,'../Par/Pig.py') md.extrude(3,0.9) Index: ../trunk-jpl/test/NightlyRun/test402.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test402.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test402.m (revision 13663) @@ -4,7 +4,7 @@ md=extrude(md,4,1); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure'}; Index: ../trunk-jpl/test/NightlyRun/test606.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test606.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test606.m (revision 13663) @@ -3,7 +3,7 @@ md=parameterize(md,'../Par/79North.par'); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,BedSlopeSolutionEnum); +md=solve(md,BedSlopeSolutionEnum()); %Fields and tolerances to track changes field_names ={'BedSlopeX','BedSlopeY'}; Index: ../trunk-jpl/test/NightlyRun/test508.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test508.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test508.m (revision 13663) @@ -1,11 +1,11 @@ -md=triangle(model,'../Exp/Pig.exp',30000); +md=triangle(model,'../Exp/Pig.exp',30000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,4,1.1); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md.timestepping.time_step=0; -md=solve(md,SteadystateSolutionEnum); +md.timestepping.time_step=0.; +md=solve(md,SteadystateSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; Index: ../trunk-jpl/test/NightlyRun/test427.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test427.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test427.m (revision 13663) @@ -16,7 +16,7 @@ md.transient.isgroundingline=1; md.groundingline.migration='SoftMigration'; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names ={'Bed1','Surface1','Thickness1','Floatingice1',... Index: ../trunk-jpl/test/NightlyRun/test329.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test329.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test329.m (revision 13663) @@ -22,7 +22,7 @@ md.surfaceforcings.smbref=smbref'; md.transient.requested_outputs=TotalSmbEnum(); 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','Bed1','Surface1','Thickness1','Temperature1','SMB1','TotalSmb1','Vx2','Vy2','Vz2','Vel2','Bed2','Surface2','Thickness2','Temperature2','SMB2','TotalSmb1','Vx3','Vy3','Vz3','Vel3','Bed3','Surface3','Thickness3','Temperature3','SMB3','TotalSmb1'}; Index: ../trunk-jpl/test/NightlyRun/test1301.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1301.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1301.m (revision 13663) @@ -4,7 +4,7 @@ % surface with an imposed slope (Geothermal flux). if it is not the case, something is thermal modeling has been changed... printingflag=false; -md=model; +md=model(); md=triangle(md,'../Exp/Square.exp',100000); md=setmask(md,'',''); md=parameterize(md,'../Par/SquareThermal.par'); @@ -25,7 +25,7 @@ %modeled results md.cluster=generic('name',oshostname(),'np',2); -md=solve(md,ThermalSolutionEnum); +md=solve(md,ThermalSolutionEnum()); %plot results comp_melting=md.results.ThermalSolution.BasalforcingsMeltingRate; Index: ../trunk-jpl/test/NightlyRun/test3002.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test3002.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test3002.m (revision 13663) @@ -6,7 +6,7 @@ md.cluster=generic('name',oshostname(),'np',3); md.autodiff.isautodiff=true; md.verbose=verbose('autodiff',true); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure'}; Index: ../trunk-jpl/test/NightlyRun/test1203.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1203.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1203.m (revision 13663) @@ -2,7 +2,7 @@ printingflag=false; %test 5 and 6 : -md=model; +md=model(); md=triangle(md,'../Exp/SquareEISMINT.exp',5100); %test3 md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareEISMINT.par'); @@ -14,7 +14,7 @@ %Compute solution for MacAyeal's model md.cluster=generic('name',oshostname(),'np',8); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); vx=(md.results.DiagnosticSolution.Vx); vy=(md.results.DiagnosticSolution.Vy); Index: ../trunk-jpl/test/NightlyRun/test1105.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1105.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1105.m (revision 13663) @@ -11,7 +11,7 @@ L=L_list{i}; %in m (3 times the desired lenght for BC problems) nx=30; %number of nodes in x direction ny=30; - md=model; + md=model(); md=squaremesh(md,L,L,nx,ny); md=setmask(md,'',''); %ice sheet test md=parameterize(md,'../Par/ISMIPC.par'); @@ -62,7 +62,7 @@ %Compute the diagnostic md.cluster=generic('name',oshostname(),'np',8); - md=solve(md,DiagnosticSolutionEnum); + md=solve(md,DiagnosticSolutionEnum()); %Plot the results and save them vx=(md.results.DiagnosticSolution.Vx); Index: ../trunk-jpl/test/NightlyRun/test411.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test411.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test411.m (revision 13663) @@ -5,7 +5,7 @@ md=setflowequation(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); md.timestepping.time_step=0; -md=solve(md,SteadystateSolutionEnum); +md=solve(md,SteadystateSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; Index: ../trunk-jpl/test/NightlyRun/test419.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test419.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test419.m (revision 13663) @@ -4,7 +4,7 @@ md=extrude(md,5,1); md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure'}; Index: ../trunk-jpl/test/NightlyRun/ad.m =================================================================== --- ../trunk-jpl/test/NightlyRun/ad.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/ad.m (revision 13663) @@ -22,7 +22,7 @@ %md.autodiff.driver='fos_forward'; md.autodiff.driver='fos_reverse'; -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); %plot nods=md.mesh.numberofvertices; Index: ../trunk-jpl/test/NightlyRun/test3019.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test3019.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test3019.m (revision 13663) @@ -13,7 +13,7 @@ md.autodiff.dependents={dependent('name','MaxVel','type','scalar','fos_reverse_index',1)}; md.autodiff.driver='fos_reverse'; -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); %recover jacobian: jac_reverse=md.results.TransientSolution(1).AutodiffJacobian; @@ -24,7 +24,7 @@ md.autodiff.dependents={dependent('name','MaxVel','type','scalar')}; md.autodiff.driver='fov_forward'; -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); %recover jacobian: jac_forward=md.results.TransientSolution(1).AutodiffJacobian; Index: ../trunk-jpl/test/NightlyRun/test420.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test420.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test420.m (revision 13663) @@ -31,7 +31,7 @@ md.diagnostic.reltol=10^-5; %tighten for qmu analysese %solve -md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); +md=solve(md,DiagnosticSolutionEnum(),'overwrite','y'); md.qmu.results=md.results.dakota; %test on thickness Index: ../trunk-jpl/test/NightlyRun/test501.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test501.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test501.m (revision 13663) @@ -3,7 +3,7 @@ md=parameterize(md,'../Par/Pig.par'); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vel','Pressure'}; Index: ../trunk-jpl/test/NightlyRun/test403.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test403.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test403.m (revision 13663) @@ -4,7 +4,7 @@ md=extrude(md,5,1); md=setflowequation(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure'}; Index: ../trunk-jpl/test/NightlyRun/test509.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test509.py (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test509.py (revision 13663) @@ -7,13 +7,13 @@ from solve import * from MatlabFuncs import * -md=triangle(model(),'../Exp/Pig.exp',30000) +md=triangle(model(),'../Exp/Pig.exp',30000.) md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') md=parameterize(md,'../Par/Pig.py') -md.extrude(3,1) +md.extrude(3,1.) md=setflowequation(md,'pattyn','all') md.cluster=generic('name',oshostname(),'np',3) -md.timestepping.time_step=0 +md.timestepping.time_step=0. md=solve(md,SteadystateSolutionEnum()) # Fields and tolerances to track changes Index: ../trunk-jpl/test/NightlyRun/test607.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test607.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test607.m (revision 13663) @@ -4,7 +4,7 @@ md=extrude(md,2,1); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,BedSlopeSolutionEnum); +md=solve(md,BedSlopeSolutionEnum()); %Fields and tolerances to track changes field_names ={'BedSlopeX','BedSlopeY'}; Index: ../trunk-jpl/test/NightlyRun/test428.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test428.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test428.m (revision 13663) @@ -5,7 +5,7 @@ md.diagnostic.isnewton=1; md.diagnostic.restol=0.0001; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vel','Pressure'}; Index: ../trunk-jpl/test/NightlyRun/test509.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test509.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test509.m (revision 13663) @@ -1,11 +1,11 @@ -md=triangle(model,'../Exp/Pig.exp',30000); +md=triangle(model,'../Exp/Pig.exp',30000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,1); +md=extrude(md,3,1.); md=setflowequation(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); -md.timestepping.time_step=0; -md=solve(md,SteadystateSolutionEnum); +md.timestepping.time_step=0.; +md=solve(md,SteadystateSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; Index: ../trunk-jpl/test/NightlyRun/test3020.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test3020.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test3020.m (revision 13663) @@ -7,7 +7,7 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md.transient.requested_outputs=[IceVolumeEnum;MaxVelEnum]; +md.transient.requested_outputs=[IceVolumeEnum();MaxVelEnum]; md.verbose=verbose('autodiff',true); md.diagnostic.restol=.000001; @@ -42,7 +42,7 @@ md.geometry.surface=md.geometry.bed+md.geometry.thickness; md=SetIceShelfBC(md); -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); V0=md.results.TransientSolution(end).IceVolume; MaxV0=md.results.TransientSolution(end).MaxVel; @@ -54,7 +54,7 @@ md.geometry.surface=md.geometry.bed+md.geometry.thickness; md=SetIceShelfBC(md); -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); V2=md.results.TransientSolution(end).IceVolume; MaxV2=md.results.TransientSolution(end).MaxVel; @@ -71,7 +71,7 @@ md.geometry.surface=md.geometry.bed+md.geometry.thickness; md=SetIceShelfBC(md); -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); %retrieve directly dVdh_ad=md.results.TransientSolution(1).AutodiffJacobian(1); dMaxVdh_ad=md.results.TransientSolution(1).AutodiffJacobian(2); Index: ../trunk-jpl/test/NightlyRun/test3003.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test3003.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test3003.m (revision 13663) @@ -4,10 +4,10 @@ md=extrude(md,3,2); md=setflowequation(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); -md.diagnostic.requested_outputs=StressTensorEnum; +md.diagnostic.requested_outputs=StressTensorEnum(); md.autodiff.isautodiff=true; md.verbose=verbose('autodiff',true); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure',... Index: ../trunk-jpl/test/NightlyRun/test1302.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1302.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1302.m (revision 13663) @@ -3,7 +3,7 @@ % at upper surface and an impose flux at its base. printingflag=false; -md=model; +md=model(); md=triangle(md,'../Exp/Square.exp',100000); md=setmask(md,'',''); md=parameterize(md,'../Par/SquareThermal.par'); @@ -27,7 +27,7 @@ %modeled results md.cluster=generic('name',oshostname(),'np',2); -md=solve(md,ThermalSolutionEnum); +md=solve(md,ThermalSolutionEnum()); %plot results comp_temp=md.results.ThermalSolution.Temperature; Index: ../trunk-jpl/test/NightlyRun/test1204.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1204.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1204.m (revision 13663) @@ -2,7 +2,7 @@ printingflag=false; %tests 3 and 4: using Glen's flow law -md=model; +md=model(); md=triangle(md,'../Exp/SquareEISMINT.exp',3550); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareEISMINT.par'); @@ -14,7 +14,7 @@ %Compute solution for MacAyeal's model md.cluster=generic('name',oshostname(),'np',8); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %plot results md.initialization.vx=(md.results.DiagnosticSolution.Vx); @@ -23,7 +23,7 @@ md.timestepping.time_step=1; md.timestepping.final_time=5000; md.prognostic.stabilization=1; -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); plotmodel(md,'data',(md.results.TransientSolution(end).Vx)) if printingflag, Index: ../trunk-jpl/test/NightlyRun/test1106.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1106.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1106.m (revision 13663) @@ -40,7 +40,7 @@ %Compute the diagnostic md.cluster=generic('name',oshostname(),'np',8); - md=solve(md,DiagnosticSolutionEnum); + md=solve(md,DiagnosticSolutionEnum()); %Plot the results and save them vx=(md.results.DiagnosticSolution.Vx); Index: ../trunk-jpl/test/NightlyRun/test504.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test504.py (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test504.py (revision 13663) @@ -7,7 +7,7 @@ from solve import * from MatlabFuncs import * -md=triangle(model(),'../Exp/Pig.exp',20000) +md=triangle(model(),'../Exp/Pig.exp',20000.) md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') md=parameterize(md,'../Par/Pig.py') md=setflowequation(md,'macayeal','all') Index: ../trunk-jpl/test/NightlyRun/test510.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test510.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test510.m (revision 13663) @@ -1,11 +1,11 @@ -md=triangle(model,'../Exp/Pig.exp',20000); +md=triangle(model,'../Exp/Pig.exp',20000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,2,1); +md=extrude(md,2,1.); md=setflowequation(md,'stokes','all'); md.cluster=generic('name',oshostname(),'np',3); -md.timestepping.time_step=0; -md=solve(md,SteadystateSolutionEnum); +md.timestepping.time_step=0.; +md=solve(md,SteadystateSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'}; Index: ../trunk-jpl/test/NightlyRun/test412.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test412.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test412.m (revision 13663) @@ -32,7 +32,7 @@ md.diagnostic.reltol=10^-5; %tighten for qmu analysese %solve -md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); +md=solve(md,DiagnosticSolutionEnum(),'overwrite','y'); %Fields and tolerances to track changes md.qmu.results=md.results.dakota; Index: ../trunk-jpl/test/NightlyRun/test513.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test513.py (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test513.py (revision 13663) @@ -27,7 +27,7 @@ md.inversion.step_threshold=0.99*numpy.ones((md.inversion.nsteps,1)) md.inversion.vx_obs=md.initialization.vx md.inversion.vy_obs=md.initialization.vy -md.timestepping.time_step=0 +md.timestepping.time_step=0. md.thermal.penalty_lock=5 md.cluster=generic('name',oshostname(),'np',3) Index: ../trunk-jpl/test/NightlyRun/test421.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test421.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test421.m (revision 13663) @@ -4,7 +4,7 @@ md=extrude(md,5,1); md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','pattyn'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure'}; Index: ../trunk-jpl/test/NightlyRun/test502.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test502.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test502.m (revision 13663) @@ -1,10 +1,10 @@ -md=triangle(model,'../Exp/Pig.exp',20000); +md=triangle(model,'../Exp/Pig.exp',20000).; md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,0.9); md=setflowequation(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure'}; Index: ../trunk-jpl/test/NightlyRun/test404.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test404.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test404.m (revision 13663) @@ -4,7 +4,7 @@ md=extrude(md,3,1); md=setflowequation(md,'stokes','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure'}; Index: ../trunk-jpl/test/NightlyRun/test608.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test608.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test608.m (revision 13663) @@ -3,7 +3,7 @@ md=parameterize(md,'../Par/79North.par'); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,BalancethicknessSolutionEnum); +md=solve(md,BalancethicknessSolutionEnum()); %Fields and tolerances to track changes field_names ={'Thickness'}; Index: ../trunk-jpl/test/NightlyRun/test429.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test429.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test429.m (revision 13663) @@ -6,7 +6,7 @@ md.diagnostic.isnewton=1; md.diagnostic.restol=0.0001; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure'}; Index: ../trunk-jpl/test/NightlyRun/test1401.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1401.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1401.m (revision 13663) @@ -6,7 +6,7 @@ L=1; %in m nx=70; %numberof nodes in x direction ny=70; -md=model; +md=model(); %mesh adaptation loop YAMS md=squaremesh(md,L,L,nx,ny); Index: ../trunk-jpl/test/NightlyRun/test1303.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1303.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1303.m (revision 13663) @@ -4,7 +4,7 @@ % surface. if it is not the case, something is thermal modeling has been changed... printingflag=false; -md=model; +md=model(); md=triangle(md,'../Exp/Square.exp',100000); md=setmask(md,'all',''); md=parameterize(md,'../Par/SquareThermal.par'); @@ -21,7 +21,7 @@ %modeled results md.cluster=generic('name',oshostname(),'np',2); -md=solve(md,ThermalSolutionEnum); +md=solve(md,ThermalSolutionEnum()); %plot results comp_temp=md.results.ThermalSolution.Temperature; Index: ../trunk-jpl/test/NightlyRun/test3004.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test3004.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test3004.m (revision 13663) @@ -6,7 +6,7 @@ md.cluster=generic('name',oshostname(),'np',3); md.autodiff.isautodiff=true; md.verbose=verbose('autodiff',true); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure'}; Index: ../trunk-jpl/test/NightlyRun/test1205.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1205.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1205.m (revision 13663) @@ -5,7 +5,7 @@ resolution=30000; %To begin with the numerical model -md=model; +md=model(); md=roundmesh(md,750000,resolution); md=setmask(md,'',''); %We can not test iceshelves nor ice rises with this analytical solution md=parameterize(md,'../Par/RoundSheetStaticEISMINT.par'); @@ -28,7 +28,7 @@ %Now we can solve the problem md.cluster=generic('name',oshostname(),'np',8); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Calculate the depth averaged velocity field (2d): vx=(md.results.DiagnosticSolution.Vx); Index: ../trunk-jpl/test/NightlyRun/test1107.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1107.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1107.m (revision 13663) @@ -11,7 +11,7 @@ L=L_list{i}; nx=30; %numberof nodes in x direction ny=30; - md=model; + md=model(); md=squaremesh(md,L,L,nx,ny); md=setmask(md,'',''); %ice sheet test md=parameterize(md,'../Par/ISMIPD.par'); @@ -57,7 +57,7 @@ %Compute the diagnostic md.cluster=generic('name',oshostname(),'np',8); - md=solve(md,DiagnosticSolutionEnum); + md=solve(md,DiagnosticSolutionEnum()); %Plot the results and save them vx=(md.results.DiagnosticSolution.Vx); Index: ../trunk-jpl/test/NightlyRun/test511.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test511.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test511.m (revision 13663) @@ -1,29 +1,29 @@ -md=triangle(model,'../Exp/Pig.exp',10000); +md=triangle(model,'../Exp/Pig.exp',10000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); %impose hydrostatic equilibrium (required by Stokes) md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness; md.geometry.surface=md.geometry.bed+md.geometry.thickness; -md=extrude(md,3,1); +md=extrude(md,3,1.); md=setflowequation(md,'stokes','all'); md=extract(md,md.mask.elementonfloatingice); %control parameters md.inversion.iscontrol=1; md.inversion.control_parameters={'MaterialsRheologyBbar'}; -md.inversion.min_parameters=10^6*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=2*10^9*ones(md.mesh.numberofvertices,1); +md.inversion.min_parameters=10.^6*ones(md.mesh.numberofvertices,1); +md.inversion.max_parameters=2.*10^9*ones(md.mesh.numberofvertices,1); md.inversion.nsteps=2; md.inversion.cost_functions=101*ones(md.inversion.nsteps,1); md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,1); -md.inversion.gradient_scaling=10^8*ones(md.inversion.nsteps,1); -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); +md.inversion.gradient_scaling=10.^8*ones(md.inversion.nsteps,1); +md.inversion.maxiter_per_step=2.*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Gradient' 'Misfits' 'MaterialsRheologyB' 'Pressure' 'Vel' 'Vx' 'Vy'}; Index: ../trunk-jpl/test/NightlyRun/test430.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test430.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test430.m (revision 13663) @@ -6,7 +6,7 @@ md.diagnostic.isnewton=1; md.diagnostic.restol=0.0001; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure'}; Index: ../trunk-jpl/test/NightlyRun/test413.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test413.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test413.m (revision 13663) @@ -33,7 +33,7 @@ md.qmu.isdakota=1; %solve -md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); +md=solve(md,DiagnosticSolutionEnum(),'overwrite','y'); %Fields and tolerances to track changes md.qmu.results=md.results.dakota; Index: ../trunk-jpl/test/NightlyRun/test505.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test505.py (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test505.py (revision 13663) @@ -7,10 +7,10 @@ from solve import * from MatlabFuncs import * -md=triangle(model(),'../Exp/Pig.exp',30000) +md=triangle(model(),'../Exp/Pig.exp',30000.) md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') md=parameterize(md,'../Par/Pig.py') -md.extrude(3,1) +md.extrude(3,1.) md=setflowequation(md,'macayeal','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,TransientSolutionEnum()) Index: ../trunk-jpl/test/NightlyRun/test601.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test601.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test601.m (revision 13663) @@ -3,7 +3,7 @@ md=parameterize(md,'../Par/79North.par'); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,PrognosticSolutionEnum); +md=solve(md,PrognosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Thickness'}; Index: ../trunk-jpl/test/NightlyRun/test503.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test503.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test503.m (revision 13663) @@ -1,10 +1,10 @@ -md=triangle(model,'../Exp/Pig.exp',20000); +md=triangle(model,'../Exp/Pig.exp',20000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); md=extrude(md,3,0.9); md=setflowequation(md,'stokes','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure'}; Index: ../trunk-jpl/test/NightlyRun/test422.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test422.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test422.m (revision 13663) @@ -5,7 +5,7 @@ md=setflowequation(md,'stokes','../Exp/SquareHalfRight.exp','fill','macayeal'); md.cluster=generic('name',oshostname(),'np',3); md.diagnostic.reltol=0.4; -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure'}; Index: ../trunk-jpl/test/NightlyRun/test405.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test405.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test405.m (revision 13663) @@ -4,7 +4,7 @@ md=extrude(md,5,1); md=setflowequation(md,'macayeal','../Exp/SquareHalfRight.exp','fill','pattyn','coupling','penalties'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure'}; Index: ../trunk-jpl/test/NightlyRun/test609.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test609.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test609.m (revision 13663) @@ -5,7 +5,7 @@ md=setflowequation(md,'macayeal','all'); md.balancethickness.stabilization=3; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,BalancethicknessSolutionEnum); +md=solve(md,BalancethicknessSolutionEnum()); %Fields and tolerances to track changes field_names ={'Thickness'}; Index: ../trunk-jpl/test/NightlyRun/test1402.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1402.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1402.m (revision 13663) @@ -5,7 +5,7 @@ L=1; %in m nx=30; %numberof nodes in x direction ny=30; -md=model; +md=model(); %mesh adaptation loop YAMS md=squaremesh(md,L,L,nx,ny); Index: ../trunk-jpl/test/NightlyRun/test1304.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1304.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1304.m (revision 13663) @@ -4,7 +4,7 @@ % surface with an imposed slope (Geothermal flux). if it is not the case, something is thermal modeling has been changed... printingflag=false; -md=model; +md=model(); md=triangle(md,'../Exp/Square.exp',100000); md=setmask(md,'',''); md=parameterize(md,'../Par/SquareThermal.par'); @@ -22,7 +22,7 @@ %modeled results md.cluster=generic('name',oshostname(),'np',2); -md=solve(md,ThermalSolutionEnum); +md=solve(md,ThermalSolutionEnum()); %plot results comp_temp=md.results.ThermalSolution.Temperature; Index: ../trunk-jpl/test/NightlyRun/test3005.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test3005.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test3005.m (revision 13663) @@ -5,7 +5,7 @@ md.cluster=generic('name',oshostname(),'np',3); md.autodiff.isautodiff=true; md.verbose=verbose('autodiff',true); -md=solve(md,PrognosticSolutionEnum); +md=solve(md,PrognosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Thickness'}; Index: ../trunk-jpl/test/NightlyRun/test1206.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1206.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1206.m (revision 13663) @@ -5,7 +5,7 @@ resolution=30000; %To begin with the numerical model -md=model; +md=model(); md=roundmesh(md,750000,resolution); md=setmask(md,'',''); %We can not test iceshelves nor ice rises with this analytical solution md=parameterize(md,'../Par/RoundSheetStaticEISMINT.par'); @@ -28,7 +28,7 @@ %Now we can solve the problem md.cluster=generic('name',oshostname(),'np',8); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Calculate the depth averaged velocity field (2d): vx=(md.results.DiagnosticSolution.Vx); Index: ../trunk-jpl/test/NightlyRun/test1108.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1108.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1108.m (revision 13663) @@ -8,7 +8,7 @@ L=L_list{i}; nx=30; %numberof nodes in x direction ny=30; - md=model; + md=model(); md=squaremesh(md,L,L,nx,ny); md=setmask(md,'',''); %ice sheet test md=parameterize(md,'../Par/ISMIPD.par'); @@ -38,7 +38,7 @@ %Compute the diagnostic md.cluster=generic('name',oshostname(),'np',8); md.verbose=verbose('convergence',true); - md=solve(md,DiagnosticSolutionEnum); + md=solve(md,DiagnosticSolutionEnum()); md.diagnostic.reltol=NaN; md.diagnostic.abstol=NaN; md.diagnostic.vertex_pairing=[]; @@ -50,7 +50,7 @@ md.diagnostic.spcvx(pos)=md.results.DiagnosticSolution.Vx(pos); md.diagnostic.spcvy(pos)=md.results.DiagnosticSolution.Vy(pos); md=setflowequation(md,'stokes','all'); - md=solve(md,DiagnosticSolutionEnum); + md=solve(md,DiagnosticSolutionEnum()); %Plot the results and save them vx=(md.results.DiagnosticSolution.Vx); Index: ../trunk-jpl/test/NightlyRun/test610.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test610.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test610.m (revision 13663) @@ -4,7 +4,7 @@ md=extrude(md,3,1); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,BalancethicknessSolutionEnum); +md=solve(md,BalancethicknessSolutionEnum()); %Fields and tolerances to track changes field_names ={'Thickness'}; Index: ../trunk-jpl/test/NightlyRun/test512.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test512.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test512.m (revision 13663) @@ -1,7 +1,7 @@ -md=triangle(model,'../Exp/Pig.exp',20000); +md=triangle(model,'../Exp/Pig.exp',20000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,1); +md=extrude(md,3,1.); md=setflowequation(md,'pattyn','all'); %control parameters @@ -11,14 +11,14 @@ md.inversion.max_parameters=200*ones(md.mesh.numberofvertices,1); md.inversion.nsteps=2; md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1) 501*ones(md.inversion.nsteps,1)]; -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2*10^-7; -md.inversion.gradient_scaling=3*ones(md.inversion.nsteps,1); +md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2.*10^-7; +md.inversion.gradient_scaling=3.*ones(md.inversion.nsteps,1); md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy'}; Index: ../trunk-jpl/test/NightlyRun/test431.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test431.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test431.m (revision 13663) @@ -7,7 +7,7 @@ md.timestepping.time_step=0; md.thermal.isenthalpy=1; md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); -md=solve(md,SteadystateSolutionEnum); +md=solve(md,SteadystateSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','Water fraction','Enthalpy'}; Index: ../trunk-jpl/test/NightlyRun/test414.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test414.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test414.m (revision 13663) @@ -47,7 +47,7 @@ md.diagnostic.reltol=10^-5; %tighten for qmu analyses %solve -md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); +md=solve(md,DiagnosticSolutionEnum(),'overwrite','y'); md.qmu.results=md.results.dakota; %Fields and tolerances to track changes Index: ../trunk-jpl/test/NightlyRun/test602.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test602.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test602.m (revision 13663) @@ -6,7 +6,7 @@ md.prognostic.stabilization=3; md.prognostic.spcthickness=md.geometry.thickness; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,PrognosticSolutionEnum); +md=solve(md,PrognosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Thickness'}; Index: ../trunk-jpl/test/NightlyRun/test504.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test504.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test504.m (revision 13663) @@ -1,9 +1,9 @@ -md=triangle(model,'../Exp/Pig.exp',20000); +md=triangle(model,'../Exp/Pig.exp',20000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); 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'}; Index: ../trunk-jpl/test/NightlyRun/test423.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test423.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test423.m (revision 13663) @@ -24,11 +24,11 @@ %test different grounding line dynamics. md.groundingline.migration='AgressiveMigration'; -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); element_on_iceshelf_agressive=(md.results.TransientSolution.MaskElementonfloatingice); md.groundingline.migration='SoftMigration'; -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); element_on_iceshelf_soft=(md.results.TransientSolution.MaskElementonfloatingice); %Fields and tolerances to track changes Index: ../trunk-jpl/test/NightlyRun/test406.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test406.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test406.m (revision 13663) @@ -5,7 +5,7 @@ md=setflowequation(md,'pattyn','all'); md.cluster=generic('name',oshostname(),'np',3); md.timestepping.time_step=0; -md=solve(md,ThermalSolutionEnum); +md=solve(md,ThermalSolutionEnum()); %Fields and tolerances to track changes field_names ={'Temperature','BasalforcingsMeltingRate'}; Index: ../trunk-jpl/test/NightlyRun/test1101.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1101.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1101.m (revision 13663) @@ -11,7 +11,7 @@ L=L_list{i}; nx=20; %numberof nodes in x direction ny=20; - md=model; + md=model(); md=squaremesh(md,L,L,nx,ny); md=setmask(md,'',''); %ice sheet test md=parameterize(md,'../Par/ISMIPA.par'); @@ -39,7 +39,7 @@ %Compute the diagnostic md.cluster=generic('name',oshostname(),'np',8); - md=solve(md,DiagnosticSolutionEnum); + md=solve(md,DiagnosticSolutionEnum()); %Plot the results and save them vx=(md.results.DiagnosticSolution.Vx); Index: ../trunk-jpl/test/NightlyRun/test1501.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1501.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1501.m (revision 13663) @@ -16,10 +16,10 @@ md.surfaceforcings.mass_balance= smb; md.basalforcings.melting_rate= smb; -md=solve(md,PrognosticSolutionEnum); +md=solve(md,PrognosticSolutionEnum()); for i=1:10 - md=solve(md,PrognosticSolutionEnum); + md=solve(md,PrognosticSolutionEnum()); md.surfaceforcings.mass_balance= md.surfaceforcings.mass_balance - ((md.results.PrognosticSolution.Thickness)-md.geometry.thickness); end @@ -32,7 +32,7 @@ md.surfaceforcings.mass_balance= smb; md.surfaceforcings.mass_balance(end+1,:)=[1:2000]; -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SurfaceforcingsMassBalance1', ... Index: ../trunk-jpl/test/NightlyRun/test3006.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test3006.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test3006.m (revision 13663) @@ -8,7 +8,7 @@ md.prognostic.spcthickness=md.geometry.thickness; md.autodiff.isautodiff=true; md.verbose=verbose('autodiff',true); -md=solve(md,PrognosticSolutionEnum); +md=solve(md,PrognosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Thickness'}; Index: ../trunk-jpl/test/NightlyRun/test1207.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1207.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1207.m (revision 13663) @@ -5,7 +5,7 @@ resolution=30000; %To begin with the numerical model -md=model; +md=model(); md=roundmesh(md,750000,resolution); md=setmask(md,'',''); %We can not test iceshelves nor ice rises with this analytical solution md=parameterize(md,'../Par/RoundSheetStaticEISMINT.par'); @@ -28,7 +28,7 @@ %Now we can solve the problem md.cluster=generic('name',oshostname(),'np',8); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); %Calculate the depth averaged velocity field (2d): vx=(md.results.DiagnosticSolution.Vx); Index: ../trunk-jpl/test/NightlyRun/test1109.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1109.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1109.m (revision 13663) @@ -12,7 +12,7 @@ Ly=5000; %in m nx=3; %number of nodes in x direction ny=51; - md=model; + md=model(); md=squaremesh(md,Lx,Ly,nx,ny); md=setmask(md,'',''); %ice sheet test md=parameterize(md,'../Par/ISMIPE.par'); @@ -48,7 +48,7 @@ %Compute the diagnostic md.cluster=generic('name',oshostname(),'np',8); - md=solve(md,DiagnosticSolutionEnum); + md=solve(md,DiagnosticSolutionEnum()); vx=(md.results.DiagnosticSolution.Vx); vy=(md.results.DiagnosticSolution.Vy); Index: ../trunk-jpl/test/NightlyRun/test506.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test506.py (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test506.py (revision 13663) @@ -7,10 +7,10 @@ from solve import * from MatlabFuncs import * -md=triangle(model(),'../Exp/Pig.exp',30000) +md=triangle(model(),'../Exp/Pig.exp',30000.) md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') md=parameterize(md,'../Par/Pig.py') -md.extrude(2,1) +md.extrude(2,1.) md=setflowequation(md,'pattyn','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,TransientSolutionEnum()) Index: ../trunk-jpl/test/NightlyRun/test611.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test611.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test611.m (revision 13663) @@ -18,7 +18,7 @@ md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,BalancethicknessSolutionEnum); +md=solve(md,BalancethicknessSolutionEnum()); %Fields and tolerances to track changes field_names ={'Gradient' 'Misfits' 'BalancethicknessThickeningRate' 'Thickness'}; Index: ../trunk-jpl/test/NightlyRun/test513.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test513.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test513.m (revision 13663) @@ -1,26 +1,26 @@ -md=triangle(model,'../Exp/Pig.exp',30000); +md=triangle(model,'../Exp/Pig.exp',30000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,1); +md=extrude(md,3,1.); md=setflowequation(md,'macayeal','all'); %control parameters md.inversion.iscontrol=1; md.inversion.control_parameters={'FrictionCoefficient'}; -md.inversion.min_parameters=1*ones(md.mesh.numberofvertices,1); -md.inversion.max_parameters=200*ones(md.mesh.numberofvertices,1); +md.inversion.min_parameters=1.*ones(md.mesh.numberofvertices,1); +md.inversion.max_parameters=200.*ones(md.mesh.numberofvertices,1); md.inversion.nsteps=2; md.inversion.cost_functions=[103*ones(md.inversion.nsteps,1) 501*ones(md.inversion.nsteps,1)]; -md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2*10^-7; -md.inversion.gradient_scaling=3*ones(md.inversion.nsteps,1); -md.inversion.maxiter_per_step=2*ones(md.inversion.nsteps,1); +md.inversion.cost_functions_coefficients=ones(md.mesh.numberofvertices,2); md.inversion.cost_functions_coefficients(:,2)=2.*10^-7; +md.inversion.gradient_scaling=3.*ones(md.inversion.nsteps,1); +md.inversion.maxiter_per_step=2.*ones(md.inversion.nsteps,1); md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; -md.timestepping.time_step=0; +md.timestepping.time_step=0.; md.thermal.penalty_lock=5; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,SteadystateSolutionEnum); +md=solve(md,SteadystateSolutionEnum()); %Fields and tolerances to track changes field_names ={'Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsMeltingRate'}; Index: ../trunk-jpl/test/NightlyRun/test432.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test432.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test432.m (revision 13663) @@ -7,7 +7,7 @@ md.timestepping.time_step=0; md.thermal.isenthalpy=1; md.initialization.waterfraction=zeros(md.mesh.numberofvertices,1); -md=solve(md,SteadystateSolutionEnum); +md=solve(md,SteadystateSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','Water fraction','Enthalpy'}; Index: ../trunk-jpl/test/NightlyRun/test415.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test415.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test415.m (revision 13663) @@ -19,7 +19,7 @@ md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,SteadystateSolutionEnum); +md=solve(md,SteadystateSolutionEnum()); %Fields and tolerances to track changes field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalforcingsMeltingRate'}; Index: ../trunk-jpl/test/NightlyRun/test1110.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1110.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1110.m (revision 13663) @@ -6,7 +6,7 @@ L=100000; %in m nx=30; %numberof nodes in x direction ny=30; - md=model; + md=model(); md=squaremesh(md,L,L,nx,ny); %md=triangle(md,'../Exp/SquareISMIP.exp',5500); md=setmask(md,'',''); %ice sheet test @@ -56,7 +56,7 @@ %Compute the diagnostic md.cluster=generic('name',oshostname(),'np',8); md.verbose=verbose('convergence',true,'solution',true); - md=solve(md,TransientSolutionEnum); + md=solve(md,TransientSolutionEnum()); %save the results results{i}=md.results.TransientSolution(end); Index: ../trunk-jpl/test/NightlyRun/test3015.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test3015.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test3015.m (revision 13663) @@ -7,7 +7,7 @@ md=parameterize(md,'../Par/SquareShelfConstrained.par'); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md.prognostic.requested_outputs=IceVolumeEnum; +md.prognostic.requested_outputs=IceVolumeEnum(); md.verbose=verbose('autodiff',true); %setup autodiff parameters @@ -40,7 +40,7 @@ md.geometry.surface=md.geometry.bed+md.geometry.thickness; md=SetIceShelfBC(md); -md=solve(md,PrognosticSolutionEnum); +md=solve(md,PrognosticSolutionEnum()); V0=md.results.PrognosticSolution.IceVolume; %backward @@ -51,7 +51,7 @@ md.geometry.surface=md.geometry.bed+md.geometry.thickness; md=SetIceShelfBC(md); -md=solve(md,PrognosticSolutionEnum); +md=solve(md,PrognosticSolutionEnum()); V2=md.results.PrognosticSolution.IceVolume; %compute resulting derivative @@ -65,7 +65,7 @@ md.geometry.surface=md.geometry.bed+md.geometry.thickness; md=SetIceShelfBC(md); -md=solve(md,PrognosticSolutionEnum); +md=solve(md,PrognosticSolutionEnum()); %retrieve directly dVdh_ad=md.results.PrognosticSolution.AutodiffJacobian; Index: ../trunk-jpl/test/NightlyRun/test515.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test515.py (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test515.py (revision 13663) @@ -7,7 +7,7 @@ from solve import * from MatlabFuncs import * -md=triangle(model(),'../Exp/Pig.exp',30000) +md=triangle(model(),'../Exp/Pig.exp',30000.) md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') md=parameterize(md,'../Par/Pig.py') md.extrude(3,1) Index: ../trunk-jpl/test/NightlyRun/test603.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test603.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test603.m (revision 13663) @@ -4,7 +4,7 @@ md=extrude(md,6,1); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,PrognosticSolutionEnum); +md=solve(md,PrognosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Thickness'}; Index: ../trunk-jpl/test/NightlyRun/test505.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test505.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test505.m (revision 13663) @@ -1,10 +1,10 @@ -md=triangle(model,'../Exp/Pig.exp',30000); +md=triangle(model,'../Exp/Pig.exp',30000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,1); +md=extrude(md,3,1.); 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', ... Index: ../trunk-jpl/test/NightlyRun/test424.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test424.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test424.m (revision 13663) @@ -15,7 +15,7 @@ md.groundingline.migration='AgressiveMigration'; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names ={'Bed1','Surface1','Thickness1','Floatingice1',... Index: ../trunk-jpl/test/NightlyRun/test407.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test407.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test407.m (revision 13663) @@ -8,7 +8,7 @@ md.transient.isprognostic=0; md.transient.isthermal=1; md.transient.isgroundingline=0; -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names ={'Temperature','BasalforcingsMeltingRate'}; Index: ../trunk-jpl/test/NightlyRun/test1102.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1102.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1102.m (revision 13663) @@ -11,7 +11,7 @@ L=L_list{i}; nx=20; %numberof nodes in x direction ny=20; - md=model; + md=model(); md=squaremesh(md,L,L,nx,ny); md=setmask(md,'',''); %ice sheet test @@ -48,7 +48,7 @@ md.diagnostic.reltol=NaN; md.diagnostic.restol=1; md.cluster=generic('name',oshostname(),'np',8); - md=solve(md,DiagnosticSolutionEnum); + md=solve(md,DiagnosticSolutionEnum()); %Plot the results and save them vx=(md.results.DiagnosticSolution.Vx); Index: ../trunk-jpl/test/NightlyRun/test1502.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1502.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1502.m (revision 13663) @@ -17,10 +17,10 @@ md.surfaceforcings.mass_balance= smb; md.basalforcings.melting_rate= smb; -md=solve(md,PrognosticSolutionEnum); +md=solve(md,PrognosticSolutionEnum()); for i=1:10 - md=solve(md,PrognosticSolutionEnum); + md=solve(md,PrognosticSolutionEnum()); md.surfaceforcings.mass_balance= md.surfaceforcings.mass_balance - ((md.results.PrognosticSolution.Thickness)-md.geometry.thickness); end @@ -33,7 +33,7 @@ md.surfaceforcings.mass_balance= smb; md.surfaceforcings.mass_balance(end+1,:)=[1:2000]; -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', ... Index: ../trunk-jpl/test/NightlyRun/test3007.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test3007.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test3007.m (revision 13663) @@ -6,7 +6,7 @@ md.cluster=generic('name',oshostname(),'np',3); md.autodiff.isautodiff=true; md.verbose=verbose('autodiff',true); -md=solve(md,PrognosticSolutionEnum); +md=solve(md,PrognosticSolutionEnum()); %Fields and tolerances to track changes field_names ={'Thickness'}; Index: ../trunk-jpl/test/NightlyRun/test1208.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1208.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1208.m (revision 13663) @@ -26,7 +26,7 @@ %Now we can solve the problem md.cluster=generic('name',oshostname(),'np',8); -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names ={'Vx','Vy','Vz','Vel','Pressure','Thickness','Bed','Surface','Temperature','BasalforcingsMeltingRate'}; Index: ../trunk-jpl/test/NightlyRun/test510.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test510.py (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test510.py (revision 13663) @@ -7,13 +7,13 @@ from solve import * from MatlabFuncs import * -md=triangle(model(),'../Exp/Pig.exp',20000) +md=triangle(model(),'../Exp/Pig.exp',20000.) md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') md=parameterize(md,'../Par/Pig.py') -md.extrude(2,1) +md.extrude(2,1.) md=setflowequation(md,'stokes','all') md.cluster=generic('name',oshostname(),'np',3) -md.timestepping.time_step=0 +md.timestepping.time_step=0. md=solve(md,SteadystateSolutionEnum()) # Fields and tolerances to track changes Index: ../trunk-jpl/test/NightlyRun/test612.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test612.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test612.m (revision 13663) @@ -19,7 +19,7 @@ md.inversion.step_threshold=0.99*ones(md.inversion.nsteps,1); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,BalancethicknessSolutionEnum); +md=solve(md,BalancethicknessSolutionEnum()); %Fields and tolerances to track changes field_names ={'Gradient' 'Misfits' 'BalancethicknessThickeningRate' 'Thickness'}; Index: ../trunk-jpl/test/NightlyRun/test416.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test416.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test416.m (revision 13663) @@ -19,7 +19,7 @@ md.inversion.vx_obs=md.initialization.vx; md.inversion.vy_obs=md.initialization.vy; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,SteadystateSolutionEnum); +md=solve(md,SteadystateSolutionEnum()); %Fields and tolerances to track changes field_names ={'Gradient' 'Misfits' 'FrictionCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalforcingsMeltingRate'}; Index: ../trunk-jpl/test/NightlyRun/ad_maxalloc.m =================================================================== --- ../trunk-jpl/test/NightlyRun/ad_maxalloc.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/ad_maxalloc.m (revision 13663) @@ -16,4 +16,4 @@ md.autodiff.driver='fov_forward'; -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); Index: ../trunk-jpl/test/NightlyRun/test507.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test507.py (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test507.py (revision 13663) @@ -7,10 +7,10 @@ from solve import * from MatlabFuncs import * -md=triangle(model(),'../Exp/Pig.exp',30000) +md=triangle(model(),'../Exp/Pig.exp',30000.) md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') md=parameterize(md,'../Par/Pig.py') -md.extrude(2,1) +md.extrude(2,1.) md=setflowequation(md,'stokes','all') md.cluster=generic('name',oshostname(),'np',3) md=solve(md,TransientSolutionEnum()) Index: ../trunk-jpl/test/NightlyRun/test604.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test604.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test604.m (revision 13663) @@ -3,7 +3,7 @@ md=parameterize(md,'../Par/79North.par'); md=setflowequation(md,'macayeal','all'); md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,SurfaceSlopeSolutionEnum); +md=solve(md,SurfaceSlopeSolutionEnum()); %Fields and tolerances to track changes field_names ={'SurfaceSlopeX','SurfaceSlopeY'}; Index: ../trunk-jpl/test/NightlyRun/test425.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test425.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test425.m (revision 13663) @@ -15,7 +15,7 @@ md.groundingline.migration='SoftMigration'; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names ={'Bed1','Surface1','Thickness1','Floatingice1',... Index: ../trunk-jpl/test/NightlyRun/test506.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test506.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test506.m (revision 13663) @@ -1,10 +1,10 @@ -md=triangle(model,'../Exp/Pig.exp',30000); +md=triangle(model,'../Exp/Pig.exp',30000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,2,1); +md=extrude(md,2,1.); md=setflowequation(md,'pattyn','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', ... Index: ../trunk-jpl/test/NightlyRun/test408.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test408.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test408.m (revision 13663) @@ -3,7 +3,7 @@ md=parameterize(md,'../Par/SquareSheetShelf.par'); 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'}; Index: ../trunk-jpl/test/NightlyRun/test1201.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1201.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1201.m (revision 13663) @@ -37,7 +37,7 @@ md.transient.isdiagnostic=0; md.settings.output_frequency=500; %keep only last step md.verbose=verbose(); - md=solve(md,TransientSolutionEnum); + md=solve(md,TransientSolutionEnum()); results{stabilization}=(md.results.TransientSolution(end).Thickness); end Index: ../trunk-jpl/test/NightlyRun/test1103.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1103.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1103.m (revision 13663) @@ -9,7 +9,7 @@ L=L_list{i}; nx=20; %numberof nodes in x direction ny=20; - md=model; + md=model(); md=squaremesh(md,L,L,nx,ny); md=setmask(md,'',''); %ice sheet test md=parameterize(md,'../Par/ISMIPB.par'); @@ -36,7 +36,7 @@ %Compute the diagnostic md.cluster=generic('name',oshostname(),'np',8); - md=solve(md,DiagnosticSolutionEnum); + md=solve(md,DiagnosticSolutionEnum()); %Plot the results and save them vx=(md.results.DiagnosticSolution.Vx); Index: ../trunk-jpl/test/NightlyRun/test1601.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test1601.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test1601.m (revision 13663) @@ -8,7 +8,7 @@ md.initialization.vel(:)=0; md.cluster=generic('name',oshostname,'np',2); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); vel0=md.results.DiagnosticSolution.Vel; theta=30*pi/180; @@ -19,7 +19,7 @@ md.diagnostic.referential(:,1:3)=repmat([cos(theta),sin(theta),0],md.mesh.numberofvertices,1); md.diagnostic.referential(:,4:6)=repmat([0,0,1],md.mesh.numberofvertices,1); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); vel1=md.results.DiagnosticSolution.Vel; plotmodel(md,'data',vel0,'data',vel1,'data',vel1-vel0,'title','Cartesian CS','title','Rotated CS','title','difference') @@ -30,7 +30,7 @@ md.diagnostic.referential(:)=NaN; md.diagnostic.referential(pos,1:3)=repmat([cos(theta),sin(theta),0],size(pos,1),1); md.diagnostic.referential(pos,4:6)=repmat([0,0,1],size(pos,1),1); -md=solve(md,DiagnosticSolutionEnum); +md=solve(md,DiagnosticSolutionEnum()); vel2=md.results.DiagnosticSolution.Vel; plotmodel(md,'data',vel0,'data',vel2,'data',vel2-vel0,'title','Cartesian CS','title','Rotated CS','title','difference') Index: ../trunk-jpl/test/NightlyRun/test3008.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test3008.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test3008.m (revision 13663) @@ -7,7 +7,7 @@ md.cluster=generic('name',oshostname(),'np',3); md.autodiff.isautodiff=true; md.verbose=verbose('autodiff',true); -md=solve(md,ThermalSolutionEnum); +md=solve(md,ThermalSolutionEnum()); %Fields and tolerances to track changes field_names ={'Temperature','BasalforcingsMeltingRate'}; Index: ../trunk-jpl/test/NightlyRun/test502.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test502.py (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test502.py (revision 13663) @@ -7,7 +7,7 @@ from solve import * from MatlabFuncs import * -md=triangle(model(),'../Exp/Pig.exp',20000) +md=triangle(model(),'../Exp/Pig.exp',20000.) md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp') md=parameterize(md,'../Par/Pig.py') md.extrude(3,0.9) Index: ../trunk-jpl/test/NightlyRun/test613.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test613.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test613.m (revision 13663) @@ -26,7 +26,7 @@ md.verbose.control=1; md.cluster=generic('name',oshostname(),'np',3); -md=solve(md,BalancethicknessSolutionEnum); +md=solve(md,BalancethicknessSolutionEnum()); %Fields and tolerances to track changes field_names ={'Gradient1' 'Gradient2' 'Misfits' 'Vx' 'Vy' 'Thickness'}; Index: ../trunk-jpl/test/NightlyRun/test515.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test515.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test515.m (revision 13663) @@ -1,7 +1,7 @@ -md=triangle(model,'../Exp/Pig.exp',30000); +md=triangle(model,'../Exp/Pig.exp',30000.); md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp'); md=parameterize(md,'../Par/Pig.par'); -md=extrude(md,3,1); +md=extrude(md,3,1.); md=setflowequation(md,'pattyn','all'); md.thermal.stabilization=2; md.cluster=generic('name',oshostname(),'np',3); @@ -9,7 +9,7 @@ md.transient.isprognostic=0; md.transient.isthermal=1; md.transient.isgroundingline=0; -md=solve(md,TransientSolutionEnum); +md=solve(md,TransientSolutionEnum()); %Fields and tolerances to track changes field_names ={'Temperature1','BasalforcingsMeltingRate1', ... Index: ../trunk-jpl/test/NightlyRun/test417.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test417.m (revision 13662) +++ ../trunk-jpl/test/NightlyRun/test417.m (revision 13663) @@ -49,7 +49,7 @@ md.diagnostic.reltol=10^-5; %tighten for qmu analyses -md=solve(md,DiagnosticSolutionEnum,'overwrite','y'); +md=solve(md,DiagnosticSolutionEnum(),'overwrite','y'); %Fields and tolerances to track changes md.qmu.results=md.results.dakota;