|
37 | 37 | { |
38 | 38 | "cell_type": "code", |
39 | 39 | "execution_count": 1, |
40 | | - "metadata": { |
41 | | - "collapsed": false |
42 | | - }, |
| 40 | + "metadata": {}, |
43 | 41 | "outputs": [], |
44 | 42 | "source": [ |
45 | 43 | "import numpy as np\n", |
46 | | - "from landlab import RasterModelGrid\n", |
| 44 | + "from landlab import RasterModelGrid, FieldError\n", |
47 | 45 | "from landlab.components import LinearDiffuser\n", |
48 | 46 | "\n", |
49 | 47 | "mg = RasterModelGrid((3, 4), 1.)" |
|
59 | 57 | { |
60 | 58 | "cell_type": "code", |
61 | 59 | "execution_count": 2, |
62 | | - "metadata": { |
63 | | - "collapsed": false |
64 | | - }, |
| 60 | + "metadata": {}, |
65 | 61 | "outputs": [ |
66 | 62 | { |
67 | 63 | "data": { |
|
83 | 79 | { |
84 | 80 | "cell_type": "code", |
85 | 81 | "execution_count": 3, |
86 | | - "metadata": { |
87 | | - "collapsed": false |
88 | | - }, |
| 82 | + "metadata": {}, |
89 | 83 | "outputs": [ |
90 | 84 | { |
91 | 85 | "data": { |
|
131 | 125 | { |
132 | 126 | "cell_type": "code", |
133 | 127 | "execution_count": 4, |
134 | | - "metadata": { |
135 | | - "collapsed": false |
136 | | - }, |
| 128 | + "metadata": {}, |
137 | 129 | "outputs": [ |
138 | 130 | { |
139 | 131 | "name": "stdout", |
|
173 | 165 | { |
174 | 166 | "cell_type": "code", |
175 | 167 | "execution_count": 6, |
176 | | - "metadata": { |
177 | | - "collapsed": false |
178 | | - }, |
| 168 | + "metadata": {}, |
179 | 169 | "outputs": [ |
180 | 170 | { |
181 | | - "ename": "FieldError", |
182 | | - "evalue": "field__number_one: already exists", |
183 | | - "output_type": "error", |
184 | | - "traceback": [ |
185 | | - "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m", |
186 | | - "\u001b[0;31mFieldError\u001b[0m Traceback (most recent call last)", |
187 | | - "\u001b[0;32m<ipython-input-6-2aabe11f9114>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0mno_1c\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mmg\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0madd_field\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m'node'\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m'field__number_one'\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0minput_array\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mcopy\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0mFalse\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0munits\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;34m'm'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m", |
188 | | - "\u001b[0;32m/Users/danhobley/git_landlab/landlab/field/grouped.pyc\u001b[0m in \u001b[0;36madd_field\u001b[0;34m(self, *args, **kwds)\u001b[0m\n\u001b[1;32m 716\u001b[0m \u001b[0;32mraise\u001b[0m \u001b[0mValueError\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m'number of arguments must be 2 or 3'\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 717\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m--> 718\u001b[0;31m \u001b[0;32mreturn\u001b[0m \u001b[0mself\u001b[0m\u001b[0;34m[\u001b[0m\u001b[0mgroup\u001b[0m\u001b[0;34m]\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0madd_field\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mname\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mvalue_array\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m**\u001b[0m\u001b[0mkwds\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 719\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 720\u001b[0m \u001b[0;32mdef\u001b[0m \u001b[0mset_units\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mself\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mgroup\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0mname\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0munits\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n", |
189 | | - "\u001b[0;32m/Users/danhobley/git_landlab/landlab/field/scalar_data_fields.pyc\u001b[0m in \u001b[0;36madd_field\u001b[0;34m(self, name, value_array, units, copy, noclobber, **kwds)\u001b[0m\n\u001b[1;32m 376\u001b[0m \"\"\"\n\u001b[1;32m 377\u001b[0m \u001b[0;32mif\u001b[0m \u001b[0mnoclobber\u001b[0m \u001b[0;32mand\u001b[0m \u001b[0mname\u001b[0m \u001b[0;32min\u001b[0m \u001b[0mself\u001b[0m\u001b[0;34m:\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0;32m--> 378\u001b[0;31m \u001b[0;32mraise\u001b[0m \u001b[0mFieldError\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m'{name}: already exists'\u001b[0m\u001b[0;34m.\u001b[0m \u001b[0mformat\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mname\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0mname\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m\u001b[1;32m 379\u001b[0m \u001b[0;34m\u001b[0m\u001b[0m\n\u001b[1;32m 380\u001b[0m \u001b[0mvalue_array\u001b[0m \u001b[0;34m=\u001b[0m \u001b[0mnp\u001b[0m\u001b[0;34m.\u001b[0m\u001b[0masarray\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0mvalue_array\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n", |
190 | | - "\u001b[0;31mFieldError\u001b[0m: field__number_one: already exists" |
| 171 | + "name": "stdout", |
| 172 | + "output_type": "stream", |
| 173 | + "text": [ |
| 174 | + "ERROR: The field already exists.\n" |
191 | 175 | ] |
192 | 176 | } |
193 | 177 | ], |
194 | 178 | "source": [ |
195 | | - "no_1c = mg.add_field('node', 'field__number_one', input_array, copy=False, units='m')" |
| 179 | + "try:\n", |
| 180 | + " no_1c = mg.add_field('node', 'field__number_one', input_array, copy=False, units='m')\n", |
| 181 | + "except FieldError:\n", |
| 182 | + " print('ERROR: The field already exists.')" |
196 | 183 | ] |
197 | 184 | }, |
198 | 185 | { |
199 | 186 | "cell_type": "code", |
200 | 187 | "execution_count": 7, |
201 | | - "metadata": { |
202 | | - "collapsed": false |
203 | | - }, |
| 188 | + "metadata": {}, |
204 | 189 | "outputs": [ |
205 | 190 | { |
206 | 191 | "name": "stdout", |
|
220 | 205 | { |
221 | 206 | "cell_type": "code", |
222 | 207 | "execution_count": 8, |
223 | | - "metadata": { |
224 | | - "collapsed": false |
225 | | - }, |
| 208 | + "metadata": {}, |
226 | 209 | "outputs": [ |
227 | 210 | { |
228 | 211 | "name": "stdout", |
|
254 | 237 | { |
255 | 238 | "cell_type": "code", |
256 | 239 | "execution_count": 9, |
257 | | - "metadata": { |
258 | | - "collapsed": false |
259 | | - }, |
| 240 | + "metadata": {}, |
260 | 241 | "outputs": [ |
261 | 242 | { |
262 | 243 | "data": { |
|
283 | 264 | { |
284 | 265 | "cell_type": "code", |
285 | 266 | "execution_count": 10, |
286 | | - "metadata": { |
287 | | - "collapsed": false |
288 | | - }, |
| 267 | + "metadata": {}, |
289 | 268 | "outputs": [ |
290 | 269 | { |
291 | 270 | "data": { |
|
312 | 291 | { |
313 | 292 | "cell_type": "code", |
314 | 293 | "execution_count": 11, |
315 | | - "metadata": { |
316 | | - "collapsed": false |
317 | | - }, |
| 294 | + "metadata": {}, |
318 | 295 | "outputs": [ |
319 | 296 | { |
320 | 297 | "data": { |
|
334 | 311 | { |
335 | 312 | "cell_type": "code", |
336 | 313 | "execution_count": 12, |
337 | | - "metadata": { |
338 | | - "collapsed": false |
339 | | - }, |
| 314 | + "metadata": {}, |
340 | 315 | "outputs": [], |
341 | 316 | "source": [ |
342 | 317 | "mg.at_node.clear() # delete all fields at nodes" |
|
345 | 320 | { |
346 | 321 | "cell_type": "code", |
347 | 322 | "execution_count": 13, |
348 | | - "metadata": { |
349 | | - "collapsed": false |
350 | | - }, |
| 323 | + "metadata": {}, |
351 | 324 | "outputs": [ |
352 | 325 | { |
353 | 326 | "data": { |
|
367 | 340 | { |
368 | 341 | "cell_type": "code", |
369 | 342 | "execution_count": 14, |
370 | | - "metadata": { |
371 | | - "collapsed": false |
372 | | - }, |
| 343 | + "metadata": {}, |
373 | 344 | "outputs": [ |
374 | 345 | { |
375 | 346 | "data": { |
|
389 | 360 | { |
390 | 361 | "cell_type": "code", |
391 | 362 | "execution_count": 15, |
392 | | - "metadata": { |
393 | | - "collapsed": false |
394 | | - }, |
| 363 | + "metadata": {}, |
395 | 364 | "outputs": [ |
396 | 365 | { |
397 | 366 | "data": { |
|
411 | 380 | { |
412 | 381 | "cell_type": "code", |
413 | 382 | "execution_count": 16, |
414 | | - "metadata": { |
415 | | - "collapsed": false |
416 | | - }, |
| 383 | + "metadata": {}, |
417 | 384 | "outputs": [ |
418 | 385 | { |
419 | 386 | "data": { |
|
440 | 407 | { |
441 | 408 | "cell_type": "code", |
442 | 409 | "execution_count": 17, |
443 | | - "metadata": { |
444 | | - "collapsed": false |
445 | | - }, |
| 410 | + "metadata": {}, |
446 | 411 | "outputs": [ |
447 | 412 | { |
448 | 413 | "data": { |
|
484 | 449 | "name": "python", |
485 | 450 | "nbconvert_exporter": "python", |
486 | 451 | "pygments_lexer": "ipython2", |
487 | | - "version": "2.7.11" |
| 452 | + "version": "2.7.13" |
488 | 453 | } |
489 | 454 | }, |
490 | 455 | "nbformat": 4, |
491 | | - "nbformat_minor": 0 |
| 456 | + "nbformat_minor": 1 |
492 | 457 | } |
0 commit comments