-
Notifications
You must be signed in to change notification settings - Fork 2
/
Copy pathtodo.html
619 lines (601 loc) · 36.8 KB
/
todo.html
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
<!DOCTYPE html>
<html class="writer-html5" lang="en" >
<head>
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>9. The Model Itself — Community Water Model</title>
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
<link rel="stylesheet" href="_static/graphviz.css" type="text/css" />
<link rel="stylesheet" href="_static/iiasa.css" type="text/css" />
<!--[if lt IE 9]>
<script src="_static/js/html5shiv.min.js"></script>
<![endif]-->
<script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
<script src="_static/doctools.js"></script>
<script src="_static/sphinx_highlight.js"></script>
<script src="_static/js/theme.js"></script>
<link rel="index" title="Index" href="genindex.html" />
<link rel="search" title="Search" href="search.html" />
<link rel="next" title="10. Data" href="data.html" />
<link rel="prev" title="8. Demo of the model" href="results.html" />
</head>
<body class="wy-body-for-nav">
<div class="wy-grid-for-nav">
<nav data-toggle="wy-nav-shift" class="wy-nav-side">
<div class="wy-side-scroll">
<div class="wy-side-nav-search" >
<a href="index.html" class="icon icon-home">
Community Water Model
<img src="_static/IIASA_logo_white.png" class="logo" alt="Logo"/>
</a>
<div class="version">
1.0.6
</div>
<div role="search">
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
<input type="text" name="q" placeholder="Search docs" aria-label="Search docs" />
<input type="hidden" name="check_keywords" value="yes" />
<input type="hidden" name="area" value="default" />
</form>
</div>
</div><div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="Navigation menu">
<ul class="current">
<li class="toctree-l1"><a class="reference internal" href="intro.html">1. Introduction</a></li>
<li class="toctree-l1"><a class="reference internal" href="modeldesign.html">2. Model Design</a></li>
<li class="toctree-l1"><a class="reference internal" href="publication.html">3. Publication</a></li>
<li class="toctree-l1"><a class="reference internal" href="setup.html">4. Setup of the model</a></li>
<li class="toctree-l1"><a class="reference internal" href="tutorial.html">5. Tutorial</a></li>
<li class="toctree-l1"><a class="reference internal" href="errorHandling.html">6. Error handling</a></li>
<li class="toctree-l1"><a class="reference internal" href="listVariables.html">7. List of output variables</a></li>
<li class="toctree-l1"><a class="reference internal" href="results.html">8. Demo of the model</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="#">9. The Model Itself</a><ul>
<li class="toctree-l2"><a class="reference internal" href="#performance">Performance</a></li>
<li class="toctree-l2"><a class="reference internal" href="#updates">Updates</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="data.html">10. Data</a></li>
<li class="toctree-l1"><a class="reference internal" href="calibration.html">11. Calibration tool</a></li>
<li class="toctree-l1"><a class="reference internal" href="calibration_tutorial.html">12. Calibration tutorial</a></li>
<li class="toctree-l1"><a class="reference internal" href="resolution.html">13. Increasing resolution</a></li>
<li class="toctree-l1"><a class="reference internal" href="zambezi.html">14. Example Zambezi</a></li>
<li class="toctree-l1"><a class="reference internal" href="license.html">15. License and download info</a></li>
<li class="toctree-l1"><a class="reference internal" href="sourcecode.html">16. Source code</a></li>
<li class="toctree-l1"><a class="reference internal" href="forum.html">17. Forum</a></li>
</ul>
</div>
</div>
</nav>
<section data-toggle="wy-nav-shift" class="wy-nav-content-wrap"><nav class="wy-nav-top" aria-label="Mobile navigation menu" >
<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
<a href="index.html">Community Water Model</a>
</nav>
<div class="wy-nav-content">
<div class="rst-content">
<div role="navigation" aria-label="Page navigation">
<ul class="wy-breadcrumbs">
<li><a href="index.html" class="icon icon-home" aria-label="Home"></a></li>
<li class="breadcrumb-item active"><span class="section-number">9. </span>The Model Itself</li>
<li class="wy-breadcrumbs-aside">
<a href="_sources/todo.rst.txt" rel="nofollow"> View page source</a>
</li>
</ul>
<hr/>
</div>
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
<div itemprop="articleBody">
<section id="the-model-itself">
<h1><a class="toc-backref" href="#id1" role="doc-backlink"><span class="section-number">9. </span>The Model Itself</a><a class="headerlink" href="#the-model-itself" title="Permalink to this heading"></a></h1>
<nav class="contents" id="contents">
<p class="topic-title">Contents</p>
<ul class="simple">
<li><p><a class="reference internal" href="#the-model-itself" id="id1">The Model Itself</a></p>
<ul>
<li><p><a class="reference internal" href="#performance" id="id2">Performance</a></p></li>
<li><p><a class="reference internal" href="#updates" id="id3">Updates</a></p></li>
</ul>
</li>
</ul>
</nav>
<section id="performance">
<h2><a class="toc-backref" href="#id2" role="doc-backlink">Performance</a><a class="headerlink" href="#performance" title="Permalink to this heading"></a></h2>
<p>Computational run time (on a linux single node - 2400 MHz with Intel Xeon CPU E5- 2699A v4):</p>
<p>Daily timestep on 0.5 deg</p>
<p><strong>Global:</strong> 100 years in appr. 12h = 7.2min per year</p>
<table class="docutils align-default">
<colgroup>
<col style="width: 14%" />
<col style="width: 57%" />
<col style="width: 29%" />
</colgroup>
<thead>
<tr class="row-odd"><th class="head"></th>
<th class="head"><p>Process</p></th>
<th class="head"><p>sum % runtime</p></th>
</tr>
</thead>
<tbody>
<tr class="row-even"><td><p>1</p></td>
<td><p>Read Meteo Data</p></td>
<td><p>6.2</p></td>
</tr>
<tr class="row-odd"><td><p>2</p></td>
<td><p>Et pot</p></td>
<td><p>7.6</p></td>
</tr>
<tr class="row-even"><td><p>3</p></td>
<td><p>Snow</p></td>
<td><p>8.8</p></td>
</tr>
<tr class="row-odd"><td><p>4</p></td>
<td><p>Soil</p></td>
<td><p>59.4</p></td>
</tr>
<tr class="row-even"><td><p>5</p></td>
<td><p>Groundwater</p></td>
<td><p>59.5</p></td>
</tr>
<tr class="row-odd"><td><p>6</p></td>
<td><p>Runoff conc</p></td>
<td><p>70.1</p></td>
</tr>
<tr class="row-even"><td><p>7</p></td>
<td><p>Lakes</p></td>
<td><p>70.4</p></td>
</tr>
<tr class="row-odd"><td><p>8</p></td>
<td><p>Routing</p></td>
<td><p>95.5</p></td>
</tr>
<tr class="row-even"><td><p>9</p></td>
<td><p>Output</p></td>
<td><p>100</p></td>
</tr>
</tbody>
</table>
<p>For the global setting, soil processes with 50% computing time is the most time consuming part, followed by routing with 25% and runoff concentration with 10%.
(Reading the full global maps takes only 1/3 longer than reading a part of the global maps)</p>
<p><strong>Rhine:</strong> 640 years in appr. 4.5h = 0.4min per year</p>
<table class="docutils align-default">
<colgroup>
<col style="width: 14%" />
<col style="width: 57%" />
<col style="width: 29%" />
</colgroup>
<thead>
<tr class="row-odd"><th class="head"></th>
<th class="head"><p>Process</p></th>
<th class="head"><p>sum % runtime</p></th>
</tr>
</thead>
<tbody>
<tr class="row-even"><td><p>1</p></td>
<td><p>Read Meteo Data</p></td>
<td><p>79.4</p></td>
</tr>
<tr class="row-odd"><td><p>2</p></td>
<td><p>Et pot</p></td>
<td><p>80.5</p></td>
</tr>
<tr class="row-even"><td><p>3</p></td>
<td><p>Snow</p></td>
<td><p>80.9</p></td>
</tr>
<tr class="row-odd"><td><p>4</p></td>
<td><p>Soil</p></td>
<td><p>88.8</p></td>
</tr>
<tr class="row-even"><td><p>5</p></td>
<td><p>Groundwater</p></td>
<td><p>88.9</p></td>
</tr>
<tr class="row-odd"><td><p>6</p></td>
<td><p>Runoff conc</p></td>
<td><p>89.6</p></td>
</tr>
<tr class="row-even"><td><p>7</p></td>
<td><p>Lakes</p></td>
<td><p>89.8</p></td>
</tr>
<tr class="row-odd"><td><p>8</p></td>
<td><p>Routing</p></td>
<td><p>99.6</p></td>
</tr>
<tr class="row-even"><td><p>9</p></td>
<td><p>Output</p></td>
<td><p>100</p></td>
</tr>
</tbody>
</table>
<p>For the Rhine basin reading input maps 79% is by far the most time consuming process, followed by routing (kinematic wave) 10% and the soil processes (8%).</p>
</section>
<section id="updates">
<h2><a class="toc-backref" href="#id3" role="doc-backlink">Updates</a><a class="headerlink" href="#updates" title="Permalink to this heading"></a></h2>
<div class="admonition note">
<p class="admonition-title">Note</p>
<div class="line-block">
<div class="line">Update history taken from github log</div>
<div class="line">git log —pretty=format:”%ad - %an : %s” —date=short —graph > github.log</div>
</div>
</div>
<p><strong>Most recent updates on top</strong></p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span>* 2020-10-08 - CWatM : chg: Error handling improved, included numbering of error handling add: pytest checks error handling
* 2020-10-02 - CWatM : add: Co2 data, check if climate data are upside down
* 2020-08-17 - CWatM : chk: added water withdrawal from neigbor cells
* 2020-07-02 - CWatM : Fix: some minor fixes to adjust the waterbalance, mainly water demand e.g. calculation of return flow, lost to evaporation, dealing with fossil gw and return flow of fossil gw
* 2020-06-15 - CWatM : Add: added self.var.tws total water storage, dis_outlet, sum_soil, lakeReservoirStorage as variable Add: dis_outlet as discharge only at the outlet points
* 2020-06-15 - CWatM : Add: added self.var.tws total water storage, dis_outlet, sum_soil, lakeReservoirStorage as variable Add: dis_outlet as discharge only at the outlet points
* 2020-06-03 - CWatM : chg: renamed water_demand/environmental_flow to water_demand/environmental_need chg: docu/sourcecode.rst changed the graphic to display the modules
* 2020-06-03 - CWatM : CHG: improved description for each class with defined global Variables Add: water_demand.py in water_demand (moved from __init__) CHG: change file encoding to uft-8 again
* 2020-06-02 - CWatM : CHG: added Luca's description of variables in each class comment
* 2020-05-28 - Jens de Bruijn : Fix spelling error
| * 2020-05-28 - Jens de Bruijn : split water demand module
| * 2020-05-28 - Jens de Bruijn : some small pep8 changes
| * 2020-05-28 - Jens de Bruijn : requirement pytest-report to pytest-html
| * 2020-05-28 - Jens de Bruijn : fix error with usage function
* | 2020-05-28 - Jens de Bruijn : Fix decoding error
|/
* | 2020-05-28 - CWatM : CHG: cleaning cwatm_initial.py - put parts in data-handling loadsetclone
* | 2020-05-28 - CWatM : Chg: put the part of checking meteorological forcing data to fit with mask map in readmeteo.py
* | 2020-05-28 - CWatM : CHG: Merge Jens changed self.var structure
|\ \
| * \ 2020-05-28 - Peter Burek : Merge pull request #13 from iiasa/var-restructure
| |\ \
| | * \ 2020-05-28 - Peter Burek : Merge branch 'develop' into var-restructure
| | |\ \
| | |/ /
| |/| |
| | * | 2020-05-19 - Jens de Bruijn : small bugfix
| | * | 2020-05-19 - Jens de Bruijn : revert some unnecessary changes
| | * | 2020-05-19 - Jens de Bruijn : return firstout from var
| | * | 2020-05-18 - Jens de Bruijn : Merge pull request #12 from iiasa/var-variable-restructuring
| | |\ \
| | | * | 2020-04-15 - Jens de Bruijn : all variables to model.var
* | | | | 2020-05-28 - CWatM : Chk: preparation to merge with Jens change self.var structure
|/ / / /
* | | | 2020-05-28 - Peter Burek : Merge pull request #11 from iiasa/simplify-run_cwatm.py
|\ \ \ \
| * | | | 2020-04-17 - Jens de Bruijn : removed unneccesary import
| * | | | 2020-04-17 - Jens de Bruijn : simplify run_cwatm
* | | | | 2020-05-25 - CWatM : add: test self.var description in soil
* | | | | 2020-05-25 - CWatM : Merge branch 'develop' of https://github.com/iiasa/CWATM_priv into develop
|\ \ \ \ \
| | |/ / /
| |/| | |
| * | | | 2020-05-18 - Jens de Bruijn : include automatically generated settingsfiles and wordfiles temp files
* | | | | 2020-05-25 - CWatM : add: addition self.var description to soil as test
|/ / / /
* | | | 2020-05-15 - CWatM : add: added different option for ETP 2: Milly and Dunne method 3: Yang et al. Penman Montheith correction method
| | | * 2020-04-27 - Mikhail Smilovic : Updates
| | | * 2020-04-27 - Mikhail Smilovic : Initial values and new pumping variable
| | | * 2020-04-27 - Mikhail Misha Smilovic : Fixed usingAllocSegments
| | | * 2020-04-27 - Mikhail Smilovic : Initialize variables and fix rootFrac
| | | * 2020-04-27 - Mikhail Smilovic : Merge branch 'develop' into Mikhail
| | | |\
| |_|_|/
|/| | |
* | | | 2020-04-20 - CWatM : Merge branch 'develop' of https://github.com/iiasa/CWATM_priv into develop
|\ \ \ \
| * | | | 2020-04-20 - Mikhail Misha Smilovic : Corrected self.var.sumlakeResOutflow and removed "somtimes_closed" feature
| |/ / /
* | | | 2020-04-20 - CWatM : new: put documentation for pytesting in pytesting new: put documentation for docu in docu chg: changed pytesting fix: fixed find closest option if option is misspelled
|/ / /
* | | 2020-04-16 - CWatM : chg: added some lines on docu/setup.rst
* | | 2020-04-16 - CWatM : Making a new cwat version which can be installed by pip and manual
|\ \ \
| * | | 2020-04-16 - Peter Burek : Delete .travis.yml
| * | | 2020-04-16 - Jens de Bruijn : make run_cwatm.py work both directly and as 'cwatm' from command line.
| * | | 2020-04-16 - Peter Burek : Merge pull request #10 from iiasa/jens
| |\ \ \
| | * \ \ 2020-04-15 - Jens de Bruijn : Merge branch 'jens' of https://github.com/iiasa/CWATM_priv into jens
| | |\ \ \
| | | * | | 2020-04-15 - Jens de Bruijn : include license (was already present in docs) + include readme as long_description
| | * | | | 2020-04-15 - Jens de Bruijn : include license (was already present in master branch and docs) + include readme as long_description
| | |/ / /
| | * | | 2020-04-15 - Jens de Bruijn : Merge branch 'jens' of https://github.com/iiasa/CWATM_priv into jens
| | |\ \ \
| | | * | | 2020-04-15 - Jens de Bruijn : fix circular reference
| | * | | | 2020-04-15 - Jens de Bruijn : moved to cwatm folder
| | * | | | 2020-04-15 - Jens de Bruijn : remove nonexisting page
| | * | | | 2020-04-15 - Jens de Bruijn : update documentation to reflect running from command line
| | * | | | 2020-04-15 - Jens de Bruijn : make cwatm runnable from the command line
| | * | | | 2020-04-15 - Jens de Bruijn : fix circular reference
| | |/ / /
| | * | | 2020-04-15 - Jens de Bruijn : fix pip installation + restructure document
| | * | | 2020-04-15 - Jens de Bruijn : create requirements.txt for documentation
| | * | | 2020-04-15 - Jens de Bruijn : change \over to \frac
| | * | | 2020-04-15 - Jens de Bruijn : fix logo path
| | * | | 2020-04-15 - Jens de Bruijn : included packages for testing in setup.py
| | |/ /
| * | | 2020-04-16 - Jens de Bruijn : remove .vscode folder
| |/ /
* | | 2020-04-16 - CWatM : cwamt which runs under pip install and manual install
* | | 2020-04-16 - CWatM : Upadating cwatm to work from pip install and manual install
|/ /
* | 2020-04-14 - CWatM : chk: trying to use Travis with pytest fix: some date problems using 360 days
* | 2020-04-14 - CWatM : Merge branch 'develop' of https://github.com/iiasa/CWATM_priv into develop
|\ \
| * \ 2020-04-14 - Jens de Bruijn : Merge branch 'develop' of github.com:iiasa/CWATM_priv into develop
| |\ \
| * | | 2020-04-14 - Jens de Bruijn : removed some unneccesary code + some renaming
* | | | 2020-04-14 - CWatM : chk: small changes to run with Travis
| |/ /
|/| |
* | | 2020-04-14 - CWatM : fix: 2nd fix for monthly netcdf file base on different netcdf calendars fix: included metanetcdf.xml in cwatm folder chk: in case there is not metanetcdf at the location defined in settingsfile -> look into cwatm folder fix; include metaxml into setu
* | | 2020-04-14 - CWatM : fix: fixed a bug in the new meteo data use with 360 days
| | * 2020-04-14 - Mikhail Smilovic : Removed file related to leakage
| | * 2020-04-14 - Mikhail Misha Smilovic : Increase MODFLOW soil layer by soildepth[0]
| | * 2020-04-14 - Mikhail Misha Smilovic : Reset summed up groundwater pumping
| | * 2020-04-14 - Mikhail Misha Smilovic : Improved demand2pumping option
| | * 2020-04-14 - Mikhail Smilovic : Allocation segments and cleaning
| | * 2020-04-14 - Mikhail Misha Smilovic : Remove FUSE landcover commands and clean up rootFrac
| | * 2020-04-10 - Mikhail Misha Smilovic : act_gw bug fix
| | * 2020-04-10 - Mikhail Misha Smilovic : Soil depth fix and Aquifer begins below soil layer
| | * 2020-04-10 - Mikhail Misha Smilovic : Channel abstractions fix
| |/
|/|
* | 2020-04-10 - CWatM : chg: reads meteo data with different netcdf calendar and unit (days, minutes)
* | 2020-04-10 - CWatM : Chg: tested last version for global 30, 5, rhine 5.30, Upper Bhima Add: CWatM can use different calendar as meteo input e.g 360 days Chg: improved setting mask in global dataset and meteoset Todo: meteo datasets should have days from , make this flexible to minutes, ...
* | 2020-04-09 - CWatM : Merge branch 'develop' of https://github.com/iiasa/CWATM_priv into develop
|\ \
| |/
| * 2020-02-20 - Jens de Bruijn : removed unused function parameter
| * 2020-02-19 - Jens de Bruijn : improve setup authors + include myself as an author
| * 2020-02-19 - Jens de Bruijn : Making CWatM installable as a pip package
| * 2020-02-19 - Jens de Bruijn : removed source for python 2
| * 2020-02-19 - Jens de Bruijn : fixes to documentation
| * 2020-02-19 - Jens de Bruijn : fix docstring
| * 2020-02-18 - Jens de Bruijn : Making CWatM installable as a pip package
* | 2020-04-09 - CWatM : Chg: Using meteo datasets with 360 days, no_leap etc. automatically chg: calculting the position of the area map inside meteomaps, global data sets
|/
* 2020-02-12 - CWatM : New: pytest framwork to test features of CWATM in different environemnts (scales, basins, options) Chg: Changed cwatm3.py and globals.py to run with pytest
|\
| * 2020-02-07 - Jens de Bruijn : make gitignore more general, works for all Python versions now
| * 2020-02-07 - Jens de Bruijn : init
| * 2020-02-07 - Jens de Bruijn : changed time.clock() to time.perf_counter() as time.clock() ensuring Python3.8 support. time.perf_counter was added in Python3.3
* | 2020-02-12 - CWatM : New: pytest framwork to test features of CWATM in different environemnts (scales, basins, options) Chg: Changed cwatm3.py and globals.py to run with pytest
|/
* 2020-02-06 - CWatM : Bugfix: corrected a bug that gave some error message when using CWatM for 5min version Chg: Changed some internal structure to make it run with pytest.ini (cwatm3.py, output.py, globals.py, datahandling.py, etc.) New: A version which can be tested with a pytest framework
* 2019-12-05 - CWatM : Merge branch 'develop' of https://github.com/iiasa/CWATM_priv into develop
|\
| * 2019-11-26 - Mikhail Misha Smilovic : Update of module for Segments and unmet_div_ww
| * 2019-11-26 - Mikhail Misha Smilovic : Fix to update act_irrConsumption for not LimitAbstraction
| * 2019-11-04 - Mikhail Misha Smilovic : Merge pull request #7 from mikhailsmilovic/develop
| |\
| | * 2019-11-04 - Mikhail Smilovic : Fix: all valid ldd values included
| | * 2019-11-04 - Mikhail Smilovic : Revert "Fix: all valid ldd values included"
| | * 2019-11-04 - Mikhail Smilovic : Fix: all valid ldd values included
| | * 2019-11-04 - Mikhail Misha Smilovic : Merge pull request #7 from iiasa/develop
| | |\
| | |/
| |/|
| * | 2019-11-04 - Mikhail Misha Smilovic : fix, added colon
| | * 2019-11-04 - Mikhail Misha Smilovic : Merge pull request #6 from iiasa/develop
| | |\
| | |/
| |/|
| * | 2019-11-04 - Mikhail Misha Smilovic : Clean up: remove print('hello')
| * | 2019-11-04 - Mikhail Misha Smilovic : Merge pull request #6 from mikhailsmilovic/develop
| |\ \
| | |/
| | * 2019-11-04 - Mikhail Smilovic : Moving options into Settings file
| | * 2019-11-04 - Mikhail Misha Smilovic : Merge pull request #5 from iiasa/develop
| | |\
| | |/
| |/|
| * | 2019-11-04 - Mikhail Misha Smilovic : True --> 'True'
| * | 2019-11-04 - Mikhail Misha Smilovic : clean up of "sometimes_closed" feature
| | * 2019-10-31 - Mikhail Misha Smilovic : Merge pull request #4 from iiasa/develop
| | |\
| | |/
| |/|
| * | 2019-10-31 - Mikhail Smilovic : Merge branch 'develop' into pr/4
| |\ \
| | |/
| | * 2019-10-31 - Mikhail Smilovic : fixed negative pumping and pyc git ignore
| | * 2019-10-31 - Mikhail Smilovic : Activates pumping through modflow to meet gw demand
| | * 2019-10-31 - Mikhail Smilovic : delete pyc files
| | * 2019-10-31 - Mikhail Smilovic : Removing pyc files and including Sarati settings file
| | * 2019-10-30 - Mikhail Smilovic : rootFraction disabled
| | * 2019-10-30 - Mikhail Smilovic : Revert "Revert "Revert "Revert "Beginning demand2pumping feature""""
| | * 2019-10-30 - Mikhail Smilovic : Revert "Revert "Revert "Beginning demand2pumping feature"""
| | * 2019-10-30 - Mikhail Smilovic : Revert "Revert "Beginning demand2pumping feature""
| | * 2019-10-30 - Mikhail Smilovic : Revert "Beginning demand2pumping feature"
| | * 2019-10-30 - Mikhail Smilovic : Beginning demand2pumping feature
| | * 2019-10-30 - Mikhail Misha Smilovic : Include sometimes_closed option
| | * 2019-10-30 - Mikhail Misha Smilovic : sometimes_closed option
| | * 2019-10-30 - Mikhail Misha Smilovic : Updated settings file
| | * 2019-10-30 - Mikhail Misha Smilovic : Test: small edits
* | | 2019-12-05 - CWatM : chg: adjusted downscaleing of meteo data. Now it checks if the wordclim data fits to the map extend of the precipitation data
|/ /
* | 2019-10-19 - CWatM : Add: Point can be used as maskmap. this will generate the upstream catchment Add: output as catchment sum or avg Add: douc is updated
* | 2019-10-18 - CWatM : NEW: added additional time series output: tss as catchment sum or average New: more checks to prevent white space in paths Fix: try to remove all compiled code
* | 2019-10-18 - CWatM : Merge branch 'develop' of https://github.com/iiasa/CWATM_priv into develop
|\ \
| |/
| * 2019-09-25 - Mikhail Misha Smilovic : Update logo and CWATM --> CWatM
| * 2019-09-25 - Mikhail Misha Smilovic : New CWatM logo
| * 2019-09-23 - Mikhail Smilovic : Updates
| * 2019-09-13 - Mikhail Smilovic : Allows for the option 'usingAllocSegments'
* | 2019-10-18 - CWatM : NEW: added aditional time series output: tss as catchment sum or average New: more checks to prevent whitespaces in pathes
|/
* 2019-09-11 - CWatM : fix: change reservoir size (from Mikhail)
* 2019-09-11 - CWatM : fix: data handling, using maskmap with col row celllenght lon lat again
* 2019-08-06 - CWatM : Version 1.04
* 2019-08-06 - CWatM : Version 1.04
* 2019-06-27 - CWatM : fix: bug fix for initial value, small lakes was not stored
* 2019-06-03 - CWatM : New: Groundwater
* 2019-05-08 - CWatM : chk: changes omodflow groundwater_modflow.py chk data handling: saving netcdf with modflow resolution
* 2019-05-03 - CWatM : fix: fixed some coding in groundwater
* 2019-04-30 - CWatM : chk: fixed cropcorrect load in evapopartionpot.py chk: library for groundwater flopy only loaded when ModFlow is used
* 2019-04-30 - CWatM : Add: First version which include the ModFlow version from LG
* 2019-04-04 - CWatM : add: waterquality parts,: watertemp, waterlevel, travel time
* 2019-03-08 - CWatM : chk: improved some pics, intro viedo from Junko
* 2019-03-07 - CWatM : Merge branch 'develop' of https://github.com/iiasa/CWATM_priv into develop
|\
| * 2019-03-05 - Mikhail Misha Smilovic : useSmallLakes commented out
* | 2019-03-07 - CWatM : chg: cwatm.py no predefined setting.file
|/
* 2019-03-05 - CWatM : changes for 1km version in readmeto and initcond
* 2019-01-24 - CWatM : Fix: removed double mult with soilddepth in waterdemand - thank you Simon Moulds Fix: ldd with 1km reso was not working: changed kinematic, and kinematic_sub and lake_reservoirs Fix: read_meteo was not reading meteo
* 2019-01-17 - CWatM : fix; cleaned snow_frost.html add: docu added to data.rst
* 2019-01-16 - CWatM : Add: added tesxt pics to data.rst in docu
* 2019-01-16 - CWatM : Merge branch 'develop' of https://github.com/iiasa/CWATM_priv into develop
|\
| * 2019-01-16 - Mikhail Misha Smilovic : corrected under/overlines
| * 2019-01-15 - Mikhail Misha Smilovic : Added resolution
* | 2019-01-16 - CWatM : Add: some addition to docu: data.rst
|/
* 2019-01-14 - CWatM : test2 readme pic
* 2019-01-14 - CWatM : test1 pic readme
* 2019-01-14 - CWatM : chk: docu sourcecode and setup.doctree chk: checks
* 2019-01-14 - CWatM : Chk: change checking of data, mainly check.py and data handling.py
* 2019-01-12 - CWatM : chk: changed parts in timestep.py so it does not need python-dateutil library
* 2019-01-11 - CWatM : Chk: fix: add library python-dateutil as requirement in setup and tutorial docu
* 2019-01-11 - CWatM : add: added file rhine_basin.zip as test case for cwatm.doctree add: cwatmexe.zip include rhine_basin.zip - a whole package now: executable cwatm + test case
* 2019-01-11 - Mikhail Misha Smilovic : Updated authors' list and developers photo.
* 2019-01-10 - Mikhail Misha Smilovic : Merge pull request #2 from iiasa/mikhail
* 2018-06-05 - Mikhail Misha Smilovic : Update evaporation.py
* 2019-01-10 - Mikhail Misha Smilovic : Added an 'M' to CWAT
* 2019-01-10 - CWatM : Add: added a batch file to cwatmexe.zip
* 2019-01-08 - CWatM : Python 2.7 version support has stopped We maintaining from now on Python 3.7 version
* 2019-01-08 - CWatM : Chg: Added header for autodocu to each function, class (all changes only Python3.7 version) Chg: Put the downscaling functions in fron of readmeteo: no longer internal functions of readmeteo Fix: Cleaned the code, removed not used functions Chg: Improved the documentation, especially the autodocu of source code
* 2019-01-05 - CWatM : fix: corrected some warnings from PCCharm code inspector
* 2019-01-04 - CWatM : add: adding executable cwatm.exe
* 2019-01-04 - CWatM : Fix: new water demand changes did not use the same variable name act_surfacewater in waterdemand and routing_kinematic. changed this in both version 2.7 and 3.7 Add python: added a report command to report data as .map or .tif for debugging
* 2018-12-20 - CWatM : Python3.7 New: replaced pcraster framework by own framework Removed folder pcraster2 New: added save conditions for warmstart -> you can add a 10d or 6m or 2y after the first date -> the initial data will be saved every 10d (or whatever number), or 6 month or 2 year
* 2018-12-17 - CWatM : New: Python 3 test code
* 2018-12-17 - CWatM : Merge branch 'develop' of https://github.com/iiasa/CWATM_priv into develop
|\
| * 2018-12-12 - Community Water Model : Merge pull request #3 from iiasa/waterdemand_update
| |\
| | * 2018-12-12 - Community Water Model : Merge branch 'develop' into waterdemand_update
| | |\
| | |/
| |/|
| | * 2018-08-15 - Unknown : modify irrConsuption to act_irrConsumption in landcoverType and soil modules
| | * 2018-08-15 - Unknown : potential and actual values are explicitly written in waterdemand module
| | * 2018-08-08 - Unknown : modified efficiency vaiables ;)
| | * 2018-08-07 - Unknown : modified read-netcdf for wateruse data
| | * 2018-07-24 - Yusuke : Added act_nonIrrConsumption conponents
| | * 2018-07-24 - Yusuke : Clean up before editing
* | | 2018-12-17 - CWatM : New: python 3 test version
* | | 2018-12-17 - CWatM : New: Added Python source code: Further test required, but it seems to work. -> Plan in 2019 further development will use Python 3.7 coding New: Building a executable .exe with Python 3 seems to work as well. Further testing -> 2019 an installation setup will be produced using cx_freeze and Inno setup to make an easy start on Windows (no Python background will be required for CWATM users)
|/ /
* | 2018-12-12 - CWatM : Put Yusuke's version of waterdemand in (soil, landtypes, waterdemand)
* | 2018-12-12 - CWatM : Fix: checkmap -c option now checks maps first (but can be improved) new flag: usemeteodownscaling in [meteo] for using meteo downscaling Fix: can now use rivernetwork as map or tif again (ldd.map) changes in initial and data_handling
* | 2018-12-11 - CWatM : in sync with version on p drive
* | 2018-12-11 - CWatM : Small change in tutorial, added output variable added calibration tutorial, to be extended
* | 2018-09-24 - CWatM : chk: waterdemand can use water demand netcdf with m/s or million m3 per month/year
* | 2018-08-07 - CWatM : fix: reading meteo map with no leap year (365 day maps) new: using a cover map to put addition values in
|/
* 2018-07-09 - CWatM : Fix: waterbalance for soil Chg: output of tss from 3-d variable e.g actualET[1]
* 2018-06-27 - CWatM : fix: corrected storing initial values for the next warm start chk: changed environmental flow (EF)settings file - loading EF is now in water demand
* 2018-06-07 - CWatM : chg: outcommented a library call in data_handling #from netcdftime import utime chg: added the sum of ET_actual again
* 2018-05-17 - CWatM : Changed waterbalance Changed waterbodies in large and small lakes and reservoirs
* 2018-04-24 - CWatM : Fix: bugfix to read waterdemand map
* 2018-04-19 - CWatM : Change: meteo data can be clipped before and used. CWAT detects if it is a global map or a regional one e.g using only meteo data set for the Rhine.
* 2018-04-16 - CWatM : Change; in waterdemand, landcovertyp and soil cjhange variable names Gross = demand = withdrawal, netto = consumptiom all vraibales names now are ..demand or .. consumption
* 2018-04-13 - CWatM : test
* 2018-04-13 - CWatM : Change: netcdf output as monthly or annual map has now a adequate monthly or yearly time step e.g. Months since 1901-01-01
* 2018-04-03 - CWatM : Change: CWATM can be used with a smaller meteo dataset e.g. to use a demo dataset for the Rine with pr, tavg, ETRef, EWref
* 2018-04-03 - CWatM : Change: CWAT can be used with a smaller meteo dataset e.g. to download a smaller test meteo dataset for the Rhine
* 2018-04-03 - CWatM : Chg: running cwatm with a smaller meteo dataset in order to make a test catchment (e.g. Rhine) with a small meteo dataset
* 2018-03-20 - CWatM : Added: - small lakes - calc environmental flow - 5 arcmin version - downscale 30min meteo dataset to 5min
* 2017-11-20 - CWatM : fix: replace strftime with .year or .month etc fix: looks for > 1e20 and -1e20 in each map and change these to standard zero value (default =0)
* 2017-10-30 - CWatM : Fix: bug fix to save maps with a SpinUp <> None
* 2017-10-27 - CWatM : Fix: reading meteo maps - every data > 1e12 is set to 0 Add: maxtopwater in prg and settings.ini Fix: calibration routine
* 2017-09-21 - CWatM : bugfix: snow with more layers than 3
* 2017-09-20 - CWatM : chg: water demand, small lakes, land cover
* 2017-08-29 - CWatM : chg: water demand , soil add: error handling for output maps
* 2017-08-17 - CWatM : new: water demand is working chg: soil especially paddy and non paddy irrigation bug: checked water balance
* 2017-07-13 - CWatM : fix: small bugfix, to run precipitation maps with the suffix .nc4
* 2017-07-13 - CWatM : chg: soil part - using different maps -> map folder has to be updated! chg: meteo maps do not have to be merge before -> stack of maps can be used add: inflow to a catchment (still to work on)
* 2017-05-23 - CWatM : chk: saving of netcdf with fixed number of time and with fixed chunk size -> less diskspace used chk: a few more error handlings added
* 2017-05-19 - CWatM : chk: Chaznged soil calculation to Arno scheme and Mualem - van Genuchten equation new: put in a lot of checks for the settingsfile e.g. check True and false (not mispelled like ture). Check timing, check output variables chk: a lot more error messages are given out if something is wrong chk: output netcdf time is calculate in advanced in order to reduce size of output netcdf -> data_handling line 789 sets it to this value
* 2017-05-10 - CWatM : chk: bugfix cropKC per land cover new: snow evaporation included new: Calibration routine added
* 2017-04-20 - CWatM : fix: output to netcdf - in output and data_handling fix: output as a time series without header with the option -h new: readme.md for github
* 2017-04-18 - CWatM : Transfer to new IIASA domain and making it private in branch develop
* 2017-04-18 - CWatM : Transfer to new IIASA CWAT domain
* 2017-04-18 - CWatM : ready for transfer to iiasa
* 2017-04-13 - CWatM : data handling: faster read of meteo data
* 2017-04-06 - CWatM : soil - Copy (2).py- removed bug in calculation of soildepth - change calc of arno beta
* 2017-04-06 - CWatM : Merge branch 'branch2' of https://github.com/CWatM/CWatM into branch2
* 2017-04-06 - Community Water Model : Create LICENSE
* 2017-04-06 - CWatM : Updated soil, removed bug in calculating the soil depth changed how arno beta is calculated
* 2017-02-03 - CWatM : - made CWATM run under cygwin (for other linux version the c++ code has to be compiled) - fixed reading maskmap from rectangle
* 2017-02-02 - CWatM : set realtive file path to c++ routine
* 2017-02-02 - CWatM : - New kinematic routing - c++ routine include TODO: make it usable for linu/Unix - removed pcraster GIS commands - new output routine for time series - Budyko output.html - corrected bug in snow modules - corrected bug in init read/save module - WORKING on lakes/reservoirs TODO: bug in reading maskmap from coordinates
* 2017-01-17 - CWatM : init condition - save more than 1 date
* 2017-01-16 - CWatM : Lake/reservoirs routing
* 2016-12-22 - CWatM : updated soil , initconditions etc
* 2016-12-16 - CWatM : runoff concentration
* 2016-12-08 - CWatM : With sphinx documentation making files
* 2016-12-07 - CWatM : Update
* 2016-12-07 - CWatM : Preferential flow, frost
* 2016-11-10 - CWatM : Cacluation Evaporation from climate data
* 2016-10-21 - CWatM : Changed soil + test
* 2016-10-18 - CWatM : Waterdemand included
* 2016-10-03 - CWatM : last August update - waterbalance
* 2016-08-26 - CWatM : water balance 7
* 2016-08-26 - CWatM : water balance 6
* 2016-08-25 - CWatM : water Balance 5
* 2016-08-24 - CWatM : water balance 4 Checks ok : soil , groundwater, routing, waterdemand Missing: reservoirs, sum up to catchments
* 2016-08-23 - CWatM : water balance 3
* 2016-08-23 - CWatM : water balance 2
* 2016-08-22 - CWatM : Water balance check 1 Output on screen
* 2016-08-19 - CWatM : initial condition
* 2016-08-17 - CWatM : Spin up
* 2016-08-17 - CWatM : output netcdf add attributes
* 2016-08-10 - CWatM : output + time
* 2016-08-10 - CWatM : date and time
* 2016-08-09 - CWatM : output 3
* 2016-08-09 - CWatM : output 2
* 2016-08-08 - CWatM : output timeseries
* 2016-08-03 - CWatM : waterbodies 1 Checked routing - working :)
* 2016-08-02 - CWatM : routing 3
* 2016-08-01 - CWatM : routing 2
* 2016-08-01 - CWatM : routing 1
* 2016-07-29 - CWatM : some changes I do not know anymore
* 2016-07-26 - CWatM : soil + groundwater
* 2016-07-26 - CWatM : soil check3
* 2016-07-25 - CWatM : soil check2
* 2016-07-25 - CWatM : check soil module
* 2016-07-24 - CWatM : soil update
* 2016-07-24 - Burek : Soil and groundwater
* 2016-07-22 - CWatM : soil
* 2016-07-21 - CWatM : till waterdemand - soil
* 2016-07-20 - CWatM : Next step interception
* 2016-07-19 - CWatM : changing irrigationarea part
* 2016-07-15 - CWatM : Initial procedure for soil, groundwater, waterdemand
* 2016-07-13 - CWatM : include: snow frost
* 2016-04-02 - CWatM : Initial commit
</pre></div>
</div>
</section>
</section>
</div>
</div>
<footer><div class="rst-footer-buttons" role="navigation" aria-label="Footer">
<a href="results.html" class="btn btn-neutral float-left" title="8. Demo of the model" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> Previous</a>
<a href="data.html" class="btn btn-neutral float-right" title="10. Data" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
</div>
<hr/>
<div role="contentinfo">
<p>© Copyright 2021, IIASA Water Security.</p>
</div>
Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
<a href="https://github.com/readthedocs/sphinx_rtd_theme">theme</a>
provided by <a href="https://readthedocs.org">Read the Docs</a>.
</footer>
</div>
</div>
</section>
</div>
<script>
jQuery(function () {
SphinxRtdTheme.Navigation.enable(true);
});
</script>
</body>
</html>