Changeset 12029

Timestamp:

Nov 20, 2018 3:18:16 PM (13 months ago)

Author:

Christian Andersson

Message:

Merged dev branch into trunk. Related to ticket:5708

Location:

trunk

Files:

• . (modified) (1 prop)
• CHANGELOG.txt (modified) (1 diff)
• Python/src/tests_jmodelica/files/Modelica/NonLinear.mo (modified) (1 diff)
• Python/src/tests_jmodelica/test_fmi_2.py (modified) (1 diff)
• RuntimeLibrary/src (modified) (1 prop)
• RuntimeLibrary/src/jmi/jmi_brent_solver.c (modified) (1 diff)

trunk/CHANGELOG.txt

@@ -1 +1 @@
 ================= Unreleased ==================
+; Fixed ; Minor ; Runtime ; #5708
+Updated the error message when Brent fails to backet a root.
+
 ; Feature ; Minor ; Compiler ; #5696
 Enabled parameter alias elimination by default.

trunk/Python/src/tests_jmodelica/files/Modelica/NonLinear.mo

@@ -898 +898 @@
 end NonLinear7;
 
+model NonLinear8
+    Real x(start=1.5, min=1, max=2);
+    parameter Real p=4;
+equation
+    (x-0.1)^2=p;
+end NonLinear8;
+
 model RealTimeSolver1
     Real x(start=0.9);

trunk/Python/src/tests_jmodelica/test_fmi_2.py

@@ -80 +80 @@
         cls.enumeration3 = compile_fmu("Enumerations.Enumeration3",os.path.join(path_to_mofiles,"Enumerations.mo"), version=2.0)
         cls.enumeration4 = compile_fmu("Enumerations.Enumeration4",os.path.join(path_to_mofiles,"Enumerations.mo"), version=2.0)
-        #cls.enumFMU = compile_fmu('Parameter.Enum', os.path.join(path_to_mofiles,'ParameterTests.mo'))
+        cls.nonlinear8 = compile_fmu("NonLinear.NonLinear8",os.path.join(path_to_mofiles,"NonLinear.mo"), version=2.0)
+        
+    @testattr(stddist_full = True)
+    def test_brent_failure_message(self):
+        
+        model = load_fmu(Test_FMUModelBase2.nonlinear8)
+        
+        try:
+            model.initialize()
+        except FMUException:
+            pass
+        
+        err_msg = ""
+        for line in model.get_log():
+            if "BrentBracketFailed" in line:
+                err_msg = line
+                break
+        
+        #Check that certain key attributes are in the error message
+        assert "variable" in err_msg
+        assert "min" in err_msg
+        assert "max" in err_msg
     
     @testattr(stddist_full = True)

trunk/RuntimeLibrary/src/jmi/jmi_brent_solver.c

@@ -745 +745 @@
                     return JMI_BRENT_SUCCESS;
                 }
-                jmi_log_node(log, logError, "BrentBracketFailed", "Could not bracket the root in <block: %s>. Both lower and upper are at bounds.", block->label);
+                jmi_log_node(log, logError, "BrentBracketFailed", "Could not bracket the root in <block: %s>. Iteration variable <variable:#r%d#>, search interval bounds: <min: %g>, <max: %g>.", block->label, block->value_references[0], block->min[0], block->max[0]);
                 jmi_brent_solver_print_solve_end(block, &topnode, JMI_BRENT_ROOT_BRACKETING_FAILED);
                 /* Write initial guess back to model. */