Merge branch 'main' into plugin-quickstart

Deltares · Aug 8, 2023 · 728a48d · 728a48d
2 parents 7da1ec9 + 0654585
commit 728a48d
Show file tree

Hide file tree

Showing 8 changed files with 303 additions and 72 deletions.
diff --git a/docs/api.rst b/docs/api.rst
@@ -201,6 +201,9 @@ General methods
    Model.set_results
    Model.read_results
 
+   Model.read_nc
+   Model.write_nc
+
 .. _setup_methods:
 
 Setup methods

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -15,14 +15,17 @@ Added
 - Support for loading the same data source but from different places (e.g. local & aws)
 - Add support for reading and writing tabular data in ``parquet`` format. (PR #445)
 - Add support for reading model configs in ``TOML`` format. (PR #444)
+- new ``force-overwrite`` option in ``hydromt update`` CLI to force overwritting updated netcdf files. (PR #460)
 - Added documentation for how to start your own plugin (#446)
 
 Changed
 -------
+- possibility to ``load`` the data in the model read_ functions for netcdf files (default for read_grid in r+ mode). (PR #460)
 -
 
 Fixed
 -----
+- when a model component (eg maps, forcing, grid) is updated using the set_ methods, it will first be read to avoid loosing data. (PR #460)
 -
 
 Deprecated

diff --git a/hydromt/cli/main.py b/hydromt/cli/main.py
@@ -241,6 +241,7 @@ def build(
 @opt_cli
 @data_opt
 @deltares_data_opt
+@overwrite_opt
 @cache_opt
 @quiet_opt
 @verbose_opt
@@ -255,6 +256,7 @@ def update(
     opt,
     data,
     dd,
+    fo,
     cache,
     verbose,
     quiet,
@@ -306,7 +308,7 @@ def update(
             opt0 = opt.get("setup_config", {})
             opt = {c: opt.get(c, {}) for c in components}
             opt.update({"setup_config": opt0})
-        mod.update(model_out=model_out, opt=opt)
+        mod.update(model_out=model_out, opt=opt, forceful_overwrite=fo)
     except Exception as e:
         logger.exception(e)  # catch and log errors
         raise