Merge branch 'develop'

Former-commit-id: 2443557

CONTRIBUTING.md

@@ -56,7 +56,7 @@ The main data structure is a Python Dictionary with different data attached to i
 
 # Need more help?
 If you need help on how to contribute please contact one of the following people
-- Andrés Vieira Vázquez - [email protected]
+- Lorena Docasar Vázquez - [email protected]
 - Orlando García Feal - [email protected]
 - José Manuel Domínguez Alonso - [email protected]
 - Alejandro Jacobo Cabrera Crespo - [email protected]

DesignSPHysics.FCMacro

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3.7
 # -*- coding: utf-8 -*-
 
 """

DesignSPHysics.py.REMOVED.git-id

@@ -1 +1 @@
-d75e570df4e0c5883f952e4fce9ae329ff34a4e6
+81a84f4ddb8bb8673d1b35b16a8cd3d1ee63e36d

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2017 - Andrés Vieira (anvieiravazquez@gmail.com)
+Copyright (C) 2019 - Andrés Vieira & Lorena Docasar(docasarlorena@gmail.com)
 EPHYSLAB Environmental Physics Laboratory, Universidade de Vigo
 EPHYTECH Environmental Physics Technologies
 

README.md

@@ -15,7 +15,7 @@ It includes support for pre-processing with GenCase, simulation with DualSPHysic
 
 In the future the code will be modular, so integration with different SPH solvers can be used. Right now it's optimized to be used with DualSPHysics 4.X
 
-It is developed as a FreeCAD module with a macro bootstrapper, in Python 2.7, using the QT libraries via PySide.
+It is developed as a FreeCAD module with a macro bootstrapper, in Python 3.7, using the QT libraries via PySide.
 
 ## Installation instructions
 To install DesignSPHysics you have 2 options: Using an installer (release version) or using a development build (git)
@@ -25,13 +25,12 @@ To install a release version go to the download section of the [official webpage
 
 Execute the installer (installer.exe on Windows and installer on GNU/Linux) to open the installer. Then press install and it will copy the needed scripts in FreeCAD's macro default folder.
 
-It can also be done manually, unpackage release-windows.zip or release-linux.tar.gz, choose 'resource' folder and rename the folder to 'DesignSPHysics'. Then copy the folder to the Mod folder of the FreeCAD installation directory. 
+It can also be done manually, unpackage release-windows.zip or release-linux.tar.gz, choose 'resource' folder and rename the folder to 'DesignSPHysics'. Then copy the folder to the Mod folder of the FreeCAD installation directory.
 
 By default, for example, in Windows, it is located in `%appdata%/FreeCAD/Mod` or in Linux in `~/.FreeCAD/Mod`
 
 Next open the folder and copy the file `DesignSPHysics.FCMacro` into the FreeCAD macro directory (`%appdata%/FreeCAD/Macro` on Windows; `~/.FreeCAD/Macro` on GNU/Linux).
 
-
 ### Installing a develompent build
 Clone this repository and rename the folder to 'DesignSPHysics'. Then copy the folder to the Mod folder of the FreeCAD installation directory. 
 
@@ -46,7 +45,7 @@ You can check the [DesignSPHysics Wiki](http://design.sphysics.org/wiki) to get
 Please check the [CONTRIBUTING file](CONTRIBUTING.md) to view information about how to contribute to the project and how it is structured.
 
 ## Copyright and License
-Copyright (C) 2017 - Andrés Vieira ([email protected])
+Copyright (C) 2019
 EPHYSLAB Environmental Physics Laboratory, Universidade de Vigo
 EPHYTECH Environmental Physics Technologies
 
@@ -64,3 +63,4 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with DesignSPHysics.  If not, see <http://www.gnu.org/licenses/>.
+

default-config.json

@@ -1,7 +1,7 @@
 {
     "windows":{
         "gencase_path": "./dualsphysics/bin/GenCase4_win64.exe",
-        "dsphysics_path": "./dualsphysics/bin/DualSPHysics4.2_win64.exe",
+        "dsphysics_path": "./dualsphysics/bin/DualSPHysics4.4_win64.exe",
         "partvtk4_path": "./dualsphysics/bin/PartVTK4_win64.exe",
         "computeforces_path": "./dualsphysics/bin/ComputeForces4_win64.exe",
         "floatinginfo_path": "./dualsphysics/bin/FloatingInfo4_win64.exe",
@@ -12,7 +12,7 @@
     },
     "linux":{
         "gencase_path": "./dualsphysics/bin/GenCase4_linux64",
-        "dsphysics_path": "./dualsphysics/bin/DualSPHysics4.2_linux64",
+        "dsphysics_path": "./dualsphysics/bin/DualSPHysics4.4_linux64",
         "partvtk4_path": "./dualsphysics/bin/PartVTK4_linux64",
         "computeforces_path": "./dualsphysics/bin/ComputeForces4_linux64",
         "floatinginfo_path": "./dualsphysics/bin/FloatingInfo4_linux64",

ds_modules/constants.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3.7
 # -*- coding: utf-8 -*-
 """DesignSPHysics Define Constants.
 
@@ -8,7 +8,7 @@
 
 
 """
-Copyright (C) 2018 - Andrés Vieira ([email protected]) & Lorena Docasar Vázquez ([email protected])
+Copyright (C) 2019
 EPHYSLAB Environmental Physics Laboratory, Universidade de Vigo
 
 This file is part of DesignSPHysics.

ds_modules/dsphwidgets.py.REMOVED.git-id

@@ -1 +1 @@
-c927795edb2c568454507f76d2454fe4f65356eb
+3cff4b37f8d46ba341c54c515c7d5011c40390ff

ds_modules/execution_parameters.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.7
+#!/usr/bin/env python3.7
 # -*- coding: utf-8 -*-
 """DesignSPHysics Execution Parameters.
 
@@ -9,11 +9,8 @@
 """
 
 import sys
-reload(sys)
-sys.setdefaultencoding('utf-8')
 
-
-# Copyright (C) 2016 - Andrés Vieira ([email protected])
+# Copyright (C) 2019
 # EPHYSLAB Environmental Physics Laboratory, Universidade de Vigo
 #
 # This file is part of DesignSPHysics.