Merge branch 'java_migration' into event_handling

VadereSimulator/pom.xml

@@ -35,6 +35,19 @@
           </testResource>
       </testResources>
     <plugins>
+        <plugin>
+            <groupId>com.nativelibs4java</groupId>
+            <artifactId>maven-javacl-plugin</artifactId>
+            <version>1.0.0-RC4</version>
+            <executions>
+                <execution>
+                    <phase>generate-sources</phase>
+                    <goals>
+                        <goal>compile</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
         <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>exec-maven-plugin</artifactId>
@@ -105,6 +118,17 @@
     </plugins>
   </build>
 
+    <repositories>
+        <repository>
+            <id>nativelibs4java</id>
+            <name>nativelibs4java Maven2 Repository</name>
+            <url>http://nativelibs4java.sourceforge.net/maven</url>
+        </repository>
+    </repositories>
+    <properties>
+        <platform.dependency>windows-x86_64</platform.dependency>
+    </properties>
+
   <dependencies>
   	<dependency>
   		<groupId>commons-codec</groupId>

VadereSimulator/src/org/vadere/simulator/entrypoints/cmd/VadereConsole.java

@@ -38,9 +38,9 @@ public class VadereConsole {
 
 		try {
 			StdOutErrLog.addStdOutErrToLog();
-			if (!CLUtils.isOpenCLSupported()) {
-				System.out.println("Warning: OpenCL acceleration disabled, since no OpenCL support could be found!");
-			}
+			//if (!CLUtils.isOpenCLSupported()) {
+			//	System.out.println("Warning: OpenCL acceleration disabled, since no OpenCL support could be found!");
+			//}
 			Namespace ns = parser.parseArgs(args);
 			SubCommandRunner sRunner = ns.get("func");
 			sRunner.run(ns, parser);

VadereUtils/src/org/vadere/util/opencl/CLUtils.java

@@ -86,9 +86,12 @@ public class CLUtils {
 					}
 				}
 			}
-		}
 
+		}catch(Exception e){
+			log.warn("No OpenCL support: " + e.getMessage());
+		}
 		return supportedPlatforms;
+
 	}
 
 	/**
@@ -100,6 +103,7 @@ public class CLUtils {
 	 * @return a pair of addresses (platform address, device address)
 	 */
 	public static Optional<Pair<Long, Long>> getFirstSupportedPlatformAndDevice(final int deviceType) {
+
 		try (MemoryStack stack = stackPush()) {
 			IntBuffer pi = stack.mallocInt(1);
 			InfoUtils.checkCLError(clGetPlatformIDs(null, pi));
@@ -124,7 +128,10 @@ public class CLUtils {
 					}
 				}
 			}
+		} catch (Exception e) {
+			log.warn("No OpenCL device found: " + e.getMessage());
 		}
+
 		return Optional.empty();
 	}
 

pom.xml

@@ -45,6 +45,8 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.8.0</version>
                     <configuration>
+                        <!-- Workaround to avoid "java.lang.AssertionError: Visiting tree node before memberEnter". See: https://stackoverflow.com/a/52536499/5002766 -->
+                        <forceJavacCompilerUse>true</forceJavacCompilerUse>
                         <source>${maven-compiler.source.version}</source>
                         <target>${maven-compiler.target.version}</target>
                         <release>11</release>