Ignore:
Timestamp:
Nov 8, 2019 12:47:46 PM (4 weeks ago)
Author:
Christian Andersson
Message:

Minor cleanup. Related to ticket:5868

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-cw-2658/RuntimeLibrary/src/jmi/jmi_realtime_solver.c

    r11712 r14000  
    2525#include <string.h>
    2626
    27 #define JMI_REALTIME_SOLVER_MAX_ITER 20
     27#define JMI_REALTIME_SOLVER_MAX_ITER 10
    2828#define JMI_REALTIME_UPDATE_JACOBIAN_ITER 10
    2929#define JMI_REALTIME_PROGRESS_LOG_LEVEL 4
    30 
     30#define JMI_REALTIME_INFO_LOG_LEVEL 5
     31#define JMI_REALTIME_DEBUG_LOG_LEVEL 6
    3132
    3233static void progress_reset_char_log(jmi_block_solver_t* block) {
     
    176177   
    177178    /* Open log and log the Jacobian.*/
    178     if((block->callbacks->log_options.log_level >= 5)) {
     179    if((block->callbacks->log_options.log_level >= JMI_REALTIME_INFO_LOG_LEVEL)) {
    179180        destnode = jmi_log_enter_fmt(block->log, logInfo, "RealtimeSolver",
    180181                                     "Realtime solver invoked for <block:%s>", block->label);
    181182        jmi_log_reals(block->log, destnode, logInfo, "ivs", block->x, block->n);
    182         if((block->callbacks->log_options.log_level >= 6)) {
     183        if((block->callbacks->log_options.log_level >= JMI_REALTIME_DEBUG_LOG_LEVEL)) {
    183184            jmi_log_real_matrix(block->log, destnode, logInfo, "LU", solver->factorization, block->n, block->n);
    184185        }
     
    208209        /* Logging compute the id of the largest (weighted) step */
    209210        if (block->callbacks->log_options.log_level >= JMI_REALTIME_PROGRESS_LOG_LEVEL) {
    210             jmi_linear_algebra_ddot(solver->weights, block->res, block->n);
     211            jmi_linear_algebra_dxemy(solver->weights, block->res, block->n);
    211212            solver->last_wrms_id = jmi_linear_algebra_idamax(block->res, block->n);
    212213        }
     
    231232   
    232233    /* Close log.*/
    233     if((block->callbacks->log_options.log_level >= 5)) {
     234    if((block->callbacks->log_options.log_level >= JMI_REALTIME_INFO_LOG_LEVEL)) {
    234235        jmi_log_reals(block->log, destnode, logInfo, "ivs", block->x, block->n);
    235236        jmi_log_reals(block->log, destnode, logInfo, "residual", block->res, block->n);
Note: See TracChangeset for help on using the changeset viewer.