Toolchain fixes

Author: henryleberre

.github/workflows/ci.yml

@@ -50,7 +50,9 @@ jobs:
 
       - name: Setup Ubuntu
         if:   matrix.os == 'ubuntu' && matrix.intel == false
-        run:  sudo apt install tar wget make cmake gcc g++ python3 python3-dev "openmpi-*" libopenmpi-dev
+        run: |
+          sudo apt update -y
+          sudo apt install -y tar wget make cmake gcc g++ python3 python3-dev "openmpi-*" libopenmpi-dev
 
       - name: Setup Ubuntu (Intel)
         if:   matrix.os == 'ubuntu' && matrix.intel == true

mfc.sh

@@ -230,7 +230,7 @@ else
     cmake_patch=$(echo $cmake_verstr | tr '.' '\n' | sed -n 3p)
     cmake_version="$(printf %05d%05d%05d $cmake_major $cmake_minor $cmake_patch)"
 
-    MFC_CMAKE_MIN_VERSTR=$(cat CMakeLists.txt | head -n 1 | sed 's/[^0-9,.]*//g')
+    MFC_CMAKE_MIN_VERSTR=$(cat CMakeLists.txt | grep cmake_minimum_required | head -n 1 | sed 's/[^0-9,.]*//g')
     MFC_CMAKE_MIN_MAJOR=$(echo $MFC_CMAKE_MIN_VERSTR | tr '.' '\n' | head -n 1)
     MFC_CMAKE_MIN_MINOR=$(echo $MFC_CMAKE_MIN_VERSTR | tr '.' '\n' | head -n 2 | tail -n 1)
     MFC_CMAKE_MIN_PATCH=0
@@ -379,6 +379,8 @@ if [ ! -f "$(pwd)/build/venv/bin/activate" ]; then
     fi
 
     ok "Created a$MAGENTA Python$COLOR_RESET virtual environment (venv)."
+
+    rm "$(pwd)/build/requirements.txt" > /dev/null 2>&1 || true
 fi
 
 

misc/viz.py

@@ -114,7 +114,7 @@ def calculate_layout(n):
 
     fig, axes = plt.subplots(rows, cols, figsize=PLOT_DIMS)
 
-    for i, name in enumerate(df.keys()[1:]):
+    for i, name in enumerate(VARS.keys()):
         print(f" * Plotting {name}...")
         plot(name, t_step, axes[i % rows, i // rows])
 

toolchain/mfc/build.py

@@ -1,8 +1,9 @@
 import os, typing, dataclasses
 
-from .state   import ARG
-from .printer import cons
-from .        import common
+from .state     import ARG
+from .printer   import cons
+from .          import common
+from .run.input import MFCInputFile
 
 
 @dataclasses.dataclass
@@ -189,6 +190,9 @@ def build_target(name: str, history: typing.List[str] = None):
         if common.system(configure, no_exception=True) != 0:
             raise common.MFCException(f"Failed to configure the [bold magenta]{name}[/bold magenta] target.")
 
+    if not target.isDependency and ARG("command") == "build":
+        MFCInputFile("", "", {}).generate(name, bOnlyFPPs = True)
+
     common.system(build,   exception_text=f"Failed to build the [bold magenta]{name}[/bold magenta] target.")
     common.system(install, exception_text=f"Failed to install the [bold magenta]{name}[/bold magenta] target.")
 

toolchain/mfc/run/input.py

@@ -221,8 +221,9 @@ def __generate_post_fpp(self) -> None:
         pass
 
     # Generate case.fpp & [target_name].inp
-    def generate(self, target_name: str) -> None:
-        self.__generate_inp(target_name)
+    def generate(self, target_name: str, bOnlyFPPs = False) -> None:
+        if not bOnlyFPPs:
+            self.__generate_inp(target_name)
 
         cons.print()