Merge branch 'terraz_dev' into adists_release

src/Solver/CommandLine.py

@@ -99,7 +99,10 @@ class CommandLineSolver(AbstractSolver):
         params = study.river.get_params(self.type)
         args = params.get_by_key("all_command_line_arguments")
 
-        return args.split(" ")
+        if args is None:
+            return []
+        else:
+            return args.split(" ")
 
     def input_param(self):
         """Return input command line parameter(s)

src/Solver/Mage.py

@@ -599,29 +599,50 @@ class Mage(CommandLineSolver):
         if qlog is not None:
             qlog.put("Export VAR file")
 
-        with mage_file_open(os.path.join(repertory, f"{name}.VAR"), "w+") as f:
-            files.append(f"{name}.VAR")
+        nb_cv = 0
+        for hs in hydraulic_structures:
+            if hs.input_reach is None:
+                continue
 
-            for hs in hydraulic_structures:
-                if hs.input_reach is None:
-                    continue
+            if not hs.input_reach.is_enable():
+                continue
 
-                if not hs.input_reach.is_enable():
-                    continue
+            if not hs.enabled:
+                continue
 
-                for bhs in hs.basic_structures:
+            for bhs in hs.basic_structures:
+                if bhs.enabled:
                     logger.info(bhs._type)
-                    if bhs._type != "CV":
+                    if bhs._type == "CV":
+                        nb_cv += 1
+
+        if nb_cv != 0:
+            with mage_file_open(os.path.join(
+                                repertory, f"{name}.VAR"), "w+") as f:
+                files.append(f"{name}.VAR")
+
+                for hs in hydraulic_structures:
+                    if hs.input_reach is None:
                         continue
 
-                    name = bhs.name
-                    if name == "":
-                        name = f"HS_{bhs.id:>3}".replace(" ", "0")
+                    if not hs.input_reach.is_enable():
+                        continue
 
-                    f.write(
-                        f"${name} clapet"
-                    )
+                    if not hs.enabled:
+                        continue
 
+                    for bhs in hs.basic_structures:
+                        logger.info(bhs._type)
+                        if bhs._type != "CV":
+                            continue
+
+                        name = bhs.name
+                        if name == "":
+                            name = f"HS_{bhs.id:>3}".replace(" ", "0")
+
+                        f.write(
+                            f"${name} clapet"
+                        )
         return files
 
     def _export_DEV(self, study, repertory, qlog, name="0"):