Merge remote-tracking branch 'origin/main' into avalanching-numba-patch

Author: Sierd

aeolis/avalanching.py

@@ -96,6 +96,8 @@ def avalanche(s, p):
     if p['process_avalanche']:
         nx = p['nx'] + 1
         ny = p['ny'] + 1
+        nx = p['nx'] + 1
+        ny = p['ny'] + 1
 
         # parameters - only dynamic angle used in loop for now. 
         # Static angle can be used for more complex criterions in later

aeolis/console.py

@@ -36,6 +36,7 @@
 
 Commands:
     examples  sets up some examples for AeoLiS.
+    gui       starts the AeoLiS graphical user interface (GUI).
     run       runs model for simulating supply-limited aeolian sediment...
     wind      A wind time series generation tool for the aeolis model.
 
@@ -45,6 +46,14 @@
 
         aeolis run <path_to_model_configuration_file.txt>
 
+> Start the GUI
+
+        aeolis gui
+
+        Or with a configuration file:
+
+        aeolis gui <path_to_model_configuration_file.txt>
+
 > To generate a wind time series
 
         aeolis wind <path_to_wind.txt>
@@ -208,6 +217,56 @@ def examples(
     print("Done. Examples copied to: \n %s" % destination_path)
 
 
+@aeolis_app.command(name="gui", help="starts the AeoLiS graphical user interface (GUI).")
+def gui(
+    config: Annotated[
+        Optional[str],
+        typer.Argument(
+            help="optional configuration file to load on startup"
+        ),
+    ] = None,
+):
+    print_license()
+
+    try:
+        import tkinter as tk
+        from aeolis.gui import AeolisGUI
+        import aeolis.inout
+    except ImportError as e:
+        print(f"Error: Failed to import required GUI modules: {e}")
+        print("Make sure tkinter is installed on your system.")
+        sys.exit(1)
+
+    # Load configuration if provided, otherwise use defaults
+    if config and os.path.isfile(config):
+        print(f"Loading configuration from: {config}")
+        dic = aeolis.inout.read_configfile(config)
+        configfile = config
+    else:
+        if config:
+            print(f"Warning: Configuration file '{config}' not found. Using defaults.")
+        print("Starting GUI with default configuration...")
+        dic = {}
+        configfile = "No file selected"
+
+    # Create and start the GUI
+    root = tk.Tk()
+    
+    # Set the configfile in the gui module
+    import aeolis.gui as gui_module
+    gui_module.configfile = configfile
+    
+    app = AeolisGUI(root, dic)
+    
+    # Make window appear on top at startup
+    root.lift()
+    root.attributes('-topmost', True)
+    root.after_idle(root.attributes, '-topmost', False)
+    root.focus_force()
+    
+    root.mainloop()
+
+
 def print_license():
     print("AeoLiS  Copyright (c) 2023  AeoLiS Development Team")
     print("This program comes with ABSOLUTELY NO WARRANTY.")