Index: ../trunk-jpl/test/NightlyRun/test328.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test328.m (revision 17080) +++ ../trunk-jpl/test/NightlyRun/test328.m (revision 17081) @@ -2,7 +2,7 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setflowequation(md,'SSA','all'); -md.surfaceforcings.issmbgradients=1; +md.surfaceforcings = SMBgradients(); md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y; md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y; md.surfaceforcings.href=md.geometry.surface; Index: ../trunk-jpl/test/NightlyRun/test329.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test329.py (revision 17080) +++ ../trunk-jpl/test/NightlyRun/test329.py (revision 17081) @@ -14,7 +14,7 @@ md=parameterize(md,'../Par/SquareSheetConstrained.py') md.extrude(3,1) md=setflowequation(md,'HO','all') -md.surfaceforcings.issmbgradients=1 +md.surfaceforcings = SMBgradients(); md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y md.surfaceforcings.href=copy.deepcopy(md.geometry.surface).reshape(-1) Index: ../trunk-jpl/test/NightlyRun/test329.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test329.m (revision 17080) +++ ../trunk-jpl/test/NightlyRun/test329.m (revision 17081) @@ -3,7 +3,7 @@ md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=extrude(md,3,1.); md=setflowequation(md,'HO','all'); -md.surfaceforcings.issmbgradients=1; +md.surfaceforcings = SMBgradients(); md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y; md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y; md.surfaceforcings.href=md.geometry.surface; Index: ../trunk-jpl/test/NightlyRun/test236.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test236.py (revision 17080) +++ ../trunk-jpl/test/NightlyRun/test236.py (revision 17081) @@ -12,7 +12,7 @@ md=setmask(md,'all','') # Use of ispdd and isdelta18o methods -md.surfaceforcings.ispdd=1 +md.surfaceforcings = SMBpdd(); md.surfaceforcings.isdelta18o=1 md=parameterize(md,'../Par/SquareShelf.py') Index: ../trunk-jpl/test/NightlyRun/test237.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test237.py (revision 17080) +++ ../trunk-jpl/test/NightlyRun/test237.py (revision 17081) @@ -12,7 +12,7 @@ md=setmask(md,'all','') # Use of ispdd and isdelta18o methods -md.surfaceforcings.ispdd=1 +md.surfaceforcings = SMBpdd(); md.surfaceforcings.isdelta18o=1 md=parameterize(md,'../Par/SquareShelf.py') Index: ../trunk-jpl/test/NightlyRun/test236.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test236.m (revision 17080) +++ ../trunk-jpl/test/NightlyRun/test236.m (revision 17081) @@ -2,7 +2,7 @@ md=setmask(md,'all',''); % Use of ispdd and isdelta18o methods -md.surfaceforcings.ispdd=1; +md.surfaceforcings = SMBpdd(); md.surfaceforcings.isdelta18o=1; md=parameterize(md,'../Par/SquareShelf.par'); Index: ../trunk-jpl/test/NightlyRun/test237.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test237.m (revision 17080) +++ ../trunk-jpl/test/NightlyRun/test237.m (revision 17081) @@ -2,7 +2,7 @@ md=setmask(md,'all',''); % Use of ispdd and isdelta18o methods -md.surfaceforcings.ispdd=1; +md.surfaceforcings = SMBpdd(); md.surfaceforcings.isdelta18o=1; md=parameterize(md,'../Par/SquareShelf.par'); Index: ../trunk-jpl/test/NightlyRun/test328.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test328.py (revision 17080) +++ ../trunk-jpl/test/NightlyRun/test328.py (revision 17081) @@ -13,7 +13,7 @@ md=setmask(md,'','') md=parameterize(md,'../Par/SquareSheetConstrained.py') md=setflowequation(md,'SSA','all') -md.surfaceforcings.issmbgradients=1 +md.surfaceforcings = SMBgradients(); md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y md.transient.requested_outputs=['default','TotalSmb']