smashbox 1.0__py2.py3-none-any.whl → 1.1__py2.py3-none-any.whl

smashbox/.spyproject/config/backups/workspace.ini.bak

@@ -4,7 +4,7 @@ save_data_on_exit = True
 save_history = True
 save_non_project_files = False
 project_type = 'empty-project-type'
-recent_files = ['tutorial_report.py', 'init/smashbox.py', 'model/model.py', 'stats/mystats.py', 'init/multimodel_statistics.py', 'stats/stats.py', 'init/param.py', 'test.py', 'test_average_stats.py', 'test_mesh.r', 'test_mesh_from_graffas.py', 'init/__init__.py', 'plot/plot.py']
+recent_files = ['tutorial_report.py', 'init/smashbox.py', 'model/model.py', 'stats/mystats.py', 'init/multimodel_statistics.py', 'stats/stats.py', 'init/param.py', 'test.py', 'test_average_stats.py', 'test_mesh.r', 'test_mesh_from_graffas.py', 'init/__init__.py', 'plot/plot.py', 'tutorial_python.py']
 
 [main]
 version = 0.2.0

smashbox/.spyproject/config/workspace.ini

@@ -4,7 +4,7 @@ save_data_on_exit = True
 save_history = True
 save_non_project_files = False
 project_type = 'empty-project-type'
-recent_files = ['tutorial_report.py', 'init/smashbox.py', 'model/model.py', 'stats/mystats.py', 'init/multimodel_statistics.py', 'stats/stats.py', 'init/param.py', 'test.py', 'test_average_stats.py', 'test_mesh.r', 'test_mesh_from_graffas.py', 'init/__init__.py', 'plot/plot.py']
+recent_files = ['tutorial_report.py', 'init/smashbox.py', 'model/model.py', 'stats/mystats.py', 'init/multimodel_statistics.py', 'stats/stats.py', 'init/param.py', 'test.py', 'test_average_stats.py', 'test_mesh.r', 'test_mesh_from_graffas.py', 'init/__init__.py', 'plot/plot.py', 'tutorial_python.py', 'tools/tools.py', 'model/mesh.py']
 
 [main]
 version = 0.2.0

smashbox/model/model.py

@@ -393,7 +393,13 @@ class model:
         o_setup["read_prcp"] = True
         o_setup["read_pet"] = True
 
-        self.optimize_model = self._model(setup=o_setup, mesh=self.mymesh.mesh)
+        # ~ if hasattr(self, "optimize_model") and self.optimize_model is not None:
+        # ~ previous_optimized_model_rr_parameters = self.optimize_model.rr_parameters.copy()
+
+        if not hasattr(self, "optimize_model") or self.optimize_model is None:
+            self.optimize_model = self._model(setup=o_setup, mesh=self.mymesh.mesh)
+            print(f"</> Getting parameters the default model `mysmashmodel` ...")
+            self.optimize_model.rr_parameters = self.mysmashmodel.rr_parameters.copy()
 
         default_cost_option = {"end_warmup": o_setup["start_time"], "gauge": "all"}
         if cost_options is not None:
@@ -662,7 +668,7 @@ class model:
     def import_parameters(self, model=None):
         """
         Import Geotiff parameter in Smash. This function wrap
-        smash.io.import_parameters(). Path to the parameters is defined in
+        smash.io.read_grid_parameters(). Path to the parameters is defined in
         self._myparam.param.smash_parameters.
 
         Parameter
@@ -691,15 +697,15 @@ class model:
         if model is None:
             model = self.mysmashmodel
 
-        smash.io.import_parameters(
+        smash.io.read_grid_parameters(
             model=model,
-            path_to_parameters=self._myparam.param.smash_parameters,
+            path=self._myparam.param.smash_parameters,
         )
 
     def export_parameters(self, path: os.PathLike = "./output_smash_param"):
         """
         Export Geotiff Smash parameter as Geotiff. This function wrap
-        smash.io.export_parameters().
+        smash.io.save_grid_parameters().
 
         Parameters
         ----------

smashbox/test.py

@@ -4,20 +4,20 @@ if __name__ == "__main__":
 
     from smashbox import tools
 
-    @tools.tools.autocast_args
-    def test(
-        a: int | None = None,
-        b: None | int = None,
-        c: int | None = 1,
-        d: int = 2,
-        e: None = None,
-        f: None | dict | tuple = None,
-        g=1,
-    ):
+    # @tools.tools.autocast_args
+    # def test(
+    #     a: int | None = None,
+    #     b: None | int = None,
+    #     c: int | None = 1,
+    #     d: int = 2,
+    #     e: None = None,
+    #     f: None | dict | tuple = None,
+    #     g=1,
+    # ):
 
-        print(a, b, c, d, e)
+    #     print(a, b, c, d, e)
 
-    test(a=1.0, b=1.0, c=1.0, d=1.0, e=None, f=(2,), g=2)
+    # test(a=1.0, b=1.0, c=1.0, d=1.0, e=None, f=(2,), g=2)
 
     # Main object creation
     sb = smashbox.SmashBox()
@@ -29,20 +29,12 @@ if __name__ == "__main__":
         "outlets_database",
         "/home/maxime/DEV/smashbox/smashbox/asset/outlets/db_stations_example.csv",
     )
-
-    sb.myparam.set_param(
-        "outlets_database_fields",
-        {"coord_x": "X_L93", "coord_y": "Y_L93", "area": "SURF", "id": "ID_HYDRO"},
-    )  # change/update/set the value of the parameter 'outlets_database_fields'.
+    sb.myparam.set_param("outletsID", ["Y4604020"])
 
     sb.myparam.set_param(
         "smash_parameters", "/home/maxime/DEV/smashbox/smashbox/asset/params"
     )  # change the value of myparam used byRealCollobrier
 
-    # Read/write param
-    # sb.myparam.write_param("param.yaml") #write smashbox param
-    sb.myparam.load_param("param.yaml")  # load smashbox param
-
     # New model creation
     sb.newmodel(
         "RealCollobrier"
@@ -50,58 +42,62 @@ if __name__ == "__main__":
 
     # create an second model with different parameters
     sb.myparam.param.setup_file = "setup_rhax_gr5_dt3600.yaml"
-    sb.myparam.set_param(
-        "outlets_database_fields",
-        {"coord_x": "X", "coord_y": "Y", "area": "area", "id": "Nom"},
-    )  # change/update/set the value of the parameter 'outlets_database_fields'.
-    sb.newmodel(
-        "Lez"
-    )  # create a new model named RealCollobrier and copy the previous parameters used for mymodel1 (default behaviour, but it can turned off)
-
-    # Remove a model
-    sb.delmodel("Lez")
 
     # Param associated to the model (hidden) has been copied
     sb.RealCollobrier._myparam.list_param()  # Notice that myparam is also stored in each model object. So you can access to the model param inside the model attribute.
-    sb.RealCollobrier._myparam.param.epsg
 
     # Setup utilities
     sb.RealCollobrier.mysetup.setup  # print the setup to the screen
-    # sb.RealCollobrier.mysetup.write_setup("setup.yaml") #Write the Smash setup
-    sb.RealCollobrier.mysetup.load_setup("setup.yaml")  # Read a custom Smash setup
     sb.RealCollobrier.mysetup.update_setup(
         {
             "hydrological_module": "gr4",
-            "end_time": "2014-01-01 12:00",
+            "end_time": "2014-02-01 12:00",
             "start_time": "2014-01-01 01:00",
             "pet_directory": "/home/maxime/DATA/ETP-SFR-FRA-INTERA_L93",
             "prcp_directory": "/home/maxime/DATA/PLUIE",
-            "qobs_directory": "/home/maxime/DATA/QOBS",
+            "qobs_directory": "/home/maxime/DATA/QOBS_60min",
         }
     )  # Change value of the Smash setup
     sb.RealCollobrier.mysetup.setup  # print the setup to the screen
 
-    # Mesh utilities (hidden)
-    sb.RealCollobrier.mymesh.mesh  # print the mesh to the screen
-    sb.RealCollobrier.mymesh.make_mesh(
-        sb.RealCollobrier._myparam.param
-    )  # Undirect method to build mesh, depend on myparam (unrecomended)
-    sb.RealCollobrier.mymesh.mesh
-    sb.RealCollobrier.mymesh.write_mesh("mesh.hdf5")
-    sb.RealCollobrier.mymesh.load_mesh("mesh.hdf5")
-    sb.RealCollobrier.mymesh.mesh  # print the mesh to the screen
-
-    # Model utilities
-    sb.RealCollobrier.make_mesh()  # direct method to build the mesh (recommended)
-    sb.RealCollobrier.build_model()  # build the model with smash.Model()
-    sb.RealCollobrier.load_smashparam()  # extract the smash parameter from a parameters set and fill the attribute mysmashparameter
-    sb.RealCollobrier.write_smashparam(
-        "smashparam.hdf5"
-    )  # write the extracted parameter in an hdf5 database
-    sb.RealCollobrier.write_smashparam_to_geotiff("geotiff_smashparam")
-    sb.RealCollobrier.make_model(
-        run=True
-    )  # direct build, extract param and run (default is True). Use option run=False to only build the model and extract parameter
+    sb.RealCollobrier.generate_mesh()  # direct method to build the mesh (recommended)
+
+    sb.RealCollobrier.model()
+
+    sb.RealCollobrier.mysmashmodel.set_rr_parameters("cp", 500.0)
+    sb.RealCollobrier.mysmashmodel.set_rr_parameters("ct", 200.0)
+    sb.RealCollobrier.mysmashmodel.set_rr_parameters("llr", 50.0)
+    sb.RealCollobrier.mysmashmodel.set_rr_parameters("kexc", 0.0)
+
+    sb.RealCollobrier.optimize(
+        cost_options={"end_warmup": "2014-01-10 01:00", "gauge": "all"},
+        mapping="uniform",
+        optimizer="sbs",
+        optimize_options={
+            "bounds": {
+                "cp": [1, 1000],
+                "ct": [1, 1000],
+                "kexc": [-50, 50],
+                "llr": [1, 1000],
+            },
+            "termination_crit": {"maxiter": 10},
+        },
+    )
+
+    sb.RealCollobrier.optimize(
+        cost_options={"end_warmup": "2014-01-10 01:00", "gauge": "all"},
+        mapping="distributed",
+        optimizer="lbfgsb",
+        optimize_options={
+            "bounds": {
+                "cp": [1, 1000],
+                "ct": [1, 1000],
+                "kexc": [-50, 50],
+                "llr": [1, 1000],
+            },
+            "termination_crit": {"maxiter": 10},
+        },
+    )
 
     # Stat utilities
 

smashbox/tools/tools.py

@@ -230,7 +230,7 @@ def check_asset_path(asset_dir: str = "", path: None | os.PathLike = None):
         if len(matched_file) == 0:
             raise ValueError(
                 f"'{path}' is not a valid {asset_dir} filename."
-                "Choice are: {os.listdir(mypath)}"
+                f"Choice are: {os.listdir(mypath)}"
             )
         else:
             path = matched_file[0]

{smashbox-1.0.dist-info → smashbox-1.1.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: smashbox
-Version: 1.0
-Summary: A python library developed by Hydris-hydrologie (https://www.hydris-hydrologie.fr/) to provide an technical environment for performing hydrological simulation with Smash. This library is preloaded with data (France only), comes with preconfigured setup, own some extra features such as the in-memory atmospheric data connector, has statistical and plot capabilities. Plot and stats functions can be used as a separate module with your own Smash model object.
-Project-URL: Homepage, https://codeberg.org/maximejay/easysmash
-Project-URL: Issues, https://codeberg.org/maximejay/easysmash/issues
+Version: 1.1
+Summary: A python library developed by Hydris-hydrologie (https://www.hydris-hydrologie.fr/) and INRAE to provide an technical environment for performing hydrological simulation with Smash. This library is preloaded with data (France only), comes with preconfigured setup, own some extra features such as the in-memory atmospheric data connector, has statistical and plot capabilities. Plot and stats functions can be used as a separate module with your own Smash model object.
+Project-URL: Homepage, https://codeberg.org/maximejay/smashbox
+Project-URL: Issues, https://codeberg.org/maximejay/smashbox/issues
 Author-email: Maxime Jay-Allemand <maxime.jay.allemand@hydris-hydrologie.fr>
 License-File: LICENSE
 Keywords: hydro-smash,plot,smash,statistics

{smashbox-1.0.dist-info → smashbox-1.1.dist-info}/RECORD

@@ -1,5 +1,6 @@
 smashbox/__init__.py,sha256=JsR9IyTpFFzIWZ4DuH_Lp4xUVNTMSq55WrtS8TbOlXg,105
-smashbox/test.py,sha256=3duv3-v8pAthtGFpd45yhxaJTagj0-V7zm5YAINY3pA,16840
+smashbox/mesh.hdf5,sha256=xQUVz1Kus1H2QUdYyt8opZUIUQnyaSlKKWaVyAaPYsc,49400
+smashbox/test.py,sha256=H0GR1AnGrROnzNx0AZDP1PcM-NvKQh0m4Yti8ZqEMnw,15997
 smashbox/test_average_stats.py,sha256=eN-qqv3IrPtQqLlzEY9DFz256bmO6gJmNBxag0JawhI,3944
 smashbox/test_mesh.r,sha256=t-wUggd0s9SNwA9kLuSL99jVZLOwQT8NA_jT4fLwbSU,270
 smashbox/test_mesh_from_graffas.py,sha256=XEcEU0Oq-qRFdwtdL8d0bfGs0mZMyEXqTyvDJTMtBfo,2011
@@ -12,11 +13,11 @@ smashbox/tutorial_report.py,sha256=3NDkU5Job07Sk60HkgnUyTg3g5XataqiwMylnCKIZ18,1
 smashbox/.spyproject/config/codestyle.ini,sha256=8fTq7BM4axczcMEjMD_fGu8ibnYNOgyqxKy1u9HrCec,96
 smashbox/.spyproject/config/encoding.ini,sha256=TwkxwYo4r4hIswOH9ntONulU1CvhbXWHNIrUodNGtvg,58
 smashbox/.spyproject/config/vcs.ini,sha256=q0i41LLfEdBPFIgdXJC-VfqxvUir7HNqmLZC5xSJpYQ,85
-smashbox/.spyproject/config/workspace.ini,sha256=XgBs_Y0Pk4-W1VOOUKgerxqOpdhLbPeL4kI_M16PKv0,478
+smashbox/.spyproject/config/workspace.ini,sha256=KvRF_shyCKbMbageLrTBUZqNwfNP2xu562fk30C4AOY,535
 smashbox/.spyproject/config/backups/codestyle.ini.bak,sha256=8fTq7BM4axczcMEjMD_fGu8ibnYNOgyqxKy1u9HrCec,96
 smashbox/.spyproject/config/backups/encoding.ini.bak,sha256=TwkxwYo4r4hIswOH9ntONulU1CvhbXWHNIrUodNGtvg,58
 smashbox/.spyproject/config/backups/vcs.ini.bak,sha256=q0i41LLfEdBPFIgdXJC-VfqxvUir7HNqmLZC5xSJpYQ,85
-smashbox/.spyproject/config/backups/workspace.ini.bak,sha256=XgBs_Y0Pk4-W1VOOUKgerxqOpdhLbPeL4kI_M16PKv0,478
+smashbox/.spyproject/config/backups/workspace.ini.bak,sha256=hRRxwX_R0DZdKHQyYmHzj8VJl0bYAjvyOccdssf45yc,500
 smashbox/.spyproject/config/defaults/defaults-codestyle-0.2.0.ini,sha256=sBDq-XuV-kJkPVgrTY2z4RjZhhaAkaF19DbwlXUsYkk,72
 smashbox/.spyproject/config/defaults/defaults-encoding-0.2.0.ini,sha256=6wfeMiG1iu4I31RHY5gZHZLJV41tJRB_5ikKYb2MLSo,34
 smashbox/.spyproject/config/defaults/defaults-vcs-0.2.0.ini,sha256=pQ547hBbdtIQil95oXaL2-tfwRB_Ir98o02XQNwU8Go,61
@@ -48,7 +49,7 @@ smashbox/init/smashbox.py,sha256=jBhgbud4zr_4HHld9brN3JojNO8tevWRVVmK2uSjqsY,586
 smashbox/model/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 smashbox/model/atmos_data_connector.py,sha256=srl1MZnBozi5iu-0G6bWxvLIfAyXfj9mv8-1h7f7aq4,20607
 smashbox/model/mesh.py,sha256=3heNjTBTCRXVTARIZaKHsLFcvdVu3azxHmZ2z1pIpg0,7075
-smashbox/model/model.py,sha256=hCRAPPbt6gzLX-eYOXqoMhDesR2S7vlMI9yd4F6SMGU,33489
+smashbox/model/model.py,sha256=uqzzlLO-rXKyopA_2DSdproxoGaqv9UOqnhnQgX881Y,33915
 smashbox/model/setup.py,sha256=cyLemXFA89MXj4c4d70_jq8zZay7WQL1XA3lyEI61X0,3276
 smashbox/plot/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 smashbox/plot/myplot.py,sha256=DYONa1Nb_X9g2zb5xtz0TXXNdZQX6SFXYJzeOATD2GY,42522
@@ -61,13 +62,13 @@ smashbox/stats/mystats.py,sha256=BwAH_Ni-fZCH80OFXbq7DDXwtVMF5yFP-plJfPrdqHg,653
 smashbox/stats/stats.py,sha256=4olCJFYccepHtbokFlFCDIKmdkbDxvQYyUGz6mGy-Ks,64693
 smashbox/tools/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 smashbox/tools/geo_toolbox.py,sha256=fWkYD-59uTOtEwMO0gO99biW8zhxypDzCWSK1s_-Vio,30834
-smashbox/tools/tools.py,sha256=ypBeMWs9Gg3Fhhc-RYDlQ1GPAlQMt8tuvnmDnQnKqWQ,14495
+smashbox/tools/tools.py,sha256=5syoZPNNrdmXBACWGt0HKY_xyczfmXr1-Y96KWcqfSA,14496
 smashbox/tutorials/Python_tutorial.md,sha256=KHDzQDkuLcGS8qLKNZ8VqG5p8FsVx6rKc65PDoloFrk,4825
 smashbox/tutorials/R_Graffas_tutorial.md,sha256=HmVW-JrZiUjVhDkTC05ikDOkpYWIE3JpWzrSsNQBUXc,7041
 smashbox/tutorials/R_tutorial.md,sha256=OVCqlDniblkhP-BKYA5tW3EDipbX2_O20WJaFZwjUVQ,4981
 smashbox/tutorials/__init__.py,sha256=pffqLm0vpwyjTzFROcLlIlRjRD_L3my6aot5xOECJ8c,139
 smashbox/tutorials/generate_doc.md,sha256=UDvCUi0VqpJS62N9u2nC-jwvoyudc2H3UnJROv8hWcs,303
-smashbox-1.0.dist-info/METADATA,sha256=MR1tBzbt9LsZwQh_j1xuty9Z3pmGarTrMDrO1FzeM9Y,54686
-smashbox-1.0.dist-info/WHEEL,sha256=tkmg4JIqwd9H8mL30xA7crRmoStyCtGp0VWshokd1Jc,105
-smashbox-1.0.dist-info/licenses/LICENSE,sha256=5UaZXMTG9FPN_EpUZgNXme_27Tfq6VF-Zo2S6Kjgnu0,12166
-smashbox-1.0.dist-info/RECORD,,
+smashbox-1.1.dist-info/METADATA,sha256=iNMQh8HkqQy484T-wO5FiCOwb3E-qzB4sP5WVLBBDSg,54694
+smashbox-1.1.dist-info/WHEEL,sha256=aha0VrrYvgDJ3Xxl3db_g_MDIW-ZexDdrc_m-Hk8YY4,105
+smashbox-1.1.dist-info/licenses/LICENSE,sha256=5UaZXMTG9FPN_EpUZgNXme_27Tfq6VF-Zo2S6Kjgnu0,12166
+smashbox-1.1.dist-info/RECORD,,

{smashbox-1.0.dist-info → smashbox-1.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any