v240

.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="eu/engys/vtk/actors/" kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

.gitignore

@@ -0,0 +1 @@
+/bin/

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>HELYX-OS</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

README.md

@@ -1,11 +1,18 @@
 # HELYX-OS
-[HELYX-OS](http://engys.com/products/helyx-os) is an open-source Graphical User Interface designed to work natively with OpenFOAM [version 2.4.0](http://www.openfoam.org/archive/2.4.0/download/source.php). The GUI is developed by [ENGYS](http://engys.com/) using Java+[VTK](http://www.vtk.org/) and delivered to the public under the GNU General Public License.
+[HELYX-OS](http://engys.com/products/helyx-os) is an open-source Graphical User Interface designed to work natively with OpenFOAM [version 4.1](http://www.openfoam.org/archive/4.1/download/source.php) and OpenFOAM [v1606+](http://openfoam.com/download/install-binary.php). The GUI is developed by [ENGYS](http://engys.com/) using Java+[VTK](http://www.vtk.org/) and delivered to the public under the GNU General Public License.
 
 HELYX-OS has been created to facilitate the usage of the standard OpenFOAM libraries, by removing the complexity of text based case definition in favour of an intuitive easy-to-use graphical user interface. The GUI is focused on pre-processing tasks, including meshing, case definition and solver execution.  Visit the [HELYX-OS Project Page](http://engys.github.io/HELYX-OS/) for more information.
 
 ## Installing the latest binary file for 64 bit linux
 Visit [http://engys.github.io/HELYX-OS/](http://engys.github.io/HELYX-OS/) to download the latest HELYX-OS binary and view [installation instructions](http://engys.github.io/HELYX-OS/installation/). 
 
+## Configuring HELYX-OS for OpenFOAM v1606+
+To use OpenFOAM v1606+ installed via Docker following the instructions detailed [here](http://openfoam.com/download/install-binary.php) you need to do the following:
+ - Open HELYX-OS
+ - Go to Edit>Preferences
+ - In the "Misc" section check the "Use Docker" tick box and then type "openfoamplus/of_v1606plus_centos66" in the "Docker Image" textbox
+ - Press "OK" to apply settings
+
 ## Compiling HELYX-OS on your own
 
 ### Prerequisites

build_src.xml

@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project default="dist" name="Create Runnable Jar for Project HELYXOS with libraries in sub-folder">
+<project default="dist" name="Create Jar for HELYX-OS">
 
-	<property name="component.name" value="HelyxOS_MOD" />
-	<property name="component.version" value="2.3.1" />
-	<property name="component.vendor" value="" />
-
-	<property name="version" value="ocfd" />
-	<property name="version.name" value="OCFD" />
+	<property name="component.name" value="HELYX-OS" />
+	<property name="component.vendor" value="Engys" />
+	<property name="component.mail" value="[email protected]" />
+	<property name="component.site" value="http://engys.github.io/HELYX-OS/" />
+	<property name="component.copyright" value="Copyright © ENGYS Ltd 2016. All rights reserved." />
+	<property name="component.launcher" value="eu.engys.launcher.Launcher" />
+	<property name="component.version" value="2.4.0" />
 
 	<property name="jar.name" value="${component.name}.jar" />
-
 	<property name="src.dir" value="src" />
 	<property name="build.dir" value="build" />
-
 	<property name="lib.dir" value="lib" />
-	<property name="dist.dir" value="dist" />
 
-	<path id="main.path">
+	<path id="build.path">
 		<fileset dir="${lib.dir}">
 			<include name="**/*.jar" />
 		</fileset>
@@ -29,32 +27,34 @@
 	<target name="compile" depends="init">
 		<javac debug="true" destdir="${build.dir}" target="1.7" source="1.7" verbose="false" srcdir="${src.dir}" includeantruntime="false" includejavaruntime="yes">
 			<include name="eu/engys/**/*.java" />
-			<include name="vtk/**/*.java" />
-			<classpath refid="main.path" />
+			<classpath refid="build.path" />
 		</javac>
 		<copy todir="${build.dir}">
 			<fileset dir="${src.dir}" includes="**/resources/**/*, **/*.png, **/*.jpeg, **/*.jpg, **/*.gif, **/*.properties" />
 		</copy>
-        <touch file="${build.dir}/eu/engys/resources/version.properties" />
-        <propertyfile file="${build.dir}/eu/engys/resources/version.properties">
-            <entry key="name" value="${component.name}" />
-            <entry key="vendor" value="${component.vendor}" />
-            <entry key="version" value="${component.version}" />
-            <entry key="build" type="date" value="now" pattern="yyyy-MM-dd" />
-        </propertyfile>
+		<touch file="${build.dir}/eu/engys/resources/version.properties" />
+		<propertyfile file="${build.dir}/eu/engys/resources/version.properties">
+			<entry key="name" value="${component.name}" />
+			<entry key="vendor" value="${component.vendor}" />
+			<entry key="version" value="${component.version}" />
+			<entry key="mail" value="${component.mail}" />
+			<entry key="site" value="${component.site}" />
+			<entry key="copyright" value="${component.copyright}" />
+			<entry key="build" type="date" value="now" pattern="yyyy-MM-dd" />
+
+		</propertyfile>
 	</target>
 
-	<target name="jar" depends="compile" description="">
+	<target name="dist" depends="compile" description="">
 		<pathconvert property="main.class.path" pathsep=" ">
-			<path refid="main.path" />
+			<path refid="build.path" />
 			<mapper>
 				<chainedmapper>
 					<flattenmapper />
 				</chainedmapper>
 			</mapper>
 		</pathconvert>
 
-		<!-- set the date -->
 		<tstamp>
 			<format property="TODAY" pattern="yyyy-MM-dd" />
 		</tstamp>
@@ -64,7 +64,7 @@
 			<!-- define MANIFEST.MF -->
 			<manifest>
 				<attribute name="Built-By" value="${user.name}" />
-				<attribute name="Main-Class" value="eu.engys.helyx.gui.Launcher" />
+				<attribute name="Main-Class" value="${component.launcher}" />
 				<attribute name="Specification-Title" value="${component.name}" />
 				<attribute name="Specification-Version" value="${component.version}" />
 				<attribute name="Specification-Vendor" value="${component.vendor}" />
@@ -73,25 +73,11 @@
 				<attribute name="Implementation-Vendor" value="${component.vendor}" />
 
 				<attribute name="Class-Path" value="${main.class.path}" />
-				<attribute name="SplashScreen-Image" value="eu/engys/helyx/gui/resources/splash.png" />
+				<attribute name="SplashScreen-Image" value="${component.name}.png" />
 			</manifest>
 		</jar>
 	</target>
 
-    <target name="dist" depends="jar">
-    	<mkdir dir="${lib.dir}/old" />
-    	<move todir="${lib.dir}/old">
-            <fileset file="${lib.dir}/core-util.jar" />
-            <fileset file="${lib.dir}/core.jar" />
-            <fileset file="${lib.dir}/core-gui.jar" />
-            <fileset file="${lib.dir}/core-vtk.jar" />
-            <fileset file="${lib.dir}/commonCFD.jar" />
-            <fileset file="${lib.dir}/StandardCFD.jar" />
-            <fileset file="${lib.dir}/standardVOF.jar" />
-            <fileset file="${lib.dir}/HELYX-OS.jar" />
-        </move>
-    </target>
-
 	<target name="clean">
 		<delete dir="${build.dir}" />
 		<delete quiet="true">