diff --git a/build.xml b/build.xml index 9764b5e..1ee5272 100644 --- a/build.xml +++ b/build.xml @@ -42,8 +42,8 @@ diff --git a/src/main/java/org/lemsml/jlems/core/type/dynamics/AbstractStateChange.java b/src/main/java/org/lemsml/jlems/core/type/dynamics/AbstractStateChange.java index 566f0b9..b3f16e0 100644 --- a/src/main/java/org/lemsml/jlems/core/type/dynamics/AbstractStateChange.java +++ b/src/main/java/org/lemsml/jlems/core/type/dynamics/AbstractStateChange.java @@ -90,9 +90,12 @@ public void checkDimensions(HashMap dimHM) throws ContentEr if (dres.isDimensionless()) { // OK } else { - E.oneLineError("Dimension mismatch in equation: " + variable + " = " + value + ". Residual dimension: " + dres); - E.info("Dimension of " + variable + ": " + dsv + ", multiplier=" + dlf + ", left=" + dl + ", rhs=" + drhs); - E.info("All:" + dimHM); + + String errmsg = ("Dimension mismatch in the equation: " + variable + " = " + value + ". Residual dimension: " + dres + + "\nDimension of " + variable + ": " + dsv + ", multiplier=" + dlf + ", left=" + dl + ", rhs=" + drhs + + "\nAll:" + dimHM); + E.info(errmsg); + throw new ContentError(errmsg); } } diff --git a/src/main/java/org/lemsml/jlems/core/type/dynamics/Dynamics.java b/src/main/java/org/lemsml/jlems/core/type/dynamics/Dynamics.java index 61fb70f..573baec 100644 --- a/src/main/java/org/lemsml/jlems/core/type/dynamics/Dynamics.java +++ b/src/main/java/org/lemsml/jlems/core/type/dynamics/Dynamics.java @@ -525,7 +525,7 @@ public Valued getValued(String select) throws ContentError { - public void checkEquations(HashMap cdimHM) throws ContentError { + public void checkEquations(HashMap cdimHM) throws ContentError{ HashMap dimHM = new HashMap(); @@ -559,7 +559,9 @@ public void checkEquations(HashMap cdimHM) throws ContentEr try { dimHM.put(dv.getName(), dv.getDimensionality(dimHM)); } catch (ContentError ce) { - E.error("Checking " + dv + " in " + r_type + " " + ce.getMessage()); + String errmsg = ("Checking " + dv + " in " + r_type + " " + ce.getMessage()); + throw new ContentError(errmsg); + } } @@ -567,7 +569,8 @@ public void checkEquations(HashMap cdimHM) throws ContentEr try { dimHM.put(cdv.getName(), cdv.getDimensionality(dimHM)); } catch (ContentError ce) { - E.error("Checking " + cdv + " in " + r_type + " " + ce.getMessage()); + String errmsg = "Checking " + cdv + " in " + r_type + " " + ce.getMessage(); + throw new ContentError(errmsg); } }