[17802] | 1 | Index: ../trunk-jpl/test/NightlyRun/test328.m
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/test/NightlyRun/test328.m (revision 17080)
|
---|
| 4 | +++ ../trunk-jpl/test/NightlyRun/test328.m (revision 17081)
|
---|
| 5 | @@ -2,7 +2,7 @@
|
---|
| 6 | md=setmask(md,'','');
|
---|
| 7 | md=parameterize(md,'../Par/SquareSheetConstrained.par');
|
---|
| 8 | md=setflowequation(md,'SSA','all');
|
---|
| 9 | -md.surfaceforcings.issmbgradients=1;
|
---|
| 10 | +md.surfaceforcings = SMBgradients();
|
---|
| 11 | md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y;
|
---|
| 12 | md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y;
|
---|
| 13 | md.surfaceforcings.href=md.geometry.surface;
|
---|
| 14 | Index: ../trunk-jpl/test/NightlyRun/test329.py
|
---|
| 15 | ===================================================================
|
---|
| 16 | --- ../trunk-jpl/test/NightlyRun/test329.py (revision 17080)
|
---|
| 17 | +++ ../trunk-jpl/test/NightlyRun/test329.py (revision 17081)
|
---|
| 18 | @@ -14,7 +14,7 @@
|
---|
| 19 | md=parameterize(md,'../Par/SquareSheetConstrained.py')
|
---|
| 20 | md.extrude(3,1)
|
---|
| 21 | md=setflowequation(md,'HO','all')
|
---|
| 22 | -md.surfaceforcings.issmbgradients=1
|
---|
| 23 | +md.surfaceforcings = SMBgradients();
|
---|
| 24 | md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y
|
---|
| 25 | md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y
|
---|
| 26 | md.surfaceforcings.href=copy.deepcopy(md.geometry.surface).reshape(-1)
|
---|
| 27 | Index: ../trunk-jpl/test/NightlyRun/test329.m
|
---|
| 28 | ===================================================================
|
---|
| 29 | --- ../trunk-jpl/test/NightlyRun/test329.m (revision 17080)
|
---|
| 30 | +++ ../trunk-jpl/test/NightlyRun/test329.m (revision 17081)
|
---|
| 31 | @@ -3,7 +3,7 @@
|
---|
| 32 | md=parameterize(md,'../Par/SquareSheetConstrained.par');
|
---|
| 33 | md=extrude(md,3,1.);
|
---|
| 34 | md=setflowequation(md,'HO','all');
|
---|
| 35 | -md.surfaceforcings.issmbgradients=1;
|
---|
| 36 | +md.surfaceforcings = SMBgradients();
|
---|
| 37 | md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y;
|
---|
| 38 | md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y;
|
---|
| 39 | md.surfaceforcings.href=md.geometry.surface;
|
---|
| 40 | Index: ../trunk-jpl/test/NightlyRun/test236.py
|
---|
| 41 | ===================================================================
|
---|
| 42 | --- ../trunk-jpl/test/NightlyRun/test236.py (revision 17080)
|
---|
| 43 | +++ ../trunk-jpl/test/NightlyRun/test236.py (revision 17081)
|
---|
| 44 | @@ -12,7 +12,7 @@
|
---|
| 45 | md=setmask(md,'all','')
|
---|
| 46 |
|
---|
| 47 | # Use of ispdd and isdelta18o methods
|
---|
| 48 | -md.surfaceforcings.ispdd=1
|
---|
| 49 | +md.surfaceforcings = SMBpdd();
|
---|
| 50 | md.surfaceforcings.isdelta18o=1
|
---|
| 51 |
|
---|
| 52 | md=parameterize(md,'../Par/SquareShelf.py')
|
---|
| 53 | Index: ../trunk-jpl/test/NightlyRun/test237.py
|
---|
| 54 | ===================================================================
|
---|
| 55 | --- ../trunk-jpl/test/NightlyRun/test237.py (revision 17080)
|
---|
| 56 | +++ ../trunk-jpl/test/NightlyRun/test237.py (revision 17081)
|
---|
| 57 | @@ -12,7 +12,7 @@
|
---|
| 58 | md=setmask(md,'all','')
|
---|
| 59 |
|
---|
| 60 | # Use of ispdd and isdelta18o methods
|
---|
| 61 | -md.surfaceforcings.ispdd=1
|
---|
| 62 | +md.surfaceforcings = SMBpdd();
|
---|
| 63 | md.surfaceforcings.isdelta18o=1
|
---|
| 64 |
|
---|
| 65 | md=parameterize(md,'../Par/SquareShelf.py')
|
---|
| 66 | Index: ../trunk-jpl/test/NightlyRun/test236.m
|
---|
| 67 | ===================================================================
|
---|
| 68 | --- ../trunk-jpl/test/NightlyRun/test236.m (revision 17080)
|
---|
| 69 | +++ ../trunk-jpl/test/NightlyRun/test236.m (revision 17081)
|
---|
| 70 | @@ -2,7 +2,7 @@
|
---|
| 71 | md=setmask(md,'all','');
|
---|
| 72 |
|
---|
| 73 | % Use of ispdd and isdelta18o methods
|
---|
| 74 | -md.surfaceforcings.ispdd=1;
|
---|
| 75 | +md.surfaceforcings = SMBpdd();
|
---|
| 76 | md.surfaceforcings.isdelta18o=1;
|
---|
| 77 |
|
---|
| 78 | md=parameterize(md,'../Par/SquareShelf.par');
|
---|
| 79 | Index: ../trunk-jpl/test/NightlyRun/test237.m
|
---|
| 80 | ===================================================================
|
---|
| 81 | --- ../trunk-jpl/test/NightlyRun/test237.m (revision 17080)
|
---|
| 82 | +++ ../trunk-jpl/test/NightlyRun/test237.m (revision 17081)
|
---|
| 83 | @@ -2,7 +2,7 @@
|
---|
| 84 | md=setmask(md,'all','');
|
---|
| 85 |
|
---|
| 86 | % Use of ispdd and isdelta18o methods
|
---|
| 87 | -md.surfaceforcings.ispdd=1;
|
---|
| 88 | +md.surfaceforcings = SMBpdd();
|
---|
| 89 | md.surfaceforcings.isdelta18o=1;
|
---|
| 90 |
|
---|
| 91 | md=parameterize(md,'../Par/SquareShelf.par');
|
---|
| 92 | Index: ../trunk-jpl/test/NightlyRun/test328.py
|
---|
| 93 | ===================================================================
|
---|
| 94 | --- ../trunk-jpl/test/NightlyRun/test328.py (revision 17080)
|
---|
| 95 | +++ ../trunk-jpl/test/NightlyRun/test328.py (revision 17081)
|
---|
| 96 | @@ -13,7 +13,7 @@
|
---|
| 97 | md=setmask(md,'','')
|
---|
| 98 | md=parameterize(md,'../Par/SquareSheetConstrained.py')
|
---|
| 99 | md=setflowequation(md,'SSA','all')
|
---|
| 100 | -md.surfaceforcings.issmbgradients=1
|
---|
| 101 | +md.surfaceforcings = SMBgradients();
|
---|
| 102 | md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y
|
---|
| 103 | md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y
|
---|
| 104 | md.transient.requested_outputs=['default','TotalSmb']
|
---|