The name of the initial branch for new projects is now "main" instead of "master". Existing projects remain unchanged. More information: https://doku.lrz.de/display/PUBLIC/GitLab

Commit aff6c656 authored by Stefan Schuhbaeck's avatar Stefan Schuhbaeck
Browse files

Merge branch 'develop' into stair_hatching

parents a5855370 6d924614
Pipeline #67117 failed with stages
in 55 minutes and 39 seconds
......@@ -11,6 +11,6 @@ import org.vadere.simulator.projects.dataprocessing.datakey.TimestepKey;
public class TimestepOutputFile extends OutputFile<TimestepKey> {
public TimestepOutputFile() {
super("hdfkh");
super("timeStep");
}
}
......@@ -77,9 +77,9 @@ public class Face {
* (limits.yHigh - limits.yLow);
try {
if (result < 0 || result > maxArea) {
String message = result + " is a illegal area size (Object "
+ id + ").";
if (result < 0 || (result > maxArea && Math.abs(result-maxArea) > 1E-15)) {
String message = "(Object " + id + ") Area of face is: " + result + ". This is an illegal area size " +
"because result has to be positive and less than maxArea (= " + maxArea + ")";
throw new IllegalStateException(message);
}
} catch (IllegalStateException e) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment