Merge pull request #899 from KratosMultiphysics/available-apps

apps in launchers come from json

Author: jginternational

.github/workflows/tester.yml

@@ -29,6 +29,10 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
 
+      - name: Install bins
+        run: |
+          pip install --upgrade --force-reinstall --no-cache-dir KratosMultiphysics-all==9.2
+
       # Copy problemtype to gid and copy exec
       - name: Move kratos where it should be
         run: |

kratos.gid/apps/DEMLauncher/app.json

@@ -6,7 +6,7 @@
     ],
     "start_script":"::DemLauncher::Init",
     "requeriments":{
-        "apps_exist":["DEM", "DEMPFEM", "FluidDEM", "CDEM"],
+        "apps":["DEM", "DEMPFEM", "FluidDEM", "CDEM"],
         "minimum_gid_version":"15.1.3d"
     },
     "permissions": {

kratos.gid/apps/DEMLauncher/start.tcl

@@ -7,8 +7,7 @@ namespace eval ::DemLauncher {
 proc ::DemLauncher::Init { app } {
     variable available_apps
 
-    # TODO: Get apps from json
-    set available_apps [list DEM DEMPFEM FluidDEM CDEM]
+    set available_apps [dict get [$app getProperty requeriments] apps]
     # Allow to open the tree
     set ::spdAux::TreeVisibility 0
 

kratos.gid/apps/FluidLauncher/app.json

@@ -6,7 +6,7 @@
     ],
     "start_script":"::FluidLauncher::Init",
     "requeriments":{
-        "apps_exist":["Fluid","EmbeddedFluid", "PotentialFluid", "Buoyancy", "ConjugateHeatTransfer", "FluidDEM"],
+        "apps":["Fluid","EmbeddedFluid", "PotentialFluid", "Buoyancy", "ConjugateHeatTransfer", "FluidDEM"],
         "minimum_gid_version":"15.1.3d"
     },
     "permissions": {

kratos.gid/apps/FluidLauncher/start.tcl

@@ -7,9 +7,8 @@ namespace eval ::FluidLauncher {
 proc ::FluidLauncher::Init { app } {
     variable available_apps
 
-    # TODO: Get apps from json
-    set available_apps [list Fluid EmbeddedFluid PotentialFluid Buoyancy ConjugateHeatTransfer FluidDEM FreeSurface]
-
+    set available_apps [dict get [$app getProperty requeriments] apps]
+    
     ::FluidLauncher::FluidAppSelectorWindow
 }
 

kratos.gid/apps/PfemLauncher/app.json

@@ -6,7 +6,7 @@
     ],
     "start_script":"::PfemLauncher::Init",
     "requeriments":{
-        "apps_exist":["PfemFluid", "DEMPFEM", "PfemThermic"],
+        "apps":["PfemFluid", "DEMPFEM", "PfemThermic"],
         "minimum_gid_version":"15.1.3d"
     },
     "permissions": {

kratos.gid/apps/PfemLauncher/start.tcl

@@ -7,7 +7,7 @@ namespace eval ::PfemLauncher {
 proc ::PfemLauncher::Init { app } {
     variable available_apps
 
-    set available_apps [list PfemFluid DEMPFEM PfemThermic]
+    set available_apps [dict get [$app getProperty requeriments] apps]
     # Allow to open the tree
     set ::spdAux::TreeVisibility 0
 

kratos.gid/apps/ThermicLauncher/app.json

@@ -6,7 +6,7 @@
     ],
     "start_script": "::ThermicLauncher::Init",
     "requeriments": {
-        "apps_exist": [
+        "apps": [
             "ConvectionDiffusion",
             "Buoyancy",
             "ConjugateHeatTransfer"

kratos.gid/apps/ThermicLauncher/start.tcl

@@ -6,10 +6,9 @@ namespace eval ::ThermicLauncher {
 
 proc ::ThermicLauncher::Init { app } {
     variable available_apps
-
-    # TODO: Get apps from json
-    set available_apps [list ConvectionDiffusion Buoyancy ConjugateHeatTransfer]
 
+    set available_apps [dict get [$app getProperty requeriments] apps]
+
     ::ThermicLauncher::AppSelectorWindow
 }