Merge pull request #926 from KratosMultiphysics/use-gids-python

Use gids python

Author: jginternational

.github/workflows/tester.yml

@@ -31,7 +31,7 @@ jobs:
 
       - name: Install bins
         run: |
-          pip install --upgrade --force-reinstall --no-cache-dir KratosMultiphysics-all==9.2
+          pip install --upgrade --force-reinstall --no-cache-dir KratosMultiphysics-all==9.3.2
 
       # Copy problemtype to gid and copy exec
       - name: Move kratos where it should be

.gitignore

@@ -8,8 +8,9 @@ kratos.gid/exec/Kratos*
 *.orig
 .vscode/
 
-custom_tools/*
+dist
 .DS_Store
 
 *.zip
 *.tgz
+null

README.md

@@ -3,7 +3,7 @@
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/36d3d305c87e4bb398bc87ea2e3b890e)](https://www.codacy.com/gh/KratosMultiphysics/GiDInterface/dashboard?utm_source=github.com&utm_medium=referral&utm_content=KratosMultiphysics/GiDInterface&utm_campaign=Badge_Grade)
 [![Tester](https://github.com/KratosMultiphysics/GiDInterface/actions/workflows/tester.yml/badge.svg)](https://github.com/KratosMultiphysics/GiDInterface/actions/workflows/tester.yml)
 
-The user interface of Kratos with [GiD](http://www.gidhome.com).
+The user interface of Kratos with [GiD](http://www.gidsimulation.com).
 
 If you need the latest stable release, launch your GiD, navigate to Data > Problemtype > Internet retrieve and download Kratos there.
 Available for Linux. Windows, and macOS.
@@ -12,35 +12,41 @@ If you need the developer version, you are on the right place.
 
 ## First steps
 * 1- Clone this repository, or install a stable [release](https://github.com/KratosMultiphysics/GiDInterface/releases)
-* 2- Install the latest GiD developer version -> [Developer version](http://www.gidhome.com/download/developer-versions)
+* 2- Install the latest GiD developer version **(minimum 16.1.4d)** -> [Developer version](https://www.gidsimulation.com/gid-for-science/downloads/)
 * 3- Navigate to GiD's problemtype folder and delete any previous kratos.gid
     * Create there a link to our [kratos.gid](./kratos.gid/) downloaded in step 1
         * Windows: Simple shortcut to kratos.gid folder
 * 4- Choose your execution mode:
+    * 4.1- **Default execution mode.** Use GiD's python:
+        * You don't need to install python. The program will detect if you have any pending package to install.
+        * If there's any missing package, use the GiD command line and execute:
+        
+            `-np- W [GiD_Python_PipInstallMissingPackages [list $Kratos::pip_packages_required ] ]`
     * 4.1- To execute Kratos using the standard pip packages:
-        * Python version recommended: 3.9
+        * Python version recommended: 3.8, 3.9, 3.10, 3.11
         * Open a terminal and run
-            - Linux: `python3 -m pip install --upgrade --force-reinstall --no-cache-dir KratosMultiphysics-all==9.2`
-            - Windows: `python -m pip install --upgrade --force-reinstall --no-cache-dir KratosMultiphysics-all==9.2`
+            - Linux: `python3 -m pip install --upgrade --force-reinstall --no-cache-dir KratosMultiphysics-all==9.3.2`
+            - Windows: `python -m pip install --upgrade --force-reinstall --no-cache-dir KratosMultiphysics-all==9.3.2`
     * 4.2- To execute Kratos using your compiled binaries:
-        * Navigate to kratos.gid/exec/
-        * Create there a symbolic link to the kratos installation folder (where runkratos is located)
-            * Unix : `ln -s ~/Kratos Kratos` or maybe `ln -s ~/Kratos/bin/Release Kratos` if that's the destination folder
-            * Windows : `mklink /J Kratos C:\kratos\bin\Release` (choose actual Kratos installation folder)
+        * Fill the Kratos preferences windows with
+            - Path to the python folder
+            - Path to the kratos build folder
         * Step by step video: https://www.youtube.com/watch?v=zZq7ypDdudo
-    * 4.3- To execute Kratos using docker, just install docker
+    * 4.3- To execute Kratos using docker, just install docker.
+        * Note: This is the ONLY option if you are a **macOS** user at this moment
 
 ### Launch modes
 In Kratos preferences, select the execution mode:
+* GiD's python: Use the GiD internal python to run. It will help you install the pip packages
 * Pip packages: Kratos will be installed via `pip install`
 * local compiled: If you are a developer and build your applications, use this one
 * docker: If you do not want to install any dependency, just run via docker!
     * The default image is [fjgarate/kratos-run](https://hub.docker.com/repository/docker/fjgarate/kratos-run)
 
 ### Usage
 * Run GiD
-* Go to: Data / Problem type / kratos
-* kratos top menu / Developer mode (recommended)
+* Go to top menu: Data / Problem type / kratos
+* Go to top menu: kratos / Preferences / Developer mode (recommended)
 
 ### Examples
 * [Fluid dynamics example](https://github.com/KratosMultiphysics/Kratos/wiki/Running-an-example-from-GiD#3-set-a-fluid-dynamics-problem)

dockers/.dockerignore

@@ -0,0 +1,4 @@
+*
+!./*
+!dist/*
+!../dist/

dockers/create-release.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Change directory to the specified directory
+cd /tmp/dist/kratos-9.3.2/
+find . -type f -name "*.unix.bat" -print0 | xargs -0 dos2unix
+
+# Add execute permission to all .bat files in the directory
+# chmod 755 *.bat
+
+# Create a tgz file from the directory
+tar -czf ../kratos-9.3.2-linux-64.tgz *
+

dockers/deploy.bat

@@ -1,11 +1,11 @@
-
-set krversion=9.3
-set pyversion=3.11.2-alpine3.17
+set krversion=9.3.2
+set pyversion=3.10.5
+@REM 3.10.10-alpine3.17
 echo "Building kratos %krversion% on python %pyversion%"
-docker build --build-arg version=%krversion% --build-arg pyversion=%pyversion% -t kratos-run:%krversion%-py%pyversion% .
+docker build --build-arg krversion=%krversion% --build-arg pyversion=%pyversion% -t kratos-run:%krversion% -t kratos-run:latest .
+
 docker tag kratos-run:%krversion% fjgarate/kratos-run:%krversion%
-@REM docker push fjgarate/kratos-run:%krversion%
+docker push fjgarate/kratos-run:%krversion%
 
-@REM docker build -t -t kratos-run:latest .
-@REM docker tag kratos-run:latest fjgarate/kratos-run:latest
-@REM docker push fjgarate/kratos-run:latest
+docker tag kratos-run:latest fjgarate/kratos-run:latest
+docker push fjgarate/kratos-run:latest

dockers/dockerfile

@@ -1,15 +1,15 @@
 # Default values. Use --build-arg on build to change
-ARG pyversion=3.10
+ARG pyversion=3.10.8
 
 # Base pyton image
-FROM python:3.10.10-alpine3.17
-
-ARG krversion=9.3
-ENV krversion=9.3
+FROM python:$pyversion
+# FROM python:3.10.10-alpine3.17
 
 # Update pip
 RUN pip install --upgrade pip
 
+ARG krversion=9.3.2
+
 # Install Kratos and dependencies
 RUN python3 -m pip install KratosMultiphysics-all==$krversion numpy
 

dockers/linux-releaser.dockerfile

@@ -0,0 +1,14 @@
+FROM ubuntu
+
+RUN apt-get update && \
+    apt-get install -y dos2unix && \
+    apt-get clean
+
+WORKDIR /tmp
+COPY create-release.sh create-release.sh
+RUN dos2unix create-release.sh
+RUN chmod 755 /tmp/create-release.sh
+
+CMD /tmp/create-release.sh
+# docker build -t linux_releaser -f linux-releaser.dockerfile .
+# docker run --rm -v ${PWD}/dist:/tmp/dist linux_releaser

kratos.gid/exec/compiled.unix.bat

@@ -8,6 +8,8 @@ rm -f "$2/$1*.post.msh"
 rm -f "$2/$1.info"
 rm -f "$2/$1.err"
 rm -f "$2/$1.flavia.dat"
+rm -fr "$2/gid_output"
+rm -fr "$2/vtk_output"
 
 # include .bashrc if it exists
 if [ -f "$HOME/.bashrc" ]; then
@@ -18,28 +20,18 @@ fi
 # and maintains OLD_LD_LIBRARY_PATH with previous settings
 # therefore, we use the OLD_LD_LIBRARY_PATH and prepend the path to the kratos libs
 if [ "$OLD_LD_LIBRARY_PATH" != "" ]; then
-    export LD_LIBRARY_PATH="$3/exec/Kratos":"$3/exec/Kratos/libs":$OLD_LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH="$kratos_bin_path/libs":$OLD_LD_LIBRARY_PATH
 else
     # do not add the ':'
-    export LD_LIBRARY_PATH="$3/exec/Kratos":"$3/exec/Kratos/libs"
+    export LD_LIBRARY_PATH="$kratos_bin_path/libs"
 fi
 
 # Prevents the PYTHONHOME error from happening and isolate possible python repacks present
 # in the system and interfeering with runkratos
-export PYTHONPATH="$3/exec/Kratos":$PYTHONPATH
+export PYTHONPATH=$kratos_bin_path:$PYTHONPATH
 
+KERNEL_NAME="linux"
 
-# if mac
-KERNEL=`uname -s`
-if [ $KERNEL = "Darwin" ]; then
-    KERNEL_NAME="macosx"
-    export DYLD_LIBRARY_PATH="$3/exec/Kratos":"$3/exec/Kratos/libs":$DYLD_LIBRARY_PATH
-    export DYLD_FALLBACK_LIBRARY_PATH="$3/exec/Kratos":"$3/exec/Kratos/libs":$DYLD_FALLBACK_LIBRARY_PATH
-    export PYTHONPATH="$3/exec/Kratos/Lib":"$3/exec/Kratos/Lib/lib-dynload/":$PYTHONPATH
-    export PYTHONHOME="$3/exec/Kratos"
-else
-    KERNEL_NAME="linux"
-fi
 
 # Run Python using the script MainKratos.py
-"$3/exec/Kratos/runkratos" MainKratos.py > "$2/$1.info" 2> "$2/$1.err"
+$python_path/python3 MainKratos.py > "$2/$1.info" 2> "$2/$1.err"

kratos.gid/exec/compiled.win.bat

@@ -9,8 +9,19 @@ REM ErrorFile: "%2\%1.err"
 
 DEL "%2\%1.info"
 DEL "%2\%1.err"
+DEL "%2\%1*.post.bin"
+DEL "%2\%1*.post.res"
+DEL "%2\%1*.post.msh"
+DEL "%2\%1.info"
+DEL "%2\%1.err"
+DEL "%2\%1.flavia.dat"
+DEL "%2\gid_output"
+DEL "%2\vtk_output"
+
+@REM echo "Launching on Compiled for windows -> %kratos_bin_path%" > .run
 
-set PATH=%3\\exec\\kratos;%3\\exec\\kratos\\libs;%PATH%
+set PATH=%kratos_bin_path%\libs;%PATH%
+set PYTHONPATH=%kratos_bin_path%
 
 REM Run Python using the script MainKratos.py
-"%3\\exec\\kratos\\runkratos" MainKratos.py > "%2\\%1.info" 2> "%2\\%1.err"
+%python_path%/python MainKratos.py > "%2\\%1.info" 2> "%2\\%1.err"