Merge remote-tracking branch 'origin/master'

Author: AFranci

.gitignore

@@ -2,10 +2,14 @@
 *.lnk
 
 # Kratos execution folder
-kratos.gid/exec/*
-!kratos.gid/exec/README.md
+kratos.gid/exec/Kratos*
+# !kratos.gid/exec/README.md
+!kratos.gid/exec/MainKratos.py
 *.orig
 .vscode/
 
 custom_tools/*
 .DS_Store
+
+*.zip
+*.tgz

README.md

@@ -23,6 +23,13 @@ If you need the developer version, you are on the right place.
 ### Step by step video
 https://www.youtube.com/watch?v=zZq7ypDdudo
 
+## Launch modea
+In Kratos preferences, select the execution mode:
+* 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

dockers/dockerfile

@@ -0,0 +1,10 @@
+FROM python:3.9
+
+RUN pip install KratosMultiphysics-all numpy
+WORKDIR "/model"
+RUN chmod 777 /model
+ENTRYPOINT [ "python3", "MainKratos.py" ]
+
+# docker build --tag="kratos-run:latest" -t kratos-run .
+# docker tag kratos-run:latest fjgarate/kratos-run:latest
+# docker push fjgarate/kratos-run:0.0.1

kratos.gid/apps/Buoyancy/app.json

@@ -4,6 +4,10 @@
     "prefix": "Buoyancy_",
     "themed": false,
     "kratos_name": "Buoyancyapplication",
+    "python_packages": [
+        "KratosFluidDynamicsApplication",
+        "KratosConvectionDiffusionApplication"
+    ],
     "dimensions": [
         "2D",
         "3D"
@@ -16,10 +20,13 @@
         "write/write.tcl",
         "write/writeProjectParameters.tcl"
     ],
-    "start_script":"::Buoyancy::Init",
-    "requeriments":{
-        "apps":["Fluid", "ConvectionDiffusion"],
-        "minimum_gid_version":"15.1.3d"
+    "start_script": "::Buoyancy::Init",
+    "requeriments": {
+        "apps": [
+            "Fluid",
+            "ConvectionDiffusion"
+        ],
+        "minimum_gid_version": "15.1.3d"
     },
     "permissions": {
         "open_tree": true,
@@ -32,6 +39,6 @@
         "properties_location": "json",
         "model_part_name": "ThermalModelPart"
     },
-    "main_launch_file": "python/MainKratos.py",
+    "main_launch_file": "../../exec/MainKratos.py",
     "examples": "examples/examples.xml"
-}
+}

kratos.gid/apps/Buoyancy/python/KratosFluid.py

@@ -1,7 +1,7 @@
 namespace eval ::Buoyancy::write {
     namespace path ::Buoyancy::write
     Kratos::AddNamespace [namespace current]
-    
+
     variable writeAttributes
 }
 
@@ -54,7 +54,7 @@ proc ::Buoyancy::write::writeModelPartEvent { } {
 proc ::Buoyancy::write::writeCustomFilesEvent { } {
     # Materials
     Buoyancy::write::WriteMaterialsFile True
-    write::SetConfigurationAttribute main_launch_file [GetAttribute main_launch_file]
+    write::SetConfigurationAttribute main_launch_file [ConvectionDiffusion::write::GetAttribute main_launch_file]
 }
 
 proc ::Buoyancy::write::Validate {} {
@@ -65,7 +65,7 @@ proc ::Buoyancy::write::Validate {} {
 proc ::Buoyancy::write::WriteMaterialsFile {{write_const_law True} {include_modelpart_name True} } {
     # Note: This will generate 2 quasi identical files for materials. The difference is the model_part_name
 
-    # Write fluid material file 
+    # Write fluid material file
     Fluid::write::WriteMaterialsFile $write_const_law $include_modelpart_name
 
     # Write Buoyancy materials file

kratos.gid/apps/Buoyancy/python/MainKratos.py

@@ -2,6 +2,9 @@
 proc ::Buoyancy::write::getParametersDict { } {
     set projectParametersDict [dict create]
 
+    # Analysis stage field
+    dict set projectParametersDict analysis_stage "KratosMultiphysics.ConvectionDiffusionApplication.convection_diffusion_analysis"
+
     # problem data
     dict set projectParametersDict problem_data [::Buoyancy::write::GetProblemData_Dict]
 

kratos.gid/apps/Buoyancy/write/write.tcl

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ConstitutiveLaws>
     <!--Newtonian constitutive laws-->
-    <CLaw n="Newtonian2DLaw" pn="Newtonian" ProductionReady="ProductionReady" help="Newtonian fluid" App="Fluid" ElementCompressibility="Incompressible" ImplementedInApplication="FluidDynamicsApplication" Dimension="2D">
+    <CLaw n="Newtonian2DLaw" pn="Newtonian"  help="Newtonian fluid" App="Fluid" ElementCompressibility="Incompressible" ImplementedInApplication="FluidDynamicsApplication" Dimension="2D">
         <inputs>
             <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="1.225"/>
             <parameter n="DYNAMIC_VISCOSITY" pn="Dynamic viscosity" unit_magnitude="M/(L*T)" units="kg/(m*s)" v="1.846e-5" help="Set the dynamic viscosity."/>
@@ -12,7 +12,7 @@
         </outputs>
     </CLaw>
 
-    <CLaw n="Newtonian3DLaw" pn="Newtonian" ProductionReady="ProductionReady" help="Newtonian fluid" App="Fluid" ElementCompressibility="Incompressible" ImplementedInApplication="FluidDynamicsApplication" Dimension="3D">
+    <CLaw n="Newtonian3DLaw" pn="Newtonian"  help="Newtonian fluid" App="Fluid" ElementCompressibility="Incompressible" ImplementedInApplication="FluidDynamicsApplication" Dimension="3D">
         <inputs>
             <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="1.225"/>
             <parameter n="DYNAMIC_VISCOSITY" pn="Dynamic viscosity" unit_magnitude="M/(L*T)" units="kg/(m*s)" v="1.846e-5" help="Set the dynamic viscosity."/>
@@ -24,7 +24,7 @@
     </CLaw>
 
     <!--Newtonian with sound velocity constitutive laws-->
-    <CLaw n="WeaklyCompressibleNewtonian2DLaw" pn="Newtonian" ProductionReady="ProductionReady" help="Newtonian fluid with sound velocity for weak compressibility" App="Fluid" ElementCompressibility="WeaklyCompressible" ImplementedInApplication="FluidDynamicsApplication" Dimension="2D" KratosName="Newtonian2DLaw">
+    <CLaw n="WeaklyCompressibleNewtonian2DLaw" pn="Newtonian"  help="Newtonian fluid with sound velocity for weak compressibility" App="Fluid" ElementCompressibility="WeaklyCompressible" ImplementedInApplication="FluidDynamicsApplication" Dimension="2D" KratosName="Newtonian2DLaw">
         <inputs>
             <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="1.225"/>
             <parameter n="DYNAMIC_VISCOSITY" pn="Dynamic viscosity" unit_magnitude="M/(L*T)" units="kg/(m*s)" v="1.846e-5" help="Set the dynamic viscosity."/>
@@ -36,7 +36,7 @@
         </outputs>
     </CLaw>
 
-    <CLaw n="WeaklyCompressibleNewtonian3DLaw" pn="Newtonian" ProductionReady="ProductionReady" help="Newtonian fluid with sound velocity for weak compressibility" App="Fluid" ElementCompressibility="WeaklyCompressible" ImplementedInApplication="FluidDynamicsApplication" Dimension="3D" KratosName="Newtonian3DLaw">
+    <CLaw n="WeaklyCompressibleNewtonian3DLaw" pn="Newtonian"  help="Newtonian fluid with sound velocity for weak compressibility" App="Fluid" ElementCompressibility="WeaklyCompressible" ImplementedInApplication="FluidDynamicsApplication" Dimension="3D" KratosName="Newtonian3DLaw">
         <inputs>
             <parameter n="DENSITY" pn="Density" unit_magnitude="Density" units="kg/m^3" v="1.225"/>
             <parameter n="DYNAMIC_VISCOSITY" pn="Dynamic viscosity" unit_magnitude="M/(L*T)" units="kg/(m*s)" v="1.846e-5" help="Set the dynamic viscosity."/>

kratos.gid/apps/Buoyancy/write/writeProjectParameters.tcl

@@ -3,7 +3,10 @@
     "name": "CDEM",
     "prefix": "DEM",
     "themed": false,
-    "kratos_name": "DEMapplication",
+    "kratos_name": "DEMApplication",
+    "python_packages": [
+        "KratosDEMApplication","numpy"
+    ],
     "dimensions": [
         "2D",
         "3D"
@@ -21,10 +24,12 @@
         "xml/XmlController.tcl",
         "xml/BulkGroup.tcl"
     ],
-    "start_script":"::CDEM::Init",
-    "requeriments":{
-        "apps":["DEM"],
-        "minimum_gid_version":"15.1.3d"
+    "start_script": "::CDEM::Init",
+    "requeriments": {
+        "apps": [
+            "DEM"
+        ],
+        "minimum_gid_version": "15.1.3d"
     },
     "permissions": {
         "open_tree": true,
@@ -34,4 +39,4 @@
     },
     "main_launch_file": "python/MainKratos.py",
     "examples": "examples/examples.xml"
-}
+}