Changeset 8516


Ignore:
Timestamp:
Mar 1, 2016 1:28:44 PM (4 years ago)
Author:
aramle
Message:

#3879 Fixed test issue and added kin_char_log for logging update of scaling in log.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Python/src/tests_jmodelica/simulation/test_assimulo_interface_fmi.py

    r8512 r8516  
    641641   
    642642    @testattr(stddist = True)
    643     def test_linear_zero_hold(self):
    644         model = load_fmu("Singular_Linear2.fmu", log_level=6)
    645         model.set("_log_level", 6)
    646        
    647         model.set("a33", 0.0)
    648         model.initialize()
    649         assert model.get("z") == 5.0
    650    
    651     @testattr(stddist = True)
    652643    def test_linear_inf_1(self):
    653644       
     
    753744    @testattr(stddist = True)
    754745    def test_no_valid_minimum_norm_sol(self):
    755         model = load_fmu("NoMinimumNormSolution.fmu", log_level=3)
     746        model = load_fmu("Singular_NoMinimumNormSolution.fmu", log_level=3)
    756747        model.set("_log_level", 3)
    757         model.set_log_level(log_level)
     748        model.set_log_level(3)
    758749        nose.tools.assert_raises(FMUException, model.initialize)
    759750
  • trunk/RuntimeLibrary/src/jmi/jmi_kinsol_solver.c

    r8512 r8516  
    16991699
    17001700    if(block->force_rescaling) {
     1701        if(block->options->residual_equation_scaling_mode != jmi_residual_scaling_none)
     1702            kin_char_log(solver, 's');
    17011703        jmi_update_f_scale(block);
    17021704        jmi_regularize_and_do_condition_estimate_on_scaled_jacobian(block);
     
    20252027        jmi_log_node_t node = jmi_log_enter_fmt(block->log, logInfo, "AggressiveResidualScalingUpdate", "Updating f_scale aggressively");
    20262028        N_VScale(1.0, block->f_scale, solver->work_vector);
     2029        kin_char_log(solver, 's');
    20272030        jmi_update_f_scale(block);
    20282031        jmi_regularize_and_do_condition_estimate_on_scaled_jacobian(block);
     
    27342737    /* update the scaling only once per time step */
    27352738    if(block->init || (block->options->rescale_each_step_flag && (curtime > block->scale_update_time)) || block->force_rescaling) {
    2736         jmi_update_f_scale(block);
     2739        if(block->options->residual_equation_scaling_mode != jmi_residual_scaling_none)
     2740            kin_char_log(solver, 's');
     2741        jmi_update_f_scale(block);
    27372742        jmi_regularize_and_do_condition_estimate_on_scaled_jacobian(block);
    27382743    }
     
    28062811        }
    28072812        /* Update the scaling  */
     2813        kin_char_log(solver, 's');
    28082814        jmi_update_f_scale(block);
    28092815        jmi_regularize_and_do_condition_estimate_on_scaled_jacobian(block);
Note: See TracChangeset for help on using the changeset viewer.