[25834] | 1 | Index: ../trunk-jpl/test/NightlyRun/test243.py
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/test/NightlyRun/test243.py (revision 25708)
|
---|
| 4 | +++ ../trunk-jpl/test/NightlyRun/test243.py (revision 25709)
|
---|
| 5 | @@ -63,23 +63,23 @@
|
---|
| 6 | #Run transient
|
---|
| 7 | md = solve(md, 'Transient')
|
---|
| 8 |
|
---|
| 9 | -nlayers = np.size(md.results.TransientSolution[0].SmbT, 1)
|
---|
| 10 | +nlayers = md.results.TransientSolution[0].SmbT.shape[1]
|
---|
| 11 | for i in range(1, len(md.results.TransientSolution)):
|
---|
| 12 | - nlayers = np.minimum(np.size(md.results.TransientSolution[i].SmbT, 1), nlayers)
|
---|
| 13 | + nlayers=np.minimum(md.results.TransientSolution[i].SmbT.shape[1], nlayers)
|
---|
| 14 |
|
---|
| 15 | #Fields and tolerances to track changes
|
---|
| 16 | field_names = ['Layers', 'SmbDz', 'SmbT', 'SmbD', 'SmbRe', 'SmbGdn', 'SmbGsp', 'SmbA', 'SmbEC', 'SmbMassBalance', 'SmbMAdd', 'SmbDzAdd', 'SmbFAC', 'SmbMeanSHF', 'SmbMeanLHF', 'SmbMeanULW', 'SmbNetLW', 'SmbNetSW']
|
---|
| 17 | field_tolerances = [1e-12, 2e-12, 1e-12, 1e-11, 1e-11, 2e-11, 1e-11, 1e-12, 1e-11, 1e-12, 1e-12, 1e-12, 1e-11, 2e-11, 2e-11, 1e-11, 9e-10, 2e-11]
|
---|
| 18 | -#shape is different in python solution (fixed using reshape) which can cause test failure:
|
---|
| 19 | +# Shape is different in python solution (fixed using reshape) which can cause test failure
|
---|
| 20 | field_values = [
|
---|
| 21 | nlayers,
|
---|
| 22 | - md.results.TransientSolution[-1].SmbDz[0, 0:nlayers],
|
---|
| 23 | - md.results.TransientSolution[-1].SmbT[0, 0:nlayers],
|
---|
| 24 | - md.results.TransientSolution[-1].SmbD[0, 0:nlayers],
|
---|
| 25 | - md.results.TransientSolution[-1].SmbRe[0, 0:nlayers],
|
---|
| 26 | - md.results.TransientSolution[-1].SmbGdn[0, 0:nlayers],
|
---|
| 27 | - md.results.TransientSolution[-1].SmbGsp[0, 0:nlayers],
|
---|
| 28 | - md.results.TransientSolution[-1].SmbA[0, 0:nlayers],
|
---|
| 29 | + md.results.TransientSolution[-1].SmbDz[0, 0:nlayers].reshape(1, -1),
|
---|
| 30 | + md.results.TransientSolution[-1].SmbT[0, 0:nlayers].reshape(1, -1),
|
---|
| 31 | + md.results.TransientSolution[-1].SmbD[0, 0:nlayers].reshape(1, -1),
|
---|
| 32 | + md.results.TransientSolution[-1].SmbRe[0, 0:nlayers].reshape(1, -1),
|
---|
| 33 | + md.results.TransientSolution[-1].SmbGdn[0, 0:nlayers].reshape(1, -1),
|
---|
| 34 | + md.results.TransientSolution[-1].SmbGsp[0, 0:nlayers].reshape(1, -1),
|
---|
| 35 | + md.results.TransientSolution[-1].SmbA[0, 0:nlayers].reshape(1, -1),
|
---|
| 36 | md.results.TransientSolution[-1].SmbEC[0],
|
---|
| 37 | md.results.TransientSolution[-1].SmbMassBalance[0],
|
---|
| 38 | md.results.TransientSolution[-1].SmbMAdd[0],
|
---|
| 39 | Index: ../trunk-jpl/test/NightlyRun/test252.py
|
---|
| 40 | ===================================================================
|
---|
| 41 | --- ../trunk-jpl/test/NightlyRun/test252.py (revision 25708)
|
---|
| 42 | +++ ../trunk-jpl/test/NightlyRun/test252.py (revision 25709)
|
---|
| 43 | @@ -69,68 +69,70 @@
|
---|
| 44 | #Run transient
|
---|
| 45 | md = solve(md, 'Transient')
|
---|
| 46 |
|
---|
| 47 | -nlayers=np.size(md.results.TransientSolution[0].SmbT,1)
|
---|
| 48 | -for i in range(1, np.size(md.results.TransientSolution,0)):
|
---|
| 49 | - nlayers=np.minimum(np.size(md.results.TransientSolution[i].SmbT,1),nlayers)
|
---|
| 50 | +nlayers = md.results.TransientSolution[0].SmbT.shape[1]
|
---|
| 51 | +for i in range(1, len(md.results.TransientSolution)):
|
---|
| 52 | + nlayers=np.minimum(md.results.TransientSolution[i].SmbT.shape[1], nlayers)
|
---|
| 53 |
|
---|
| 54 | #Fields and tolerances to track changes
|
---|
| 55 | -
|
---|
| 56 | field_names = ['Layers','SmbDz1', 'SmbT1', 'SmbD1', 'SmbRe1', 'SmbGdn1', 'SmbGsp1', 'SmbA1', 'SmbEC1', 'SmbMassBalance1', 'SmbMAdd1', 'SmbDzAdd1', 'SmbFAC1',
|
---|
| 57 | 'SmbDz2', 'SmbT2', 'SmbD2', 'SmbRe2', 'SmbGdn2', 'SmbGsp2', 'SmbA2', 'SmbEC2', 'SmbMassBalance2', 'SmbMAdd2', 'SmbDzAdd2', 'SmbFAC2',
|
---|
| 58 | 'SmbDz3', 'SmbT3', 'SmbD3', 'SmbRe3', 'SmbGdn3', 'SmbGsp3', 'SmbA3', 'SmbEC3', 'SmbMassBalance3', 'SmbMAdd3', 'SmbDzAdd3', 'SmbFAC3',
|
---|
| 59 | 'SmbDz4', 'SmbT4', 'SmbD4', 'SmbRe4', 'SmbGdn4', 'SmbGsp4', 'SmbA4', 'SmbEC4', 'SmbMassBalance4', 'SmbMAdd4', 'SmbDzAdd4', 'SmbFAC4']
|
---|
| 60 | -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,
|
---|
| 61 | - 1e-12,1e-12,1e-11,1e-10,2e-11,1e-11,1e-12,1e-11,1e-12,1e-12,1e-12,1e-11,
|
---|
| 62 | - 1e-12,1e-12,2e-12,2e-11,4e-11,1e-11,1e-12,1e-11,1e-11,1e-12,1e-12,1e-11,
|
---|
| 63 | - 1e-11,1e-11,4e-11,4e-11,1e-12,4e-11,1e-12,1e-12,1e-10,1e-12,1e-12,2e-11]
|
---|
| 64 | -
|
---|
| 65 | -
|
---|
| 66 | -#shape is different in python solution (fixed using reshape) which can cause test failure:
|
---|
| 67 | -field_values = [nlayers,md.results.TransientSolution[0].SmbDz[0, 0:nlayers].reshape(1, -1),
|
---|
| 68 | - md.results.TransientSolution[0].SmbT[0, 0:nlayers].reshape(1, -1),
|
---|
| 69 | - md.results.TransientSolution[0].SmbD[0, 0:nlayers].reshape(1, -1),
|
---|
| 70 | - md.results.TransientSolution[0].SmbRe[0, 0:nlayers].reshape(1, -1),
|
---|
| 71 | - md.results.TransientSolution[0].SmbGdn[0, 0:nlayers].reshape(1, -1),
|
---|
| 72 | - md.results.TransientSolution[0].SmbGsp[0, 0:nlayers].reshape(1, -1),
|
---|
| 73 | - md.results.TransientSolution[0].SmbA[0, 0:nlayers].reshape(1, -1),
|
---|
| 74 | - md.results.TransientSolution[0].SmbEC[0],
|
---|
| 75 | - md.results.TransientSolution[0].SmbMassBalance[0],
|
---|
| 76 | - md.results.TransientSolution[0].SmbMAdd[0],
|
---|
| 77 | - md.results.TransientSolution[0].SmbDzAdd[0],
|
---|
| 78 | - md.results.TransientSolution[0].SmbFAC[0],
|
---|
| 79 | - md.results.TransientSolution[145].SmbDz[0, 0:nlayers].reshape(1, -1),
|
---|
| 80 | - md.results.TransientSolution[145].SmbT[0, 0:nlayers].reshape(1, -1),
|
---|
| 81 | - md.results.TransientSolution[145].SmbD[0, 0:nlayers].reshape(1, -1),
|
---|
| 82 | - md.results.TransientSolution[145].SmbRe[0, 0:nlayers].reshape(1, -1),
|
---|
| 83 | - md.results.TransientSolution[145].SmbGdn[0, 0:nlayers].reshape(1, -1),
|
---|
| 84 | - md.results.TransientSolution[145].SmbGsp[0, 0:nlayers].reshape(1, -1),
|
---|
| 85 | - md.results.TransientSolution[145].SmbA[0, 0:nlayers].reshape(1, -1),
|
---|
| 86 | - md.results.TransientSolution[145].SmbEC[0],
|
---|
| 87 | - md.results.TransientSolution[145].SmbMassBalance[0],
|
---|
| 88 | - md.results.TransientSolution[145].SmbMAdd[0],
|
---|
| 89 | - md.results.TransientSolution[145].SmbDzAdd[0],
|
---|
| 90 | - md.results.TransientSolution[145].SmbFAC[0],
|
---|
| 91 | - md.results.TransientSolution[146].SmbDz[0, 0:nlayers].reshape(1, -1),
|
---|
| 92 | - md.results.TransientSolution[146].SmbT[0, 0:nlayers].reshape(1, -1),
|
---|
| 93 | - md.results.TransientSolution[146].SmbD[0, 0:nlayers].reshape(1, -1),
|
---|
| 94 | - md.results.TransientSolution[146].SmbRe[0, 0:nlayers].reshape(1, -1),
|
---|
| 95 | - md.results.TransientSolution[146].SmbGdn[0, 0:nlayers].reshape(1, -1),
|
---|
| 96 | - md.results.TransientSolution[146].SmbGsp[0, 0:nlayers].reshape(1, -1),
|
---|
| 97 | - md.results.TransientSolution[146].SmbA[0, 0:nlayers].reshape(1, -1),
|
---|
| 98 | - md.results.TransientSolution[146].SmbEC[0],
|
---|
| 99 | - md.results.TransientSolution[146].SmbMassBalance[0],
|
---|
| 100 | - md.results.TransientSolution[146].SmbMAdd[0],
|
---|
| 101 | - md.results.TransientSolution[146].SmbDzAdd[0],
|
---|
| 102 | - md.results.TransientSolution[146].SmbFAC[0],
|
---|
| 103 | - md.results.TransientSolution[-1].SmbDz[0, 0:nlayers].reshape(1, -1),
|
---|
| 104 | - md.results.TransientSolution[-1].SmbT[0, 0:nlayers].reshape(1, -1),
|
---|
| 105 | - md.results.TransientSolution[-1].SmbD[0, 0:nlayers].reshape(1, -1),
|
---|
| 106 | - md.results.TransientSolution[-1].SmbRe[0, 0:nlayers].reshape(1, -1),
|
---|
| 107 | - md.results.TransientSolution[-1].SmbGdn[0, 0:nlayers].reshape(1, -1),
|
---|
| 108 | - md.results.TransientSolution[-1].SmbGsp[0, 0:nlayers].reshape(1, -1),
|
---|
| 109 | - md.results.TransientSolution[-1].SmbA[0, 0:nlayers].reshape(1, -1),
|
---|
| 110 | - md.results.TransientSolution[-1].SmbEC[0],
|
---|
| 111 | - md.results.TransientSolution[-1].SmbMassBalance[0],
|
---|
| 112 | - md.results.TransientSolution[-1].SmbMAdd[0],
|
---|
| 113 | - md.results.TransientSolution[-1].SmbDzAdd[0],
|
---|
| 114 | - md.results.TransientSolution[-1].SmbFAC[0]]
|
---|
| 115 | +field_tolerances = [
|
---|
| 116 | + 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,
|
---|
| 117 | + 1e-12,1e-12,1e-11,1e-10,2e-11,1e-11,1e-12,1e-11,1e-12,1e-12,1e-12,1e-11,
|
---|
| 118 | + 1e-12,1e-12,2e-12,2e-11,4e-11,1e-11,1e-12,1e-11,1e-11,1e-12,1e-12,1e-11,
|
---|
| 119 | + 1e-11,1e-11,4e-11,4e-11,1e-12,4e-11,1e-12,1e-12,1e-10,1e-12,1e-12,2e-11
|
---|
| 120 | +]
|
---|
| 121 | +# Shape is different in python solution (fixed using reshape) which can cause test failure
|
---|
| 122 | +field_values = [
|
---|
| 123 | + nlayers,
|
---|
| 124 | + md.results.TransientSolution[0].SmbDz[0, 0:nlayers].reshape(1, -1),
|
---|
| 125 | + md.results.TransientSolution[0].SmbT[0, 0:nlayers].reshape(1, -1),
|
---|
| 126 | + md.results.TransientSolution[0].SmbD[0, 0:nlayers].reshape(1, -1),
|
---|
| 127 | + md.results.TransientSolution[0].SmbRe[0, 0:nlayers].reshape(1, -1),
|
---|
| 128 | + md.results.TransientSolution[0].SmbGdn[0, 0:nlayers].reshape(1, -1),
|
---|
| 129 | + md.results.TransientSolution[0].SmbGsp[0, 0:nlayers].reshape(1, -1),
|
---|
| 130 | + md.results.TransientSolution[0].SmbA[0, 0:nlayers].reshape(1, -1),
|
---|
| 131 | + md.results.TransientSolution[0].SmbEC[0],
|
---|
| 132 | + md.results.TransientSolution[0].SmbMassBalance[0],
|
---|
| 133 | + md.results.TransientSolution[0].SmbMAdd[0],
|
---|
| 134 | + md.results.TransientSolution[0].SmbDzAdd[0],
|
---|
| 135 | + md.results.TransientSolution[0].SmbFAC[0],
|
---|
| 136 | + md.results.TransientSolution[145].SmbDz[0, 0:nlayers].reshape(1, -1),
|
---|
| 137 | + md.results.TransientSolution[145].SmbT[0, 0:nlayers].reshape(1, -1),
|
---|
| 138 | + md.results.TransientSolution[145].SmbD[0, 0:nlayers].reshape(1, -1),
|
---|
| 139 | + md.results.TransientSolution[145].SmbRe[0, 0:nlayers].reshape(1, -1),
|
---|
| 140 | + md.results.TransientSolution[145].SmbGdn[0, 0:nlayers].reshape(1, -1),
|
---|
| 141 | + md.results.TransientSolution[145].SmbGsp[0, 0:nlayers].reshape(1, -1),
|
---|
| 142 | + md.results.TransientSolution[145].SmbA[0, 0:nlayers].reshape(1, -1),
|
---|
| 143 | + md.results.TransientSolution[145].SmbEC[0],
|
---|
| 144 | + md.results.TransientSolution[145].SmbMassBalance[0],
|
---|
| 145 | + md.results.TransientSolution[145].SmbMAdd[0],
|
---|
| 146 | + md.results.TransientSolution[145].SmbDzAdd[0],
|
---|
| 147 | + md.results.TransientSolution[145].SmbFAC[0],
|
---|
| 148 | + md.results.TransientSolution[146].SmbDz[0, 0:nlayers].reshape(1, -1),
|
---|
| 149 | + md.results.TransientSolution[146].SmbT[0, 0:nlayers].reshape(1, -1),
|
---|
| 150 | + md.results.TransientSolution[146].SmbD[0, 0:nlayers].reshape(1, -1),
|
---|
| 151 | + md.results.TransientSolution[146].SmbRe[0, 0:nlayers].reshape(1, -1),
|
---|
| 152 | + md.results.TransientSolution[146].SmbGdn[0, 0:nlayers].reshape(1, -1),
|
---|
| 153 | + md.results.TransientSolution[146].SmbGsp[0, 0:nlayers].reshape(1, -1),
|
---|
| 154 | + md.results.TransientSolution[146].SmbA[0, 0:nlayers].reshape(1, -1),
|
---|
| 155 | + md.results.TransientSolution[146].SmbEC[0],
|
---|
| 156 | + md.results.TransientSolution[146].SmbMassBalance[0],
|
---|
| 157 | + md.results.TransientSolution[146].SmbMAdd[0],
|
---|
| 158 | + md.results.TransientSolution[146].SmbDzAdd[0],
|
---|
| 159 | + md.results.TransientSolution[146].SmbFAC[0],
|
---|
| 160 | + md.results.TransientSolution[-1].SmbDz[0, 0:nlayers].reshape(1, -1),
|
---|
| 161 | + md.results.TransientSolution[-1].SmbT[0, 0:nlayers].reshape(1, -1),
|
---|
| 162 | + md.results.TransientSolution[-1].SmbD[0, 0:nlayers].reshape(1, -1),
|
---|
| 163 | + md.results.TransientSolution[-1].SmbRe[0, 0:nlayers].reshape(1, -1),
|
---|
| 164 | + md.results.TransientSolution[-1].SmbGdn[0, 0:nlayers].reshape(1, -1),
|
---|
| 165 | + md.results.TransientSolution[-1].SmbGsp[0, 0:nlayers].reshape(1, -1),
|
---|
| 166 | + md.results.TransientSolution[-1].SmbA[0, 0:nlayers].reshape(1, -1),
|
---|
| 167 | + md.results.TransientSolution[-1].SmbEC[0],
|
---|
| 168 | + md.results.TransientSolution[-1].SmbMassBalance[0],
|
---|
| 169 | + md.results.TransientSolution[-1].SmbMAdd[0],
|
---|
| 170 | + md.results.TransientSolution[-1].SmbDzAdd[0],
|
---|
| 171 | + md.results.TransientSolution[-1].SmbFAC[0]
|
---|
| 172 | +]
|
---|
| 173 | Index: ../trunk-jpl/test/NightlyRun/test244.py
|
---|
| 174 | ===================================================================
|
---|
| 175 | --- ../trunk-jpl/test/NightlyRun/test244.py (revision 25708)
|
---|
| 176 | +++ ../trunk-jpl/test/NightlyRun/test244.py (revision 25709)
|
---|
| 177 | @@ -94,7 +94,7 @@
|
---|
| 178 | 'lower', .95 * np.ones((npart, 1)),
|
---|
| 179 | 'upper', upper,
|
---|
| 180 | 'partition', partition
|
---|
| 181 | - )
|
---|
| 182 | +)
|
---|
| 183 |
|
---|
| 184 | #responses
|
---|
| 185 | md.qmu.responses.IceVolume = response_function.response_function('descriptor','IceVolume')
|
---|
| 186 | Index: ../trunk-jpl/test/NightlyRun/test253.py
|
---|
| 187 | ===================================================================
|
---|
| 188 | --- ../trunk-jpl/test/NightlyRun/test253.py (revision 25708)
|
---|
| 189 | +++ ../trunk-jpl/test/NightlyRun/test253.py (revision 25709)
|
---|
| 190 | @@ -70,67 +70,74 @@
|
---|
| 191 | #Run transient
|
---|
| 192 | md = solve(md, 'Transient')
|
---|
| 193 |
|
---|
| 194 | -nlayers=np.size(md.results.TransientSolution[0].SmbT,1)
|
---|
| 195 | -for i in range(1, np.size(md.results.TransientSolution,0)):
|
---|
| 196 | - nlayers=np.minimum(np.size(md.results.TransientSolution[i].SmbT,1),nlayers)
|
---|
| 197 | +nlayers = md.results.TransientSolution[0].SmbT.shape[1]
|
---|
| 198 | +for i in range(1, len(md.results.TransientSolution)):
|
---|
| 199 | + nlayers=np.minimum(md.results.TransientSolution[i].SmbT.shape[1], nlayers)
|
---|
| 200 |
|
---|
| 201 | #Fields and tolerances to track changes
|
---|
| 202 | -
|
---|
| 203 | -field_names = ['Layers','SmbDz1', 'SmbT1', 'SmbD1', 'SmbRe1', 'SmbGdn1', 'SmbGsp1', 'SmbA1', 'SmbEC1', 'SmbMassBalance1', 'SmbMAdd1', 'SmbDzAdd1', 'SmbFAC1',
|
---|
| 204 | - 'SmbDz2', 'SmbT2', 'SmbD2', 'SmbRe2', 'SmbGdn2', 'SmbGsp2', 'SmbA2', 'SmbEC2', 'SmbMassBalance2', 'SmbMAdd2', 'SmbDzAdd2', 'SmbFAC2',
|
---|
| 205 | - 'SmbDz3', 'SmbT3', 'SmbD3', 'SmbRe3', 'SmbGdn3', 'SmbGsp3', 'SmbA3', 'SmbEC3', 'SmbMassBalance3', 'SmbMAdd3', 'SmbDzAdd3', 'SmbFAC3',
|
---|
| 206 | - 'SmbDz4', 'SmbT4', 'SmbD4', 'SmbRe4', 'SmbGdn4', 'SmbGsp4', 'SmbA4', 'SmbEC4', 'SmbMassBalance4', 'SmbMAdd4', 'SmbDzAdd4', 'SmbFAC4']
|
---|
| 207 | -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,
|
---|
| 208 | - 1e-12,1e-12,1e-11,1e-10,4e-11,1e-11,1e-12,1e-11,1e-12,1e-12,1e-12,1e-11,
|
---|
| 209 | - 1e-12,1e-12,2e-12,2e-11,1e-10,1e-11,1e-12,1e-11,1e-11,1e-12,1e-12,1e-11,
|
---|
| 210 | - 1e-11,1e-11,1e-10,1e-11,1e-12,3e-11,1e-12,4e-12,1e-10,1e-12,1e-12,2e-11]
|
---|
| 211 | -
|
---|
| 212 | -#shape is different in python solution (fixed using reshape) which can cause test failure:
|
---|
| 213 | -field_values = [nlayers,md.results.TransientSolution[0].SmbDz[0, 0:nlayers].reshape(1, -1),
|
---|
| 214 | - md.results.TransientSolution[0].SmbT[0, 0:nlayers].reshape(1, -1),
|
---|
| 215 | - md.results.TransientSolution[0].SmbD[0, 0:nlayers].reshape(1, -1),
|
---|
| 216 | - md.results.TransientSolution[0].SmbRe[0, 0:nlayers].reshape(1, -1),
|
---|
| 217 | - md.results.TransientSolution[0].SmbGdn[0, 0:nlayers].reshape(1, -1),
|
---|
| 218 | - md.results.TransientSolution[0].SmbGsp[0, 0:nlayers].reshape(1, -1),
|
---|
| 219 | - md.results.TransientSolution[0].SmbA[0, 0:nlayers].reshape(1, -1),
|
---|
| 220 | - md.results.TransientSolution[0].SmbEC[0],
|
---|
| 221 | - md.results.TransientSolution[0].SmbMassBalance[0],
|
---|
| 222 | - md.results.TransientSolution[0].SmbMAdd[0],
|
---|
| 223 | - md.results.TransientSolution[0].SmbDzAdd[0],
|
---|
| 224 | - md.results.TransientSolution[0].SmbFAC[0],
|
---|
| 225 | - md.results.TransientSolution[145].SmbDz[0, 0:nlayers].reshape(1, -1),
|
---|
| 226 | - md.results.TransientSolution[145].SmbT[0, 0:nlayers].reshape(1, -1),
|
---|
| 227 | - md.results.TransientSolution[145].SmbD[0, 0:nlayers].reshape(1, -1),
|
---|
| 228 | - md.results.TransientSolution[145].SmbRe[0, 0:nlayers].reshape(1, -1),
|
---|
| 229 | - md.results.TransientSolution[145].SmbGdn[0, 0:nlayers].reshape(1, -1),
|
---|
| 230 | - md.results.TransientSolution[145].SmbGsp[0, 0:nlayers].reshape(1, -1),
|
---|
| 231 | - md.results.TransientSolution[145].SmbA[0, 0:nlayers].reshape(1, -1),
|
---|
| 232 | - md.results.TransientSolution[145].SmbEC[0],
|
---|
| 233 | - md.results.TransientSolution[145].SmbMassBalance[0],
|
---|
| 234 | - md.results.TransientSolution[145].SmbMAdd[0],
|
---|
| 235 | - md.results.TransientSolution[145].SmbDzAdd[0],
|
---|
| 236 | - md.results.TransientSolution[145].SmbFAC[0],
|
---|
| 237 | - md.results.TransientSolution[146].SmbDz[0, 0:nlayers].reshape(1, -1),
|
---|
| 238 | - md.results.TransientSolution[146].SmbT[0, 0:nlayers].reshape(1, -1),
|
---|
| 239 | - md.results.TransientSolution[146].SmbD[0, 0:nlayers].reshape(1, -1),
|
---|
| 240 | - md.results.TransientSolution[146].SmbRe[0, 0:nlayers].reshape(1, -1),
|
---|
| 241 | - md.results.TransientSolution[146].SmbGdn[0, 0:nlayers].reshape(1, -1),
|
---|
| 242 | - md.results.TransientSolution[146].SmbGsp[0, 0:nlayers].reshape(1, -1),
|
---|
| 243 | - md.results.TransientSolution[146].SmbA[0, 0:nlayers].reshape(1, -1),
|
---|
| 244 | - md.results.TransientSolution[146].SmbEC[0],
|
---|
| 245 | - md.results.TransientSolution[146].SmbMassBalance[0],
|
---|
| 246 | - md.results.TransientSolution[146].SmbMAdd[0],
|
---|
| 247 | - md.results.TransientSolution[146].SmbDzAdd[0],
|
---|
| 248 | - md.results.TransientSolution[146].SmbFAC[0],
|
---|
| 249 | - md.results.TransientSolution[-1].SmbDz[0, 0:nlayers].reshape(1, -1),
|
---|
| 250 | - md.results.TransientSolution[-1].SmbT[0, 0:nlayers].reshape(1, -1),
|
---|
| 251 | - md.results.TransientSolution[-1].SmbD[0, 0:nlayers].reshape(1, -1),
|
---|
| 252 | - md.results.TransientSolution[-1].SmbRe[0, 0:nlayers].reshape(1, -1),
|
---|
| 253 | - md.results.TransientSolution[-1].SmbGdn[0, 0:nlayers].reshape(1, -1),
|
---|
| 254 | - md.results.TransientSolution[-1].SmbGsp[0, 0:nlayers].reshape(1, -1),
|
---|
| 255 | - md.results.TransientSolution[-1].SmbA[0, 0:nlayers].reshape(1, -1),
|
---|
| 256 | - md.results.TransientSolution[-1].SmbEC[0],
|
---|
| 257 | - md.results.TransientSolution[-1].SmbMassBalance[0],
|
---|
| 258 | - md.results.TransientSolution[-1].SmbMAdd[0],
|
---|
| 259 | - md.results.TransientSolution[-1].SmbDzAdd[0],
|
---|
| 260 | - md.results.TransientSolution[-1].SmbFAC[0]]
|
---|
| 261 | +field_names = [
|
---|
| 262 | + 'Layers',
|
---|
| 263 | + 'SmbDz1', 'SmbT1', 'SmbD1', 'SmbRe1', 'SmbGdn1', 'SmbGsp1', 'SmbA1', 'SmbEC1', 'SmbMassBalance1', 'SmbMAdd1', 'SmbDzAdd1', 'SmbFAC1',
|
---|
| 264 | + 'SmbDz2', 'SmbT2', 'SmbD2', 'SmbRe2', 'SmbGdn2', 'SmbGsp2', 'SmbA2', 'SmbEC2', 'SmbMassBalance2', 'SmbMAdd2', 'SmbDzAdd2', 'SmbFAC2',
|
---|
| 265 | + 'SmbDz3', 'SmbT3', 'SmbD3', 'SmbRe3', 'SmbGdn3', 'SmbGsp3', 'SmbA3', 'SmbEC3', 'SmbMassBalance3', 'SmbMAdd3', 'SmbDzAdd3', 'SmbFAC3',
|
---|
| 266 | + 'SmbDz4', 'SmbT4', 'SmbD4', 'SmbRe4', 'SmbGdn4', 'SmbGsp4', 'SmbA4', 'SmbEC4', 'SmbMassBalance4', 'SmbMAdd4', 'SmbDzAdd4', 'SmbFAC4'
|
---|
| 267 | +]
|
---|
| 268 | +field_tolerances = [
|
---|
| 269 | + 1e-12,
|
---|
| 270 | + 1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,
|
---|
| 271 | + 1e-12,1e-12,1e-11,1e-10,4e-11,1e-11,1e-12,1e-11,1e-12,1e-12,1e-12,1e-11,
|
---|
| 272 | + 1e-12,1e-12,2e-12,2e-11,1e-10,1e-11,1e-12,1e-11,1e-11,1e-12,1e-12,1e-11,
|
---|
| 273 | + 1e-11,1e-11,1e-10,1e-11,1e-12,3e-11,1e-12,4e-12,1e-10,1e-12,1e-12,2e-11
|
---|
| 274 | +]
|
---|
| 275 | +# Shape is different in python solution (fixed using reshape) which can cause test failure
|
---|
| 276 | +field_values = [
|
---|
| 277 | + nlayers,
|
---|
| 278 | + md.results.TransientSolution[0].SmbDz[0, 0:nlayers].reshape(1, -1),
|
---|
| 279 | + md.results.TransientSolution[0].SmbT[0, 0:nlayers].reshape(1, -1),
|
---|
| 280 | + md.results.TransientSolution[0].SmbD[0, 0:nlayers].reshape(1, -1),
|
---|
| 281 | + md.results.TransientSolution[0].SmbRe[0, 0:nlayers].reshape(1, -1),
|
---|
| 282 | + md.results.TransientSolution[0].SmbGdn[0, 0:nlayers].reshape(1, -1),
|
---|
| 283 | + md.results.TransientSolution[0].SmbGsp[0, 0:nlayers].reshape(1, -1),
|
---|
| 284 | + md.results.TransientSolution[0].SmbA[0, 0:nlayers].reshape(1, -1),
|
---|
| 285 | + md.results.TransientSolution[0].SmbEC[0],
|
---|
| 286 | + md.results.TransientSolution[0].SmbMassBalance[0],
|
---|
| 287 | + md.results.TransientSolution[0].SmbMAdd[0],
|
---|
| 288 | + md.results.TransientSolution[0].SmbDzAdd[0],
|
---|
| 289 | + md.results.TransientSolution[0].SmbFAC[0],
|
---|
| 290 | + md.results.TransientSolution[145].SmbDz[0, 0:nlayers].reshape(1, -1),
|
---|
| 291 | + md.results.TransientSolution[145].SmbT[0, 0:nlayers].reshape(1, -1),
|
---|
| 292 | + md.results.TransientSolution[145].SmbD[0, 0:nlayers].reshape(1, -1),
|
---|
| 293 | + md.results.TransientSolution[145].SmbRe[0, 0:nlayers].reshape(1, -1),
|
---|
| 294 | + md.results.TransientSolution[145].SmbGdn[0, 0:nlayers].reshape(1, -1),
|
---|
| 295 | + md.results.TransientSolution[145].SmbGsp[0, 0:nlayers].reshape(1, -1),
|
---|
| 296 | + md.results.TransientSolution[145].SmbA[0, 0:nlayers].reshape(1, -1),
|
---|
| 297 | + md.results.TransientSolution[145].SmbEC[0],
|
---|
| 298 | + md.results.TransientSolution[145].SmbMassBalance[0],
|
---|
| 299 | + md.results.TransientSolution[145].SmbMAdd[0],
|
---|
| 300 | + md.results.TransientSolution[145].SmbDzAdd[0],
|
---|
| 301 | + md.results.TransientSolution[145].SmbFAC[0],
|
---|
| 302 | + md.results.TransientSolution[146].SmbDz[0, 0:nlayers].reshape(1, -1),
|
---|
| 303 | + md.results.TransientSolution[146].SmbT[0, 0:nlayers].reshape(1, -1),
|
---|
| 304 | + md.results.TransientSolution[146].SmbD[0, 0:nlayers].reshape(1, -1),
|
---|
| 305 | + md.results.TransientSolution[146].SmbRe[0, 0:nlayers].reshape(1, -1),
|
---|
| 306 | + md.results.TransientSolution[146].SmbGdn[0, 0:nlayers].reshape(1, -1),
|
---|
| 307 | + md.results.TransientSolution[146].SmbGsp[0, 0:nlayers].reshape(1, -1),
|
---|
| 308 | + md.results.TransientSolution[146].SmbA[0, 0:nlayers].reshape(1, -1),
|
---|
| 309 | + md.results.TransientSolution[146].SmbEC[0],
|
---|
| 310 | + md.results.TransientSolution[146].SmbMassBalance[0],
|
---|
| 311 | + md.results.TransientSolution[146].SmbMAdd[0],
|
---|
| 312 | + md.results.TransientSolution[146].SmbDzAdd[0],
|
---|
| 313 | + md.results.TransientSolution[146].SmbFAC[0],
|
---|
| 314 | + md.results.TransientSolution[-1].SmbDz[0, 0:nlayers].reshape(1, -1),
|
---|
| 315 | + md.results.TransientSolution[-1].SmbT[0, 0:nlayers].reshape(1, -1),
|
---|
| 316 | + md.results.TransientSolution[-1].SmbD[0, 0:nlayers].reshape(1, -1),
|
---|
| 317 | + md.results.TransientSolution[-1].SmbRe[0, 0:nlayers].reshape(1, -1),
|
---|
| 318 | + md.results.TransientSolution[-1].SmbGdn[0, 0:nlayers].reshape(1, -1),
|
---|
| 319 | + md.results.TransientSolution[-1].SmbGsp[0, 0:nlayers].reshape(1, -1),
|
---|
| 320 | + md.results.TransientSolution[-1].SmbA[0, 0:nlayers].reshape(1, -1),
|
---|
| 321 | + md.results.TransientSolution[-1].SmbEC[0],
|
---|
| 322 | + md.results.TransientSolution[-1].SmbMassBalance[0],
|
---|
| 323 | + md.results.TransientSolution[-1].SmbMAdd[0],
|
---|
| 324 | + md.results.TransientSolution[-1].SmbDzAdd[0],
|
---|
| 325 | + md.results.TransientSolution[-1].SmbFAC[0]
|
---|
| 326 | +]
|
---|