Changeset b2a5200 in OpenModelica


Ignore:
Timestamp:
2013-02-27T18:14:15+01:00 (11 years ago)
Author:
Lennart Ochel <lennart.ochel@…>
Branches:
Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging
Children:
1d0c494
Parents:
d5c9a820
Message:
  • fix LOG_DEBUG

git-svn-id: ​https://openmodelica.org/svn/OpenModelica/trunk@15371 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Location:
SimulationRuntime/c/simulation
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • SimulationRuntime/c/simulation/simulation_input_xml.cpp

    rbf560e38 rb2a5200  
    290290  /* read all the DefaultExperiment values */
    291291  INFO(LOG_SOLVER, "read all the DefaultExperiment values:");
     292  INDENT(LOG_SOLVER);
    292293
    293294  read_value(mi.de["startTime"], &(simulationInfo->startTime));
    294   INFO1(LOG_SOLVER, "| startTime = %g", simulationInfo->startTime);
     295  INFO1(LOG_SOLVER, "startTime = %g", simulationInfo->startTime);
    295296
    296297  read_value(mi.de["stopTime"], &(simulationInfo->stopTime));
    297   INFO1(LOG_SOLVER, "| stopTime = %g", simulationInfo->stopTime);
     298  INFO1(LOG_SOLVER, "stopTime = %g", simulationInfo->stopTime);
    298299
    299300  read_value(mi.de["stepSize"], &(simulationInfo->stepSize));
    300   INFO1(LOG_SOLVER, "| stepSize = %g", simulationInfo->stepSize);
     301  INFO1(LOG_SOLVER, "stepSize = %g", simulationInfo->stepSize);
    301302
    302303  read_value(mi.de["tolerance"], &(simulationInfo->tolerance));
    303   INFO1(LOG_SOLVER, "| tolerance = %g", simulationInfo->tolerance);
     304  INFO1(LOG_SOLVER, "tolerance = %g", simulationInfo->tolerance);
    304305
    305306  read_value(mi.de["solver"], &simulationInfo->solverMethod);
    306   INFO1(LOG_SOLVER, "| solver method: %s", simulationInfo->solverMethod);
     307  INFO1(LOG_SOLVER, "solver method: %s", simulationInfo->solverMethod);
    307308
    308309  read_value(mi.de["outputFormat"], &(simulationInfo->outputFormat));
    309   INFO1(LOG_SOLVER, "| output format: %s", simulationInfo->outputFormat);
     310  INFO1(LOG_SOLVER, "output format: %s", simulationInfo->outputFormat);
    310311
    311312  read_value(mi.de["variableFilter"], &(simulationInfo->variableFilter));
    312   INFO1(LOG_SOLVER, "| variable filter: %s", simulationInfo->variableFilter);
     313  INFO1(LOG_SOLVER, "variable filter: %s", simulationInfo->variableFilter);
    313314
    314315  read_value(mi.md["OPENMODELICAHOME"], &simulationInfo->OPENMODELICAHOME);
    315   INFO1(LOG_SOLVER, "| OPENMODELICAHOME: %s", simulationInfo->OPENMODELICAHOME);
     316  INFO1(LOG_SOLVER, "OPENMODELICAHOME: %s", simulationInfo->OPENMODELICAHOME);
     317  RELEASE(LOG_SOLVER);
    316318
    317319  modelica_integer nxchk, nychk, npchk;
    … …  
    362364  /* read all static data from File for every variable */
    363365  /* read states static data */
    364   INFO(LOG_DEBUG, "read xml file for states:");
     366  INFO(LOG_DEBUG, "read xml file for states");
     367  INDENT(LOG_DEBUG);
    365368  for(long i=0; i<modelData->nStates; i++)
    366369  {
    367370    /* read var info */
    368371    read_value(mi.rSta[i]["name"], &(modelData->realVarsData[i].info.name));
    369     DEBUG1(LOG_DEBUG, "| read var %s from setup file", modelData->realVarsData[i].info.name);
     372    DEBUG1(LOG_DEBUG, "read var %s from setup file", modelData->realVarsData[i].info.name);
     373   
     374    INDENT(LOG_DEBUG);
    370375    read_value(mi.rSta[i]["valueReference"], &(modelData->realVarsData[i].info.id));
    371     DEBUG2(LOG_DEBUG, "| | read for %s id %d from setup file", modelData->realVarsData[i].info.name, modelData->realVarsData[i].info.id);
     376    DEBUG2(LOG_DEBUG, "read for %s id %d from setup file", modelData->realVarsData[i].info.name, modelData->realVarsData[i].info.id);
    372377    read_value(mi.rSta[i]["description"], &(modelData->realVarsData[i].info.comment));
    373     DEBUG2(LOG_DEBUG, "| | read for %s description \"%s\" from setup file", modelData->realVarsData[i].info.name, modelData->realVarsData[i].info.comment);
     378    DEBUG2(LOG_DEBUG, "read for %s description \"%s\" from setup file", modelData->realVarsData[i].info.name, modelData->realVarsData[i].info.comment);
    374379    read_value(mi.rSta[i]["fileName"], (modelica_string*)&(modelData->realVarsData[i].info.info.filename));
    375     DEBUG2(LOG_DEBUG, "| | read for %s filename %s from setup file", modelData->realVarsData[i].info.name, modelData->realVarsData[i].info.info.filename);
     380    DEBUG2(LOG_DEBUG, "read for %s filename %s from setup file", modelData->realVarsData[i].info.name, modelData->realVarsData[i].info.info.filename);
    376381    read_value(mi.rSta[i]["startLine"], (modelica_integer*)&(modelData->realVarsData[i].info.info.lineStart));
    377     DEBUG2(LOG_DEBUG, "| | read for %s lineStart %d from setup file", modelData->realVarsData[i].info.name, modelData->realVarsData[i].info.info.lineStart);
     382    DEBUG2(LOG_DEBUG, "read for %s lineStart %d from setup file", modelData->realVarsData[i].info.name, modelData->realVarsData[i].info.info.lineStart);
    378383    read_value(mi.rSta[i]["startColumn"], (modelica_integer*)&(modelData->realVarsData[i].info.info.colStart));
    379     DEBUG2(LOG_DEBUG, "| | read for %s colStart %d from setup file", modelData->realVarsData[i].info.name, modelData->realVarsData[i].info.info.colStart);
     384    DEBUG2(LOG_DEBUG, "read for %s colStart %d from setup file", modelData->realVarsData[i].info.name, modelData->realVarsData[i].info.info.colStart);
    380385    read_value(mi.rSta[i]["endLine"], (modelica_integer*)&(modelData->realVarsData[i].info.info.lineEnd));
    381     DEBUG2(LOG_DEBUG, "| | read for %s lineEnd %d from setup file", modelData->realVarsData[i].info.name, modelData->realVarsData[i].info.info.lineEnd);
     386    DEBUG2(LOG_DEBUG, "read for %s lineEnd %d from setup file", modelData->realVarsData[i].info.name, modelData->realVarsData[i].info.info.lineEnd);
    382387    read_value(mi.rSta[i]["endColumn"], (modelica_integer*)&(modelData->realVarsData[i].info.info.colEnd));
    383     DEBUG2(LOG_DEBUG, "| | read for %s colEnd %d from setup file", modelData->realVarsData[i].info.name, modelData->realVarsData[i].info.info.colEnd);
     388    DEBUG2(LOG_DEBUG, "read for %s colEnd %d from setup file", modelData->realVarsData[i].info.name, modelData->realVarsData[i].info.info.colEnd);
    384389    read_value(mi.rSta[i]["fileWritable"], (modelica_integer*)&(modelData->realVarsData[i].info.info.readonly));
    385     DEBUG2(LOG_DEBUG, "| | read for %s readonly %d from setup file", modelData->realVarsData[i].info.name, modelData->realVarsData[i].info.info.readonly);
     390    DEBUG2(LOG_DEBUG, "read for %s readonly %d from setup file", modelData->realVarsData[i].info.name, modelData->realVarsData[i].info.info.readonly);
     391    RELEASE(LOG_DEBUG);
    386392
    387393    /* read var attribute */
    … …  
    394400    read_value(mi.rSta[i]["max"], &(modelData->realVarsData[i].attribute.max));
    395401
    396     DEBUG10(LOG_DEBUG, "| Real %s(%sstart=%g%s, fixed=%s, %snominal=%g%s, min=%g, max=%g)", modelData->realVarsData[i].info.name, (modelData->realVarsData[i].attribute.useStart)?"":"{", modelData->realVarsData[i].attribute.start, (modelData->realVarsData[i].attribute.useStart)?"":"}", (modelData->realVarsData[i].attribute.fixed)?"true":"false", (modelData->realVarsData[i].attribute.useNominal)?"":"{", modelData->realVarsData[i].attribute.nominal, (modelData->realVarsData[i].attribute.useNominal)?"":"}", modelData->realVarsData[i].attribute.min, modelData->realVarsData[i].attribute.max);
     402    INFO10(LOG_DEBUG, "Real %s(%sstart=%g%s, fixed=%s, %snominal=%g%s, min=%g, max=%g)", modelData->realVarsData[i].info.name, (modelData->realVarsData[i].attribute.useStart)?"":"{", modelData->realVarsData[i].attribute.start, (modelData->realVarsData[i].attribute.useStart)?"":"}", (modelData->realVarsData[i].attribute.fixed)?"true":"false", (modelData->realVarsData[i].attribute.useNominal)?"":"{", modelData->realVarsData[i].attribute.nominal, (modelData->realVarsData[i].attribute.useNominal)?"":"}", modelData->realVarsData[i].attribute.min, modelData->realVarsData[i].attribute.max);
    397403   
    398404    /* filter internal variables */
    … …  
    404410    DEBUG2(LOG_DEBUG, "real states: mapAlias[%s] = %ld", modelData->realVarsData[i].info.name, i);
    405411  }
     412  RELEASE(LOG_DEBUG);
    406413
    407414  /* read stateDerivatives static data */
    408   DEBUG(LOG_DEBUG, "read xml file for stateDerivatives:");
     415  INFO(LOG_DEBUG, "read xml file for stateDerivatives");
     416  INDENT(LOG_DEBUG);
    409417  for(long i=0; i<modelData->nStates; i++)
    410418  {
    411419    /* read var info */
    412420    read_value(mi.rDer[i]["name"], &(modelData->realVarsData[modelData->nStates + i].info.name));
    413     DEBUG1(LOG_DEBUG, "| read var %s from setup file",modelData->realVarsData[modelData->nStates+i].info.name);
     421    DEBUG1(LOG_DEBUG, "read var %s from setup file",modelData->realVarsData[modelData->nStates+i].info.name);
     422   
     423    INDENT(LOG_DEBUG);
    414424    read_value(mi.rDer[i]["valueReference"], &(modelData->realVarsData[modelData->nStates+i].info.id));
    415     DEBUG2(LOG_DEBUG, "| | read for %s id %d from setup file",modelData->realVarsData[modelData->nStates+i].info.name,modelData->realVarsData[modelData->nStates+i].info.id);
     425    DEBUG2(LOG_DEBUG, "read for %s id %d from setup file",modelData->realVarsData[modelData->nStates+i].info.name,modelData->realVarsData[modelData->nStates+i].info.id);
    416426    read_value(mi.rDer[i]["description"], &(modelData->realVarsData[modelData->nStates+i].info.comment));
    417     DEBUG2(LOG_DEBUG, "| | read for %s comment %s from setup file",modelData->realVarsData[modelData->nStates+i].info.name,modelData->realVarsData[modelData->nStates+i].info.comment);
     427    DEBUG2(LOG_DEBUG, "read for %s comment %s from setup file",modelData->realVarsData[modelData->nStates+i].info.name,modelData->realVarsData[modelData->nStates+i].info.comment);
    418428    read_value(mi.rDer[i]["fileName"], (modelica_string*)&(modelData->realVarsData[modelData->nStates+i].info.info.filename));
    419     DEBUG2(LOG_DEBUG, "| | read for %s filename %s from setup file",modelData->realVarsData[modelData->nStates+i].info.name,modelData->realVarsData[modelData->nStates+i].info.info.filename);
     429    DEBUG2(LOG_DEBUG, "read for %s filename %s from setup file",modelData->realVarsData[modelData->nStates+i].info.name,modelData->realVarsData[modelData->nStates+i].info.info.filename);
    420430    read_value(mi.rDer[i]["startLine"], (modelica_integer*) &(modelData->realVarsData[modelData->nStates+i].info.info.lineStart));
    421     DEBUG2(LOG_DEBUG, "| | read for %s lineStart %d from setup file",modelData->realVarsData[modelData->nStates+i].info.name,modelData->realVarsData[modelData->nStates+i].info.info.lineStart);
     431    DEBUG2(LOG_DEBUG, "read for %s lineStart %d from setup file",modelData->realVarsData[modelData->nStates+i].info.name,modelData->realVarsData[modelData->nStates+i].info.info.lineStart);
    422432    read_value(mi.rDer[i]["startColumn"], (modelica_integer*) &(modelData->realVarsData[modelData->nStates+i].info.info.colStart));
    423     DEBUG2(LOG_DEBUG, "| | read for %s colStart %d from setup file",modelData->realVarsData[modelData->nStates+i].info.name,modelData->realVarsData[modelData->nStates+i].info.info.colStart);
     433    DEBUG2(LOG_DEBUG, "read for %s colStart %d from setup file",modelData->realVarsData[modelData->nStates+i].info.name,modelData->realVarsData[modelData->nStates+i].info.info.colStart);
    424434    read_value(mi.rDer[i]["endLine"], (modelica_integer*) &(modelData->realVarsData[modelData->nStates+i].info.info.lineEnd));
    425     DEBUG2(LOG_DEBUG, "| | read for %s lineEnd %d from setup file",modelData->realVarsData[modelData->nStates+i].info.name,modelData->realVarsData[modelData->nStates+i].info.info.lineEnd);
     435    DEBUG2(LOG_DEBUG, "read for %s lineEnd %d from setup file",modelData->realVarsData[modelData->nStates+i].info.name,modelData->realVarsData[modelData->nStates+i].info.info.lineEnd);
    426436    read_value(mi.rDer[i]["endColumn"], (modelica_integer*) &(modelData->realVarsData[modelData->nStates+i].info.info.colEnd));
    427     DEBUG2(LOG_DEBUG, "| | read for %s colEnd %d from setup file",modelData->realVarsData[modelData->nStates+i].info.name,modelData->realVarsData[modelData->nStates+i].info.info.colEnd);
     437    DEBUG2(LOG_DEBUG, "read for %s colEnd %d from setup file",modelData->realVarsData[modelData->nStates+i].info.name,modelData->realVarsData[modelData->nStates+i].info.info.colEnd);
    428438    read_value(mi.rDer[i]["fileWritable"], (modelica_integer*) &(modelData->realVarsData[modelData->nStates+i].info.info.readonly));
    429     DEBUG2(LOG_DEBUG, "| | read for %s readonly %d from setup file",modelData->realVarsData[modelData->nStates+i].info.name,modelData->realVarsData[modelData->nStates+i].info.info.readonly);
    430 
     439    DEBUG2(LOG_DEBUG, "read for %s readonly %d from setup file",modelData->realVarsData[modelData->nStates+i].info.name,modelData->realVarsData[modelData->nStates+i].info.info.readonly);
     440    RELEASE(LOG_DEBUG);
     441   
    431442    /* read var attribute */
    432443    read_value(mi.rDer[i]["useStart"], (modelica_boolean*)&(modelData->realVarsData[modelData->nStates+i].attribute.useStart));
    … …  
    438449    read_value(mi.rDer[i]["max"], &(modelData->realVarsData[modelData->nStates+i].attribute.max));
    439450
    440     DEBUG10(LOG_DEBUG, "| Real %s(%sstart=%g%s, fixed=%s, %snominal=%g%s, min=%g, max=%g)", modelData->realVarsData[modelData->nStates+i].info.name, (modelData->realVarsData[modelData->nStates+i].attribute.useStart)?"":"{", modelData->realVarsData[modelData->nStates+i].attribute.start, (modelData->realVarsData[modelData->nStates+i].attribute.useStart)?"":"}", (modelData->realVarsData[modelData->nStates+i].attribute.fixed)?"true":"false", (modelData->realVarsData[modelData->nStates+i].attribute.useNominal)?"":"{", modelData->realVarsData[modelData->nStates+i].attribute.nominal, (modelData->realVarsData[modelData->nStates+i].attribute.useNominal)?"":"}", modelData->realVarsData[modelData->nStates+i].attribute.min, modelData->realVarsData[modelData->nStates+i].attribute.max);
     451    INFO10(LOG_DEBUG, "Real %s(%sstart=%g%s, fixed=%s, %snominal=%g%s, min=%g, max=%g)", modelData->realVarsData[modelData->nStates+i].info.name, (modelData->realVarsData[modelData->nStates+i].attribute.useStart)?"":"{", modelData->realVarsData[modelData->nStates+i].attribute.start, (modelData->realVarsData[modelData->nStates+i].attribute.useStart)?"":"}", (modelData->realVarsData[modelData->nStates+i].attribute.fixed)?"true":"false", (modelData->realVarsData[modelData->nStates+i].attribute.useNominal)?"":"{", modelData->realVarsData[modelData->nStates+i].attribute.nominal, (modelData->realVarsData[modelData->nStates+i].attribute.useNominal)?"":"}", modelData->realVarsData[modelData->nStates+i].attribute.min, modelData->realVarsData[modelData->nStates+i].attribute.max);
    441452   
    442453    /* filter internal variables */
    … …  
    448459    DEBUG2(LOG_DEBUG, "real stateDerivatives: mapAlias[%s] = %ld", modelData->realVarsData[modelData->nStates+i].info.name, modelData->nStates+i);
    449460  }
     461  RELEASE(LOG_DEBUG);
    450462
    451463  /* read real algebraics static data */
    452   DEBUG(LOG_DEBUG, "read xml file for real algebraic:");
     464  INFO(LOG_DEBUG, "read xml file for real algebraic");
     465  INDENT(LOG_DEBUG);
    453466  for(long i=0; i<(modelData->nVariablesReal - 2*modelData->nStates); i++)
    454467  {
    … …  
    457470    /* read var info */
    458471    read_value(mi.rAlg[i]["name"], &(modelData->realVarsData[j].info.name));
    459     DEBUG1(LOG_DEBUG, "| read var %s from setup file",modelData->realVarsData[j].info.name);
     472    DEBUG1(LOG_DEBUG, "read var %s from setup file",modelData->realVarsData[j].info.name);
     473   
     474    INDENT(LOG_DEBUG);
    460475    read_value(mi.rAlg[i]["valueReference"], &(modelData->realVarsData[j].info.id));
    461     DEBUG2(LOG_DEBUG, "| | read for %s id %d from setup file",modelData->realVarsData[j].info.name,modelData->realVarsData[j].info.id);
     476    DEBUG2(LOG_DEBUG, "read for %s id %d from setup file",modelData->realVarsData[j].info.name,modelData->realVarsData[j].info.id);
    462477    read_value(mi.rAlg[i]["description"], &(modelData->realVarsData[j].info.comment));
    463     DEBUG2(LOG_DEBUG, "| | read for %s comment %s from setup file",modelData->realVarsData[j].info.name,modelData->realVarsData[j].info.comment);
     478    DEBUG2(LOG_DEBUG, "read for %s comment %s from setup file",modelData->realVarsData[j].info.name,modelData->realVarsData[j].info.comment);
    464479    read_value(mi.rAlg[i]["fileName"], (modelica_string*)&(modelData->realVarsData[j].info.info.filename));
    465     DEBUG2(LOG_DEBUG, "| | read for %s filename %s from setup file",modelData->realVarsData[j].info.name,modelData->realVarsData[j].info.info.filename);
     480    DEBUG2(LOG_DEBUG, "read for %s filename %s from setup file",modelData->realVarsData[j].info.name,modelData->realVarsData[j].info.info.filename);
    466481    read_value(mi.rAlg[i]["startLine"], (modelica_integer*) &(modelData->realVarsData[j].info.info.lineStart));
    467     DEBUG2(LOG_DEBUG, "| | read for %s lineStart %d from setup file",modelData->realVarsData[j].info.name,modelData->realVarsData[j].info.info.lineStart);
     482    DEBUG2(LOG_DEBUG, "read for %s lineStart %d from setup file",modelData->realVarsData[j].info.name,modelData->realVarsData[j].info.info.lineStart);
    468483    read_value(mi.rAlg[i]["startColumn"], (modelica_integer*) &(modelData->realVarsData[j].info.info.colStart));
    469     DEBUG2(LOG_DEBUG, "| | read for %s colStart %d from setup file",modelData->realVarsData[j].info.name,modelData->realVarsData[j].info.info.colStart);
     484    DEBUG2(LOG_DEBUG, "read for %s colStart %d from setup file",modelData->realVarsData[j].info.name,modelData->realVarsData[j].info.info.colStart);
    470485    read_value(mi.rAlg[i]["endLine"], (modelica_integer*) &(modelData->realVarsData[j].info.info.lineEnd));
    471     DEBUG2(LOG_DEBUG, "| | read for %s lineEnd %d from setup file",modelData->realVarsData[j].info.name,modelData->realVarsData[j].info.info.lineEnd);
     486    DEBUG2(LOG_DEBUG, "read for %s lineEnd %d from setup file",modelData->realVarsData[j].info.name,modelData->realVarsData[j].info.info.lineEnd);
    472487    read_value(mi.rAlg[i]["endColumn"], (modelica_integer*) &(modelData->realVarsData[j].info.info.colEnd));
    473     DEBUG2(LOG_DEBUG, "| | read for %s colEnd %d from setup file",modelData->realVarsData[j].info.name,modelData->realVarsData[j].info.info.colEnd);
     488    DEBUG2(LOG_DEBUG, "read for %s colEnd %d from setup file",modelData->realVarsData[j].info.name,modelData->realVarsData[j].info.info.colEnd);
    474489    read_value(mi.rAlg[i]["fileWritable"], (modelica_integer*) &(modelData->realVarsData[j].info.info.readonly));
    475     DEBUG2(LOG_DEBUG, "| | read for %s readonly %d from setup file",modelData->realVarsData[j].info.name,modelData->realVarsData[j].info.info.readonly);
    476 
     490    DEBUG2(LOG_DEBUG, "read for %s readonly %d from setup file",modelData->realVarsData[j].info.name,modelData->realVarsData[j].info.info.readonly);
     491    RELEASE(LOG_DEBUG);
     492   
    477493    /* read var attribute */
    478494    read_value(mi.rAlg[i]["useStart"], (modelica_boolean*)&(modelData->realVarsData[j].attribute.useStart));
    … …  
    484500    read_value(mi.rAlg[i]["max"], &(modelData->realVarsData[j].attribute.max));
    485501
    486     DEBUG10(LOG_DEBUG, "| Real %s(%sstart=%g%s, fixed=%s, %snominal=%g%s, min=%g, max=%g)", modelData->realVarsData[j].info.name, (modelData->realVarsData[j].attribute.useStart)?"":"{", modelData->realVarsData[j].attribute.start, (modelData->realVarsData[j].attribute.useStart)?"":"}", (modelData->realVarsData[j].attribute.fixed)?"true":"false", (modelData->realVarsData[j].attribute.useNominal)?"":"{", modelData->realVarsData[j].attribute.nominal, (modelData->realVarsData[j].attribute.useNominal)?"":"}", modelData->realVarsData[j].attribute.min, modelData->realVarsData[j].attribute.max);
     502    INFO10(LOG_DEBUG, "Real %s(%sstart=%g%s, fixed=%s, %snominal=%g%s, min=%g, max=%g)", modelData->realVarsData[j].info.name, (modelData->realVarsData[j].attribute.useStart)?"":"{", modelData->realVarsData[j].attribute.start, (modelData->realVarsData[j].attribute.useStart)?"":"}", (modelData->realVarsData[j].attribute.fixed)?"true":"false", (modelData->realVarsData[j].attribute.useNominal)?"":"{", modelData->realVarsData[j].attribute.nominal, (modelData->realVarsData[j].attribute.useNominal)?"":"}", modelData->realVarsData[j].attribute.min, modelData->realVarsData[j].attribute.max);
    487503   
    488504    /* filter internal variables */
    … …  
    494510    DEBUG2(LOG_DEBUG, "real algebraics: mapAlias[%s] = %ld", modelData->realVarsData[j].info.name, j);
    495511  }
     512  RELEASE(LOG_DEBUG);
    496513
    497514  /* read integer variables static data */
    498   DEBUG(LOG_DEBUG, "read xml file for integer algebraic:");
     515  INFO(LOG_DEBUG, "read xml file for integer algebraic");
     516  INDENT(LOG_DEBUG);
    499517  for(long i=0; i<modelData->nVariablesInteger; i++)
    500518  {
    501519    /* read var info */
    502520    read_value(mi.iAlg[i]["name"], &(modelData->integerVarsData[i].info.name));
    503     DEBUG1(LOG_DEBUG, "| read var %s from setup file",modelData->integerVarsData[i].info.name);
     521    DEBUG1(LOG_DEBUG, "read var %s from setup file",modelData->integerVarsData[i].info.name);
     522   
     523    INDENT(LOG_DEBUG);
    504524    read_value(mi.iAlg[i]["valueReference"], &(modelData->integerVarsData[i].info.id));
    505     DEBUG2(LOG_DEBUG, "| | read for %s id %d from setup file",modelData->integerVarsData[i].info.name,modelData->integerVarsData[i].info.id);
     525    DEBUG2(LOG_DEBUG, "read for %s id %d from setup file",modelData->integerVarsData[i].info.name,modelData->integerVarsData[i].info.id);
    506526    read_value(mi.iAlg[i]["description"], &(modelData->integerVarsData[i].info.comment));
    507     DEBUG2(LOG_DEBUG, "| | read for %s comment %s from setup file",modelData->integerVarsData[i].info.name,modelData->integerVarsData[i].info.comment);
     527    DEBUG2(LOG_DEBUG, "read for %s comment %s from setup file",modelData->integerVarsData[i].info.name,modelData->integerVarsData[i].info.comment);
    508528    read_value(mi.iAlg[i]["fileName"], (modelica_string*)&(modelData->integerVarsData[i].info.info.filename));
    509     DEBUG2(LOG_DEBUG, "| | read for %s filename %s from setup file",modelData->integerVarsData[i].info.name,modelData->integerVarsData[i].info.info.filename);
     529    DEBUG2(LOG_DEBUG, "read for %s filename %s from setup file",modelData->integerVarsData[i].info.name,modelData->integerVarsData[i].info.info.filename);
    510530    read_value(mi.iAlg[i]["startLine"], (modelica_integer*) &(modelData->integerVarsData[i].info.info.lineStart));
    511     DEBUG2(LOG_DEBUG, "| | read for %s lineStart %d from setup file",modelData->integerVarsData[i].info.name,modelData->integerVarsData[i].info.info.lineStart);
     531    DEBUG2(LOG_DEBUG, "read for %s lineStart %d from setup file",modelData->integerVarsData[i].info.name,modelData->integerVarsData[i].info.info.lineStart);
    512532    read_value(mi.iAlg[i]["startColumn"], (modelica_integer*) &(modelData->integerVarsData[i].info.info.colStart));
    513     DEBUG2(LOG_DEBUG, "| | read for %s colStart %d from setup file",modelData->integerVarsData[i].info.name,modelData->integerVarsData[i].info.info.colStart);
     533    DEBUG2(LOG_DEBUG, "read for %s colStart %d from setup file",modelData->integerVarsData[i].info.name,modelData->integerVarsData[i].info.info.colStart);
    514534    read_value(mi.iAlg[i]["endLine"], (modelica_integer*) &(modelData->integerVarsData[i].info.info.lineEnd));
    515     DEBUG2(LOG_DEBUG, "| | read for %s lineEnd %d from setup file",modelData->integerVarsData[i].info.name,modelData->integerVarsData[i].info.info.lineEnd);
     535    DEBUG2(LOG_DEBUG, "read for %s lineEnd %d from setup file",modelData->integerVarsData[i].info.name,modelData->integerVarsData[i].info.info.lineEnd);
    516536    read_value(mi.iAlg[i]["endColumn"], (modelica_integer*) &(modelData->integerVarsData[i].info.info.colEnd));
    517     DEBUG2(LOG_DEBUG, "| | read for %s colEnd %d from setup file",modelData->integerVarsData[i].info.name,modelData->integerVarsData[i].info.info.colEnd);
     537    DEBUG2(LOG_DEBUG, "read for %s colEnd %d from setup file",modelData->integerVarsData[i].info.name,modelData->integerVarsData[i].info.info.colEnd);
    518538    read_value(mi.iAlg[i]["fileWritable"], (modelica_integer*) &(modelData->integerVarsData[i].info.info.readonly));
    519     DEBUG2(LOG_DEBUG, "| | read for %s readonly %d from setup file",modelData->integerVarsData[i].info.name,modelData->integerVarsData[i].info.info.readonly);
    520 
     539    DEBUG2(LOG_DEBUG, "read for %s readonly %d from setup file",modelData->integerVarsData[i].info.name,modelData->integerVarsData[i].info.info.readonly);
     540    RELEASE(LOG_DEBUG);
     541   
    521542    /* read var attribute */
    522543    read_value(mi.iAlg[i]["useStart"], &(modelData->integerVarsData[i].attribute.useStart));
    … …  
    526547    read_value(mi.iAlg[i]["max"], &(modelData->integerVarsData[i].attribute.max));
    527548
    528     DEBUG7(LOG_DEBUG, "| Integer %s(%sstart=%ld%s, fixed=%s, min=%ld, max=%ld)", modelData->integerVarsData[i].info.name, (modelData->integerVarsData[i].attribute.useStart)?"":"{", modelData->integerVarsData[i].attribute.start, (modelData->integerVarsData[i].attribute.useStart)?"":"}", (modelData->integerVarsData[i].attribute.fixed)?"true":"false", modelData->integerVarsData[i].attribute.min, modelData->integerVarsData[i].attribute.max);
     549    INFO7(LOG_DEBUG, "Integer %s(%sstart=%ld%s, fixed=%s, min=%ld, max=%ld)", modelData->integerVarsData[i].info.name, (modelData->integerVarsData[i].attribute.useStart)?"":"{", modelData->integerVarsData[i].attribute.start, (modelData->integerVarsData[i].attribute.useStart)?"":"}", (modelData->integerVarsData[i].attribute.fixed)?"true":"false", modelData->integerVarsData[i].attribute.min, modelData->integerVarsData[i].attribute.max);
    529550   
    530551    /* filter internal variables */
    … …  
    536557    DEBUG2(LOG_DEBUG, "integer variables: mapAlias[%s] = %ld", modelData->integerVarsData[i].info.name, i);
    537558  }
     559  RELEASE(LOG_DEBUG);
    538560
    539561  /* read boolean variables static data */
    540   DEBUG(LOG_DEBUG, "read xml file for boolean algebraic:");
     562  INFO(LOG_DEBUG, "read xml file for boolean algebraic");
     563  INDENT(LOG_DEBUG);
    541564  for(long i=0; i<modelData->nVariablesBoolean; i++)
    542565  {
    543566    /* read var info */
    544567    read_value(mi.bAlg[i]["name"], &(modelData->booleanVarsData[i].info.name));
    545     DEBUG1(LOG_DEBUG, "| read var %s from setup file",modelData->booleanVarsData[i].info.name);
     568    DEBUG1(LOG_DEBUG, "read var %s from setup file",modelData->booleanVarsData[i].info.name);
     569   
     570    INDENT(LOG_DEBUG);
    546571    read_value(mi.bAlg[i]["valueReference"], &(modelData->booleanVarsData[i].info.id));
    547     DEBUG2(LOG_DEBUG, "| | read for %s id %d from setup file",modelData->booleanVarsData[i].info.name,modelData->booleanVarsData[i].info.id);
     572    DEBUG2(LOG_DEBUG, "read for %s id %d from setup file",modelData->booleanVarsData[i].info.name,modelData->booleanVarsData[i].info.id);
    548573    read_value(mi.bAlg[i]["description"], &(modelData->booleanVarsData[i].info.comment));
    549     DEBUG2(LOG_DEBUG, "| | read for %s comment %s from setup file",modelData->booleanVarsData[i].info.name,modelData->booleanVarsData[i].info.comment);
     574    DEBUG2(LOG_DEBUG, "read for %s comment %s from setup file",modelData->booleanVarsData[i].info.name,modelData->booleanVarsData[i].info.comment);
    550575    read_value(mi.bAlg[i]["fileName"], (modelica_string*)&(modelData->booleanVarsData[i].info.info.filename));
    551     DEBUG2(LOG_DEBUG, "| | read for %s filename %s from setup file",modelData->booleanVarsData[i].info.name,modelData->booleanVarsData[i].info.info.filename);
     576    DEBUG2(LOG_DEBUG, "read for %s filename %s from setup file",modelData->booleanVarsData[i].info.name,modelData->booleanVarsData[i].info.info.filename);
    552577    read_value(mi.bAlg[i]["startLine"], (modelica_integer*) &(modelData->booleanVarsData[i].info.info.lineStart));
    553     DEBUG2(LOG_DEBUG, "| | read for %s lineStart %d from setup file",modelData->booleanVarsData[i].info.name,modelData->booleanVarsData[i].info.info.lineStart);
     578    DEBUG2(LOG_DEBUG, "read for %s lineStart %d from setup file",modelData->booleanVarsData[i].info.name,modelData->booleanVarsData[i].info.info.lineStart);
    554579    read_value(mi.bAlg[i]["startColumn"], (modelica_integer*) &(modelData->booleanVarsData[i].info.info.colStart));
    555     DEBUG2(LOG_DEBUG, "| | read for %s colStart %d from setup file",modelData->booleanVarsData[i].info.name,modelData->booleanVarsData[i].info.info.colStart);
     580    DEBUG2(LOG_DEBUG, "read for %s colStart %d from setup file",modelData->booleanVarsData[i].info.name,modelData->booleanVarsData[i].info.info.colStart);
    556581    read_value(mi.bAlg[i]["endLine"], (modelica_integer*) &(modelData->booleanVarsData[i].info.info.lineEnd));
    557     DEBUG2(LOG_DEBUG, "| | read for %s lineEnd %d from setup file",modelData->booleanVarsData[i].info.name,modelData->booleanVarsData[i].info.info.lineEnd);
     582    DEBUG2(LOG_DEBUG, "read for %s lineEnd %d from setup file",modelData->booleanVarsData[i].info.name,modelData->booleanVarsData[i].info.info.lineEnd);
    558583    read_value(mi.bAlg[i]["endColumn"], (modelica_integer*) &(modelData->booleanVarsData[i].info.info.colEnd));
    559     DEBUG2(LOG_DEBUG, "| | read for %s colEnd %d from setup file",modelData->booleanVarsData[i].info.name,modelData->booleanVarsData[i].info.info.colEnd);
     584    DEBUG2(LOG_DEBUG, "read for %s colEnd %d from setup file",modelData->booleanVarsData[i].info.name,modelData->booleanVarsData[i].info.info.colEnd);
    560585    read_value(mi.bAlg[i]["fileWritable"], (modelica_integer*) &(modelData->booleanVarsData[i].info.info.readonly));
    561     DEBUG2(LOG_DEBUG, "| | read for %s readonly %d from setup file",modelData->booleanVarsData[i].info.name,modelData->booleanVarsData[i].info.info.readonly);
    562 
     586    DEBUG2(LOG_DEBUG, "read for %s readonly %d from setup file",modelData->booleanVarsData[i].info.name,modelData->booleanVarsData[i].info.info.readonly);
     587    RELEASE(LOG_DEBUG);
     588   
    563589    /* read var attribute */
    564590    read_value(mi.bAlg[i]["useStart"], &(modelData->booleanVarsData[i].attribute.useStart));
    … …  
    566592    read_value(mi.bAlg[i]["fixed"], &(modelData->booleanVarsData[i].attribute.fixed));
    567593
    568     DEBUG5(LOG_DEBUG, "| Boolean %s(%sstart=%s%s, fixed=%s)", modelData->booleanVarsData[i].info.name, modelData->booleanVarsData[i].attribute.useStart?"":"{", modelData->booleanVarsData[i].attribute.start?"true":"false", modelData->booleanVarsData[i].attribute.useStart?"":"}", modelData->booleanVarsData[i].attribute.fixed?"true":"false");
     594    INFO5(LOG_DEBUG, "Boolean %s(%sstart=%s%s, fixed=%s)", modelData->booleanVarsData[i].info.name, modelData->booleanVarsData[i].attribute.useStart?"":"{", modelData->booleanVarsData[i].attribute.start?"true":"false", modelData->booleanVarsData[i].attribute.useStart?"":"}", modelData->booleanVarsData[i].attribute.fixed?"true":"false");
    569595 
    570596    /* filter internal variables */
    … …  
    576602    DEBUG2(LOG_DEBUG, "boolean variables: mapAlias[%s] = %ld", modelData->booleanVarsData[i].info.name, i);
    577603  }
     604  RELEASE(LOG_DEBUG);
    578605
    579606  /* read string variables static data */
    580   DEBUG(LOG_DEBUG, "read xml file for string algebraic:");
     607  INFO(LOG_DEBUG, "read xml file for string algebraic");
     608  INDENT(LOG_DEBUG);
    581609  for(long i=0; i<modelData->nVariablesString; i++)
    582610  {
    583611    /* read var info */
    584612    read_value(mi.sAlg[i]["name"], &(modelData->stringVarsData[i].info.name));
    585     DEBUG1(LOG_DEBUG, "| read var %s from setup file",modelData->stringVarsData[i].info.name);
     613    DEBUG1(LOG_DEBUG, "read var %s from setup file",modelData->stringVarsData[i].info.name);
     614   
     615    INDENT(LOG_DEBUG);
    586616    read_value(mi.sAlg[i]["valueReference"], &(modelData->stringVarsData[i].info.id));
    587     DEBUG2(LOG_DEBUG, "| | read for %s id %d from setup file",modelData->stringVarsData[i].info.name,modelData->stringVarsData[i].info.id);
     617    DEBUG2(LOG_DEBUG, "read for %s id %d from setup file",modelData->stringVarsData[i].info.name,modelData->stringVarsData[i].info.id);
    588618    read_value(mi.sAlg[i]["description"], &(modelData->stringVarsData[i].info.comment));
    589     DEBUG2(LOG_DEBUG, "| | read for %s comment %s from setup file",modelData->stringVarsData[i].info.name,modelData->stringVarsData[i].info.comment);
     619    DEBUG2(LOG_DEBUG, "read for %s comment %s from setup file",modelData->stringVarsData[i].info.name,modelData->stringVarsData[i].info.comment);
    590620    read_value(mi.sAlg[i]["fileName"], (modelica_string*)&(modelData->stringVarsData[i].info.info.filename));
    591     DEBUG2(LOG_DEBUG, "| | read for %s filename %s from setup file",modelData->stringVarsData[i].info.name,modelData->stringVarsData[i].info.info.filename);
     621    DEBUG2(LOG_DEBUG, "read for %s filename %s from setup file",modelData->stringVarsData[i].info.name,modelData->stringVarsData[i].info.info.filename);
    592622    read_value(mi.sAlg[i]["startLine"], (modelica_integer*) &(modelData->stringVarsData[i].info.info.lineStart));
    593     DEBUG2(LOG_DEBUG, "| | read for %s lineStart %d from setup file",modelData->stringVarsData[i].info.name,modelData->stringVarsData[i].info.info.lineStart);
     623    DEBUG2(LOG_DEBUG, "read for %s lineStart %d from setup file",modelData->stringVarsData[i].info.name,modelData->stringVarsData[i].info.info.lineStart);
    594624    read_value(mi.sAlg[i]["startColumn"], (modelica_integer*) &(modelData->stringVarsData[i].info.info.colStart));
    595     DEBUG2(LOG_DEBUG, "| | read for %s colStart %d from setup file",modelData->stringVarsData[i].info.name,modelData->stringVarsData[i].info.info.colStart);
     625    DEBUG2(LOG_DEBUG, "read for %s colStart %d from setup file",modelData->stringVarsData[i].info.name,modelData->stringVarsData[i].info.info.colStart);
    596626    read_value(mi.sAlg[i]["endLine"], (modelica_integer*) &(modelData->stringVarsData[i].info.info.lineEnd));
    597     DEBUG2(LOG_DEBUG, "| | read for %s lineEnd %d from setup file",modelData->stringVarsData[i].info.name,modelData->stringVarsData[i].info.info.lineEnd);
     627    DEBUG2(LOG_DEBUG, "read for %s lineEnd %d from setup file",modelData->stringVarsData[i].info.name,modelData->stringVarsData[i].info.info.lineEnd);
    598628    read_value(mi.sAlg[i]["endColumn"], (modelica_integer*) &(modelData->stringVarsData[i].info.info.colEnd));
    599     DEBUG2(LOG_DEBUG, "| | read for %s colEnd %d from setup file",modelData->stringVarsData[i].info.name,modelData->stringVarsData[i].info.info.colEnd);
     629    DEBUG2(LOG_DEBUG, "read for %s colEnd %d from setup file",modelData->stringVarsData[i].info.name,modelData->stringVarsData[i].info.info.colEnd);
    600630    read_value(mi.sAlg[i]["fileWritable"], (modelica_integer*) &(modelData->stringVarsData[i].info.info.readonly));
    601     DEBUG2(LOG_DEBUG, "| | read for %s readonly %d from setup file",modelData->stringVarsData[i].info.name,modelData->stringVarsData[i].info.info.readonly);
    602 
     631    DEBUG2(LOG_DEBUG, "read for %s readonly %d from setup file",modelData->stringVarsData[i].info.name,modelData->stringVarsData[i].info.info.readonly);
     632    RELEASE(LOG_DEBUG);
     633   
    603634    /* read var attribute */
    604635    read_value(mi.sAlg[i]["useStart"], &(modelData->stringVarsData[i].attribute.useStart));
    605636    read_value(mi.sAlg[i]["start"], &(modelData->stringVarsData[i].attribute.start));
    606637
    607     DEBUG4(LOG_DEBUG, "| String %s(%sstart=%s%s)", modelData->stringVarsData[i].info.name, (modelData->stringVarsData[i].attribute.useStart)?"":"{", modelData->stringVarsData[i].attribute.start, (modelData->stringVarsData[i].attribute.useStart)?"":"}");
     638    INFO4(LOG_DEBUG, "String %s(%sstart=%s%s)", modelData->stringVarsData[i].info.name, (modelData->stringVarsData[i].attribute.useStart)?"":"{", modelData->stringVarsData[i].attribute.start, (modelData->stringVarsData[i].attribute.useStart)?"":"}");
    608639   
    609640    /* filter internal variables */
    … …  
    615646    DEBUG2(LOG_DEBUG, "string variables: mapAlias[%s] = %ld", modelData->stringVarsData[i].info.name, i);
    616647  }
     648  RELEASE(LOG_DEBUG);
    617649
    618650  /*
    … …  
    620652   */
    621653  /* read Parameters static data */
    622   DEBUG(LOG_DEBUG, "read xml file for real parameters:");
     654  INFO(LOG_DEBUG, "read xml file for real parameters");
     655  INDENT(LOG_DEBUG);
    623656  for(long i=0; i<modelData->nParametersReal; i++)
    624657  {
    625658    /* read var info */
    626659    read_value(mi.rPar[i]["name"], &(modelData->realParameterData[i].info.name));
    627     DEBUG1(LOG_DEBUG, "| read var %s from setup file",modelData->realParameterData[i].info.name);
     660    DEBUG1(LOG_DEBUG, "read var %s from setup file",modelData->realParameterData[i].info.name);
     661   
     662    INDENT(LOG_DEBUG);
    628663    read_value(mi.rPar[i]["valueReference"], &(modelData->realParameterData[i].info.id));
    629     DEBUG2(LOG_DEBUG, "| | read for %s id %d from setup file",modelData->realParameterData[i].info.name,modelData->realParameterData[i].info.id);
     664    DEBUG2(LOG_DEBUG, "read for %s id %d from setup file",modelData->realParameterData[i].info.name,modelData->realParameterData[i].info.id);
    630665    read_value(mi.rPar[i]["description"], &(modelData->realParameterData[i].info.comment));
    631     DEBUG2(LOG_DEBUG, "| | read for %s comment %s from setup file",modelData->realParameterData[i].info.name,modelData->realParameterData[i].info.comment);
     666    DEBUG2(LOG_DEBUG, "read for %s comment %s from setup file",modelData->realParameterData[i].info.name,modelData->realParameterData[i].info.comment);
    632667    read_value(mi.rPar[i]["fileName"], (modelica_string*)&(modelData->realParameterData[i].info.info.filename));
    633     DEBUG2(LOG_DEBUG, "| | read for %s filename %s from setup file",modelData->realParameterData[i].info.name,modelData->realParameterData[i].info.info.filename);
     668    DEBUG2(LOG_DEBUG, "read for %s filename %s from setup file",modelData->realParameterData[i].info.name,modelData->realParameterData[i].info.info.filename);
    634669    read_value(mi.rPar[i]["startLine"], (modelica_integer*) &(modelData->realParameterData[i].info.info.lineStart));
    635     DEBUG2(LOG_DEBUG, "| | read for %s lineStart %d from setup file",modelData->realParameterData[i].info.name,modelData->realParameterData[i].info.info.lineStart);
     670    DEBUG2(LOG_DEBUG, "read for %s lineStart %d from setup file",modelData->realParameterData[i].info.name,modelData->realParameterData[i].info.info.lineStart);
    636671    read_value(mi.rPar[i]["startColumn"], (modelica_integer*) &(modelData->realParameterData[i].info.info.colStart));
    637     DEBUG2(LOG_DEBUG, "| | read for %s colStart %d from setup file",modelData->realParameterData[i].info.name,modelData->realParameterData[i].info.info.colStart);
     672    DEBUG2(LOG_DEBUG, "read for %s colStart %d from setup file",modelData->realParameterData[i].info.name,modelData->realParameterData[i].info.info.colStart);
    638673    read_value(mi.rPar[i]["endLine"], (modelica_integer*) &(modelData->realParameterData[i].info.info.lineEnd));
    639     DEBUG2(LOG_DEBUG, "| | read for %s lineEnd %d from setup file",modelData->realParameterData[i].info.name,modelData->realParameterData[i].info.info.lineEnd);
     674    DEBUG2(LOG_DEBUG, "read for %s lineEnd %d from setup file",modelData->realParameterData[i].info.name,modelData->realParameterData[i].info.info.lineEnd);
    640675    read_value(mi.rPar[i]["endColumn"], (modelica_integer*) &(modelData->realParameterData[i].info.info.colEnd));
    641     DEBUG2(LOG_DEBUG, "| | read for %s colEnd %d from setup file",modelData->realParameterData[i].info.name,modelData->realParameterData[i].info.info.colEnd);
     676    DEBUG2(LOG_DEBUG, "read for %s colEnd %d from setup file",modelData->realParameterData[i].info.name,modelData->realParameterData[i].info.info.colEnd);
    642677    read_value(mi.rPar[i]["fileWritable"], (modelica_integer*) &(modelData->realParameterData[i].info.info.readonly));
    643     DEBUG2(LOG_DEBUG, "| | read for %s readonly %d from setup file",modelData->realParameterData[i].info.name,modelData->realParameterData[i].info.info.readonly);
    644 
     678    DEBUG2(LOG_DEBUG, "read for %s readonly %d from setup file",modelData->realParameterData[i].info.name,modelData->realParameterData[i].info.info.readonly);
     679    RELEASE(LOG_DEBUG);
     680   
    645681    /* read var attribute */
    646682    read_value(mi.rPar[i]["useStart"], &(modelData->realParameterData[i].attribute.useStart));
    … …  
    652688    read_value(mi.rPar[i]["max"], &(modelData->realParameterData[i].attribute.max));
    653689
    654     DEBUG10(LOG_DEBUG, "| parameter Real %s(%sstart=%g%s, fixed=%s, %snominal=%g%s, min=%g, max=%g)", modelData->realParameterData[i].info.name, modelData->realParameterData[i].attribute.useStart?"":"{", modelData->realParameterData[i].attribute.start, modelData->realParameterData[i].attribute.useStart?"":"}", modelData->realParameterData[i].attribute.fixed?"true":"false", modelData->realParameterData[i].attribute.useNominal?"":"{", modelData->realParameterData[i].attribute.nominal, modelData->realParameterData[i].attribute.useNominal?"":"}", modelData->realParameterData[i].attribute.min, modelData->realParameterData[i].attribute.max);
     690    INFO10(LOG_DEBUG, "parameter Real %s(%sstart=%g%s, fixed=%s, %snominal=%g%s, min=%g, max=%g)", modelData->realParameterData[i].info.name, modelData->realParameterData[i].attribute.useStart?"":"{", modelData->realParameterData[i].attribute.start, modelData->realParameterData[i].attribute.useStart?"":"}", modelData->realParameterData[i].attribute.fixed?"true":"false", modelData->realParameterData[i].attribute.useNominal?"":"{", modelData->realParameterData[i].attribute.nominal, modelData->realParameterData[i].attribute.useNominal?"":"}", modelData->realParameterData[i].attribute.min, modelData->realParameterData[i].attribute.max);
    655691   
    656692    /* filter internal variables */
    … …  
    662698    DEBUG2(LOG_DEBUG, "real parameters: mapAlias[%s] = %ld", modelData->realParameterData[i].info.name, i);
    663699  }
     700  RELEASE(LOG_DEBUG);
    664701
    665702  /* read integer parameters static data */
    666   DEBUG(LOG_DEBUG, "read xml file for integer parameters:");
     703  INFO(LOG_DEBUG, "read xml file for integer parameters");
     704  INDENT(LOG_DEBUG);
    667705  for(long i=0; i<modelData->nParametersInteger; i++)
    668706  {
    669707    /* read var info */
    670708    read_value(mi.iPar[i]["name"], &(modelData->integerParameterData[i].info.name));
    671     DEBUG1(LOG_DEBUG, "| read var %s from setup file",modelData->integerParameterData[i].info.name);
     709    DEBUG1(LOG_DEBUG, "read var %s from setup file",modelData->integerParameterData[i].info.name);
     710   
     711    INDENT(LOG_DEBUG);
    672712    read_value(mi.iPar[i]["valueReference"], &(modelData->integerParameterData[i].info.id));
    673     DEBUG2(LOG_DEBUG, "| | read for %s id %d from setup file",modelData->integerParameterData[i].info.name,modelData->integerParameterData[i].info.id);
     713    DEBUG2(LOG_DEBUG, "read for %s id %d from setup file",modelData->integerParameterData[i].info.name,modelData->integerParameterData[i].info.id);
    674714    read_value(mi.iPar[i]["description"], &(modelData->integerParameterData[i].info.comment));
    675     DEBUG2(LOG_DEBUG, "| | read for %s comment %s from setup file",modelData->integerParameterData[i].info.name,modelData->integerParameterData[i].info.comment);
     715    DEBUG2(LOG_DEBUG, "read for %s comment %s from setup file",modelData->integerParameterData[i].info.name,modelData->integerParameterData[i].info.comment);
    676716    read_value(mi.iPar[i]["fileName"], (modelica_string*)&(modelData->integerParameterData[i].info.info.filename));
    677     DEBUG2(LOG_DEBUG, "| | read for %s filename %s from setup file",modelData->integerParameterData[i].info.name,modelData->integerParameterData[i].info.info.filename);
     717    DEBUG2(LOG_DEBUG, "read for %s filename %s from setup file",modelData->integerParameterData[i].info.name,modelData->integerParameterData[i].info.info.filename);
    678718    read_value(mi.iPar[i]["startLine"], (modelica_integer*) &(modelData->integerParameterData[i].info.info.lineStart));
    679     DEBUG2(LOG_DEBUG, "| | read for %s lineStart %d from setup file",modelData->integerParameterData[i].info.name,modelData->integerParameterData[i].info.info.lineStart);
     719    DEBUG2(LOG_DEBUG, "read for %s lineStart %d from setup file",modelData->integerParameterData[i].info.name,modelData->integerParameterData[i].info.info.lineStart);
    680720    read_value(mi.iPar[i]["startColumn"], (modelica_integer*) &(modelData->integerParameterData[i].info.info.colStart));
    681     DEBUG2(LOG_DEBUG, "| | read for %s colStart %d from setup file",modelData->integerParameterData[i].info.name,modelData->integerParameterData[i].info.info.colStart);
     721    DEBUG2(LOG_DEBUG, "read for %s colStart %d from setup file",modelData->integerParameterData[i].info.name,modelData->integerParameterData[i].info.info.colStart);
    682722    read_value(mi.iPar[i]["endLine"], (modelica_integer*) &(modelData->integerParameterData[i].info.info.lineEnd));
    683     DEBUG2(LOG_DEBUG, "| | read for %s lineEnd %d from setup file",modelData->integerParameterData[i].info.name,modelData->integerParameterData[i].info.info.lineEnd);
     723    DEBUG2(LOG_DEBUG, "read for %s lineEnd %d from setup file",modelData->integerParameterData[i].info.name,modelData->integerParameterData[i].info.info.lineEnd);
    684724    read_value(mi.iPar[i]["endColumn"], (modelica_integer*) &(modelData->integerParameterData[i].info.info.colEnd));
    685     DEBUG2(LOG_DEBUG, "| | read for %s colEnd %d from setup file",modelData->integerParameterData[i].info.name,modelData->integerParameterData[i].info.info.colEnd);
     725    DEBUG2(LOG_DEBUG, "read for %s colEnd %d from setup file",modelData->integerParameterData[i].info.name,modelData->integerParameterData[i].info.info.colEnd);
    686726    read_value(mi.iPar[i]["fileWritable"], (modelica_integer*) &(modelData->integerParameterData[i].info.info.readonly));
    687     DEBUG2(LOG_DEBUG, "| | read for %s readonly %d from setup file",modelData->integerParameterData[i].info.name,modelData->integerParameterData[i].info.info.readonly);
    688 
     727    DEBUG2(LOG_DEBUG, "read for %s readonly %d from setup file",modelData->integerParameterData[i].info.name,modelData->integerParameterData[i].info.info.readonly);
     728    RELEASE(LOG_DEBUG);
     729   
    689730    /* read var attribute */
    690731    read_value(mi.iPar[i]["useStart"], (modelica_boolean*)&(modelData->integerParameterData[i].attribute.useStart));
    … …  
    694735    read_value(mi.iPar[i]["max"], &(modelData->integerParameterData[i].attribute.max));
    695736
    696     DEBUG7(LOG_DEBUG, "| parameter Integer %s(%sstart=%ld%s, fixed=%s, min=%ld, max=%ld)", modelData->integerParameterData[i].info.name, modelData->integerParameterData[i].attribute.useStart?"":"{", modelData->integerParameterData[i].attribute.start, modelData->integerParameterData[i].attribute.useStart?"":"}", modelData->integerParameterData[i].attribute.fixed?"true":"false", modelData->integerParameterData[i].attribute.min, modelData->integerParameterData[i].attribute.max);
     737    INFO7(LOG_DEBUG, "parameter Integer %s(%sstart=%ld%s, fixed=%s, min=%ld, max=%ld)", modelData->integerParameterData[i].info.name, modelData->integerParameterData[i].attribute.useStart?"":"{", modelData->integerParameterData[i].attribute.start, modelData->integerParameterData[i].attribute.useStart?"":"}", modelData->integerParameterData[i].attribute.fixed?"true":"false", modelData->integerParameterData[i].attribute.min, modelData->integerParameterData[i].attribute.max);
    697738   
    698739    /* filter internal variables */
    … …  
    703744    mapAliasParam[(modelData->integerParameterData[i].info.name)] = i;
    704745  }
     746  RELEASE(LOG_DEBUG);
    705747
    706748  /* read boolean parameters static data */
    707   DEBUG(LOG_DEBUG, "read xml file for boolean parameters:");
     749  INFO(LOG_DEBUG, "read xml file for boolean parameters");
     750  INDENT(LOG_DEBUG);
    708751  for(long i=0; i<modelData->nParametersBoolean; i++)
    709752  {
    710753    /* read var info */
    711754    read_value(mi.bPar[i]["name"], &(modelData->booleanParameterData[i].info.name));
    712     DEBUG1(LOG_DEBUG, "| read var %s from setup file", modelData->booleanParameterData[i].info.name);
     755    DEBUG1(LOG_DEBUG, "read var %s from setup file", modelData->booleanParameterData[i].info.name);
     756   
     757    INDENT(LOG_DEBUG);
    713758    read_value(mi.bPar[i]["valueReference"], &(modelData->booleanParameterData[i].info.id));
    714     DEBUG2(LOG_DEBUG, "| | read for %s id %d from setup file", modelData->booleanParameterData[i].info.name, modelData->booleanParameterData[i].info.id);
     759    DEBUG2(LOG_DEBUG, "read for %s id %d from setup file", modelData->booleanParameterData[i].info.name, modelData->booleanParameterData[i].info.id);
    715760    read_value(mi.bPar[i]["description"], &(modelData->booleanParameterData[i].info.comment));
    716     DEBUG2(LOG_DEBUG, "| | read for %s comment %s from setup file", modelData->booleanParameterData[i].info.name, modelData->booleanParameterData[i].info.comment);
     761    DEBUG2(LOG_DEBUG, "read for %s comment %s from setup file", modelData->booleanParameterData[i].info.name, modelData->booleanParameterData[i].info.comment);
    717762    read_value(mi.bPar[i]["fileName"], (modelica_string*)&(modelData->booleanParameterData[i].info.info.filename));
    718     DEBUG2(LOG_DEBUG, "| | read for %s filename %s from setup file", modelData->booleanParameterData[i].info.name, modelData->booleanParameterData[i].info.info.filename);
     763    DEBUG2(LOG_DEBUG, "read for %s filename %s from setup file", modelData->booleanParameterData[i].info.name, modelData->booleanParameterData[i].info.info.filename);
    719764    read_value(mi.bPar[i]["startLine"], (modelica_integer*)&(modelData->booleanParameterData[i].info.info.lineStart));
    720     DEBUG2(LOG_DEBUG, "| | read for %s lineStart %d from setup file", modelData->booleanParameterData[i].info.name, modelData->booleanParameterData[i].info.info.lineStart);
     765    DEBUG2(LOG_DEBUG, "read for %s lineStart %d from setup file", modelData->booleanParameterData[i].info.name, modelData->booleanParameterData[i].info.info.lineStart);
    721766    read_value(mi.bPar[i]["startColumn"], (modelica_integer*)&(modelData->booleanParameterData[i].info.info.colStart));
    722     DEBUG2(LOG_DEBUG, "| | read for %s colStart %d from setup file", modelData->booleanParameterData[i].info.name, modelData->booleanParameterData[i].info.info.colStart);
     767    DEBUG2(LOG_DEBUG, "read for %s colStart %d from setup file", modelData->booleanParameterData[i].info.name, modelData->booleanParameterData[i].info.info.colStart);
    723768    read_value(mi.bPar[i]["endLine"], (modelica_integer*)&(modelData->booleanParameterData[i].info.info.lineEnd));
    724     DEBUG2(LOG_DEBUG, "| | read for %s lineEnd %d from setup file", modelData->booleanParameterData[i].info.name, modelData->booleanParameterData[i].info.info.lineEnd);
     769    DEBUG2(LOG_DEBUG, "read for %s lineEnd %d from setup file", modelData->booleanParameterData[i].info.name, modelData->booleanParameterData[i].info.info.lineEnd);
    725770    read_value(mi.bPar[i]["endColumn"], (modelica_integer*)&(modelData->booleanParameterData[i].info.info.colEnd));
    726     DEBUG2(LOG_DEBUG, "| | read for %s colEnd %d from setup file", modelData->booleanParameterData[i].info.name, modelData->booleanParameterData[i].info.info.colEnd);
     771    DEBUG2(LOG_DEBUG, "read for %s colEnd %d from setup file", modelData->booleanParameterData[i].info.name, modelData->booleanParameterData[i].info.info.colEnd);
    727772    read_value(mi.bPar[i]["fileWritable"], (modelica_integer*)&(modelData->booleanParameterData[i].info.info.readonly));
    728     DEBUG2(LOG_DEBUG, "| | read for %s readonly %d from setup file", modelData->booleanParameterData[i].info.name, modelData->booleanParameterData[i].info.info.readonly);
    729 
     773    DEBUG2(LOG_DEBUG, "read for %s readonly %d from setup file", modelData->booleanParameterData[i].info.name, modelData->booleanParameterData[i].info.info.readonly);
     774    RELEASE(LOG_DEBUG);
     775   
    730776    /* read var attribute */
    731777    read_value(mi.bPar[i]["useStart"], &(modelData->booleanParameterData[i].attribute.useStart));
    … …  
    733779    read_value(mi.bPar[i]["fixed"], &(modelData->booleanParameterData[i].attribute.fixed));
    734780
    735     DEBUG5(LOG_DEBUG, "| parameter Boolean %s(%sstart=%s%s, fixed=%s)", modelData->booleanParameterData[i].info.name, modelData->booleanParameterData[i].attribute.useStart?"":"{", modelData->booleanParameterData[i].attribute.start?"true":"false", modelData->booleanParameterData[i].attribute.useStart?"":"}", modelData->booleanParameterData[i].attribute.fixed?"true":"false");
     781    INFO5(LOG_DEBUG, "parameter Boolean %s(%sstart=%s%s, fixed=%s)", modelData->booleanParameterData[i].info.name, modelData->booleanParameterData[i].attribute.useStart?"":"{", modelData->booleanParameterData[i].attribute.start?"true":"false", modelData->booleanParameterData[i].attribute.useStart?"":"}", modelData->booleanParameterData[i].attribute.fixed?"true":"false");
    736782   
    737783    /* filter internal variables */
    … …  
    742788    mapAliasParam[(modelData->booleanParameterData[i].info.name)] = i;
    743789  }
     790  RELEASE(LOG_DEBUG);
    744791
    745792  /* read string parameters static data */
    746   DEBUG(LOG_DEBUG, "read xml file for string parameters:");
     793  INFO(LOG_DEBUG, "read xml file for string parameters");
     794  INDENT(LOG_DEBUG);
    747795  for(long i=0; i<modelData->nParametersString; i++)
    748796  {
    749797    /* read var info */
    750798    read_value(mi.sPar[i]["name"], &(modelData->stringParameterData[i].info.name));
    751     DEBUG1(LOG_DEBUG, "| read var %s from setup file",modelData->stringParameterData[i].info.name);
     799    DEBUG1(LOG_DEBUG, "read var %s from setup file",modelData->stringParameterData[i].info.name);
     800   
     801    INDENT(LOG_DEBUG);
    752802    read_value(mi.sPar[i]["valueReference"], &(modelData->stringParameterData[i].info.id));
    753     DEBUG2(LOG_DEBUG, "| | read for %s id %d from setup file",modelData->stringParameterData[i].info.name,modelData->stringParameterData[i].info.id);
     803    DEBUG2(LOG_DEBUG, "read for %s id %d from setup file",modelData->stringParameterData[i].info.name,modelData->stringParameterData[i].info.id);
    754804    read_value(mi.sPar[i]["description"], &(modelData->stringParameterData[i].info.comment));
    755     DEBUG2(LOG_DEBUG, "| | read for %s comment %s from setup file",modelData->stringParameterData[i].info.name,modelData->stringParameterData[i].info.comment);
     805    DEBUG2(LOG_DEBUG, "read for %s comment %s from setup file",modelData->stringParameterData[i].info.name,modelData->stringParameterData[i].info.comment);
    756806    read_value(mi.sPar[i]["fileName"], (modelica_string*)&(modelData->stringParameterData[i].info.info.filename));
    757     DEBUG2(LOG_DEBUG, "| | read for %s filename %s from setup file",modelData->stringParameterData[i].info.name,modelData->stringParameterData[i].info.info.filename);
     807    DEBUG2(LOG_DEBUG, "read for %s filename %s from setup file",modelData->stringParameterData[i].info.name,modelData->stringParameterData[i].info.info.filename);
    758808    read_value(mi.sPar[i]["startLine"], (modelica_integer*) &(modelData->stringParameterData[i].info.info.lineStart));
    759     DEBUG2(LOG_DEBUG, "| | read for %s lineStart %d from setup file",modelData->stringParameterData[i].info.name,modelData->stringParameterData[i].info.info.lineStart);
     809    DEBUG2(LOG_DEBUG, "read for %s lineStart %d from setup file",modelData->stringParameterData[i].info.name,modelData->stringParameterData[i].info.info.lineStart);
    760810    read_value(mi.sPar[i]["startColumn"], (modelica_integer*) &(modelData->stringParameterData[i].info.info.colStart));
    761     DEBUG2(LOG_DEBUG, "| | read for %s colStart %d from setup file",modelData->stringParameterData[i].info.name,modelData->stringParameterData[i].info.info.colStart);
     811    DEBUG2(LOG_DEBUG, "read for %s colStart %d from setup file",modelData->stringParameterData[i].info.name,modelData->stringParameterData[i].info.info.colStart);
    762812    read_value(mi.sPar[i]["endLine"], (modelica_integer*) &(modelData->stringParameterData[i].info.info.lineEnd));
    763     DEBUG2(LOG_DEBUG, "| | read for %s lineEnd %d from setup file",modelData->stringParameterData[i].info.name,modelData->stringParameterData[i].info.info.lineEnd);
     813    DEBUG2(LOG_DEBUG, "read for %s lineEnd %d from setup file",modelData->stringParameterData[i].info.name,modelData->stringParameterData[i].info.info.lineEnd);
    764814    read_value(mi.sPar[i]["endColumn"], (modelica_integer*) &(modelData->stringParameterData[i].info.info.colEnd));
    765     DEBUG2(LOG_DEBUG, "| | read for %s colEnd %d from setup file",modelData->stringParameterData[i].info.name,modelData->stringParameterData[i].info.info.colEnd);
     815    DEBUG2(LOG_DEBUG, "read for %s colEnd %d from setup file",modelData->stringParameterData[i].info.name,modelData->stringParameterData[i].info.info.colEnd);
    766816    read_value(mi.sPar[i]["fileWritable"], (modelica_integer*) &(modelData->stringParameterData[i].info.info.readonly));
    767     DEBUG2(LOG_DEBUG, "| | read for %s readonly %d from setup file",modelData->stringParameterData[i].info.name,modelData->stringParameterData[i].info.info.readonly);
    768 
     817    DEBUG2(LOG_DEBUG, "read for %s readonly %d from setup file",modelData->stringParameterData[i].info.name,modelData->stringParameterData[i].info.info.readonly);
     818    RELEASE(LOG_DEBUG);
     819   
    769820    /* read var attribute */
    770821    read_value(mi.sPar[i]["useStart"], &(modelData->stringParameterData[i].attribute.useStart));
    771822    read_value(mi.sPar[i]["start"], &(modelData->stringParameterData[i].attribute.start));
    772823
    773     DEBUG4(LOG_DEBUG, "| parameter String %s(%sstart=%s%s)", modelData->stringParameterData[i].info.name, modelData->stringParameterData[i].attribute.useStart?"":"{", modelData->stringParameterData[i].attribute.start, modelData->stringParameterData[i].attribute.useStart?"":"}");
     824    INFO4(LOG_DEBUG, "parameter String %s(%sstart=%s%s)", modelData->stringParameterData[i].info.name, modelData->stringParameterData[i].attribute.useStart?"":"{", modelData->stringParameterData[i].attribute.start, modelData->stringParameterData[i].attribute.useStart?"":"}");
    774825   
    775826    /* filter internal variables */
    … …  
    780831    mapAliasParam[(modelData->stringParameterData[i].info.name)]=i;
    781832  }
     833  RELEASE(LOG_DEBUG);
    782834
    783835  /*
    784836   * real all alias vars
    785837   */
    786   DEBUG(LOG_DEBUG, "read xml file for real alias vars:");
     838  INFO(LOG_DEBUG, "read xml file for real alias vars");
     839  INDENT(LOG_DEBUG);
    787840  for(long i=0; i<modelData->nAliasReal; i++)
    788841  {
    789842    /* read var info */
    790843    read_value(mi.rAli[i]["name"], &(modelData->realAlias[i].info.name));
    791     DEBUG1(LOG_DEBUG, "| read var %s from setup file",modelData->realAlias[i].info.name);
     844    DEBUG1(LOG_DEBUG, "read var %s from setup file",modelData->realAlias[i].info.name);
     845   
     846    INDENT(LOG_DEBUG);
    792847    read_value(mi.rAli[i]["valueReference"], &(modelData->realAlias[i].info.id));
    793     DEBUG2(LOG_DEBUG, "| | read for %s id %d from setup file",(modelData->realAlias[i].info.name),modelData->realAlias[i].info.id);
     848    DEBUG2(LOG_DEBUG, "read for %s id %d from setup file",(modelData->realAlias[i].info.name),modelData->realAlias[i].info.id);
    794849    read_value(mi.rAli[i]["description"], &(modelData->realAlias[i].info.comment));
    795     DEBUG2(LOG_DEBUG, "| | read for %s comment %s from setup file",modelData->realAlias[i].info.name,modelData->realAlias[i].info.comment);
     850    DEBUG2(LOG_DEBUG, "read for %s comment %s from setup file",modelData->realAlias[i].info.name,modelData->realAlias[i].info.comment);
    796851    read_value(mi.rAli[i]["fileName"], (modelica_string*)&(modelData->realAlias[i].info.info.filename));
    797     DEBUG2(LOG_DEBUG, "| | read for %s filename %s from setup file",modelData->realAlias[i].info.name,modelData->realAlias[i].info.info.filename);
     852    DEBUG2(LOG_DEBUG, "read for %s filename %s from setup file",modelData->realAlias[i].info.name,modelData->realAlias[i].info.info.filename);
    798853    read_value(mi.rAli[i]["startLine"], (modelica_integer*) &(modelData->realAlias[i].info.info.lineStart));
    799     DEBUG2(LOG_DEBUG, "| | read for %s lineStart %d from setup file",modelData->realAlias[i].info.name,modelData->realAlias[i].info.info.lineStart);
     854    DEBUG2(LOG_DEBUG, "read for %s lineStart %d from setup file",modelData->realAlias[i].info.name,modelData->realAlias[i].info.info.lineStart);
    800855    read_value(mi.rAli[i]["startColumn"], (modelica_integer*) &(modelData->realAlias[i].info.info.colStart));
    801     DEBUG2(LOG_DEBUG, "| | read for %s colStart %d from setup file",modelData->realAlias[i].info.name,modelData->realAlias[i].info.info.colStart);
     856    DEBUG2(LOG_DEBUG, "read for %s colStart %d from setup file",modelData->realAlias[i].info.name,modelData->realAlias[i].info.info.colStart);
    802857    read_value(mi.rAli[i]["endLine"], (modelica_integer*) &(modelData->realAlias[i].info.info.lineEnd));
    803     DEBUG2(LOG_DEBUG, "| | read for %s lineEnd %d from setup file",modelData->realAlias[i].info.name,modelData->realAlias[i].info.info.lineEnd);
     858    DEBUG2(LOG_DEBUG, "read for %s lineEnd %d from setup file",modelData->realAlias[i].info.name,modelData->realAlias[i].info.info.lineEnd);
    804859    read_value(mi.rAli[i]["endColumn"], (modelica_integer*) &(modelData->realAlias[i].info.info.colEnd));
    805     DEBUG2(LOG_DEBUG, "| | read for %s colEnd %d from setup file",modelData->realAlias[i].info.name,modelData->realAlias[i].info.info.colEnd);
     860    DEBUG2(LOG_DEBUG, "read for %s colEnd %d from setup file",modelData->realAlias[i].info.name,modelData->realAlias[i].info.info.colEnd);
    806861    read_value(mi.rAli[i]["fileWritable"], (modelica_integer*) &(modelData->realAlias[i].info.info.readonly));
    807     DEBUG2(LOG_DEBUG, "| | read for %s readonly %d from setup file",modelData->realAlias[i].info.name,modelData->realAlias[i].info.info.readonly);
    808 
     862    DEBUG2(LOG_DEBUG, "read for %s readonly %d from setup file",modelData->realAlias[i].info.name,modelData->realAlias[i].info.info.readonly);
     863    RELEASE(LOG_DEBUG);
     864   
    809865    string aliasTmp;
    810866    read_value(mi.rAli[i]["alias"], &aliasTmp);
    … …  
    814870      modelData->realAlias[i].negate = 0;
    815871
    816     DEBUG2(LOG_DEBUG, "| read for %s negated %d from setup file", modelData->realAlias[i].info.name, modelData->realAlias[i].negate);
     872    INFO2(LOG_DEBUG, "read for %s negated %d from setup file", modelData->realAlias[i].info.name, modelData->realAlias[i].negate);
    817873   
    818874    /* filter internal variables */
    … …  
    842898      THROW1("%s", msg.c_str());
    843899    }
    844     DEBUG3(LOG_DEBUG, "| read for %s aliasID %d from %s from setup file",
     900    DEBUG3(LOG_DEBUG, "read for %s aliasID %d from %s from setup file",
    845901                modelData->realAlias[i].info.name,
    846902                modelData->realAlias[i].nameID,
    847903                modelData->realAlias[i].aliasType ? ((modelData->realAlias[i].aliasType==2) ? "time" : "real parameters") : "real variables");
    848904  }
     905  RELEASE(LOG_DEBUG);
    849906
    850907  /*
    851908   * integer all alias vars
    852909   */
    853   DEBUG(LOG_DEBUG, "read xml file for integer alias vars:");
     910  INFO(LOG_DEBUG, "read xml file for integer alias vars");
     911  INDENT(LOG_DEBUG);
    854912  for(long i=0; i<modelData->nAliasInteger; i++)
    855913  {
    856914    /* read var info */
    857915    read_value(mi.iAli[i]["name"], &(modelData->integerAlias[i].info.name));
    858     DEBUG1(LOG_DEBUG, "| read var %s from setup file",modelData->integerAlias[i].info.name);
     916    DEBUG1(LOG_DEBUG, "read var %s from setup file",modelData->integerAlias[i].info.name);
     917   
     918    INDENT(LOG_DEBUG);
    859919    read_value(mi.iAli[i]["valueReference"], &(modelData->integerAlias[i].info.id));
    860     DEBUG2(LOG_DEBUG, "| | read for %s id %d from setup file",modelData->integerAlias[i].info.name,modelData->integerAlias[i].info.id);
     920    DEBUG2(LOG_DEBUG, "read for %s id %d from setup file",modelData->integerAlias[i].info.name,modelData->integerAlias[i].info.id);
    861921    read_value(mi.iAli[i]["description"], &(modelData->integerAlias[i].info.comment));
    862     DEBUG2(LOG_DEBUG, "| | read for %s comment %s from setup file",modelData->integerAlias[i].info.name,modelData->integerAlias[i].info.comment);
     922    DEBUG2(LOG_DEBUG, "read for %s comment %s from setup file",modelData->integerAlias[i].info.name,modelData->integerAlias[i].info.comment);
    863923    read_value(mi.iAli[i]["fileName"], (modelica_string*)&(modelData->integerAlias[i].info.info.filename));
    864     DEBUG2(LOG_DEBUG, "| | read for %s filename %s from setup file",modelData->integerAlias[i].info.name,modelData->integerAlias[i].info.info.filename);
     924    DEBUG2(LOG_DEBUG, "read for %s filename %s from setup file",modelData->integerAlias[i].info.name,modelData->integerAlias[i].info.info.filename);
    865925    read_value(mi.iAli[i]["startLine"], (modelica_integer*) &(modelData->integerAlias[i].info.info.lineStart));
    866     DEBUG2(LOG_DEBUG, "| | read for %s lineStart %d from setup file",modelData->integerAlias[i].info.name,modelData->integerAlias[i].info.info.lineStart);
     926    DEBUG2(LOG_DEBUG, "read for %s lineStart %d from setup file",modelData->integerAlias[i].info.name,modelData->integerAlias[i].info.info.lineStart);
    867927    read_value(mi.iAli[i]["startColumn"], (modelica_integer*) &(modelData->integerAlias[i].info.info.colStart));
    868     DEBUG2(LOG_DEBUG, "| | read for %s colStart %d from setup file",modelData->integerAlias[i].info.name,modelData->integerAlias[i].info.info.colStart);
     928    DEBUG2(LOG_DEBUG, "read for %s colStart %d from setup file",modelData->integerAlias[i].info.name,modelData->integerAlias[i].info.info.colStart);
    869929    read_value(mi.iAli[i]["endLine"], (modelica_integer*) &(modelData->integerAlias[i].info.info.lineEnd));
    870     DEBUG2(LOG_DEBUG, "| | read for %s lineEnd %d from setup file",modelData->integerAlias[i].info.name,modelData->integerAlias[i].info.info.lineEnd);
     930    DEBUG2(LOG_DEBUG, "read for %s lineEnd %d from setup file",modelData->integerAlias[i].info.name,modelData->integerAlias[i].info.info.lineEnd);
    871931    read_value(mi.iAli[i]["endColumn"], (modelica_integer*) &(modelData->integerAlias[i].info.info.colEnd));
    872     DEBUG2(LOG_DEBUG, "| | read for %s colEnd %d from setup file",modelData->integerAlias[i].info.name,modelData->integerAlias[i].info.info.colEnd);
     932    DEBUG2(LOG_DEBUG, "read for %s colEnd %d from setup file",modelData->integerAlias[i].info.name,modelData->integerAlias[i].info.info.colEnd);
    873933    read_value(mi.iAli[i]["fileWritable"], (modelica_integer*) &(modelData->integerAlias[i].info.info.readonly));
    874     DEBUG2(LOG_DEBUG, "| | read for %s readonly %d from setup file",modelData->integerAlias[i].info.name,modelData->integerAlias[i].info.info.readonly);
    875 
     934    DEBUG2(LOG_DEBUG, "read for %s readonly %d from setup file",modelData->integerAlias[i].info.name,modelData->integerAlias[i].info.info.readonly);
     935    RELEASE(LOG_DEBUG);
     936   
    876937    string aliasTmp;
    877938    read_value(mi.iAli[i]["alias"], &aliasTmp);
    … …  
    881942      modelData->integerAlias[i].negate = 0;
    882943
    883     DEBUG2(LOG_DEBUG, "| read for %s negated %d from setup file",modelData->integerAlias[i].info.name,modelData->integerAlias[i].negate);
     944    INFO2(LOG_DEBUG, "read for %s negated %d from setup file",modelData->integerAlias[i].info.name,modelData->integerAlias[i].negate);
    884945
    885946    /* filter internal variables */
    … …  
    907968      THROW1("%s", msg.c_str());
    908969    }
    909     DEBUG3(LOG_DEBUG, "| read for %s aliasID %d from %s from setup file",
     970    DEBUG3(LOG_DEBUG, "read for %s aliasID %d from %s from setup file",
    910971                modelData->integerAlias[i].info.name,
    911972                modelData->integerAlias[i].nameID,
    912973                modelData->integerAlias[i].aliasType?"integer parameters":"integer variables");
    913974  }
     975  RELEASE(LOG_DEBUG);
    914976
    915977  /*
    916978   * boolean all alias vars
    917979   */
    918   DEBUG(LOG_DEBUG, "read xml file for boolean alias vars:");
     980  INFO(LOG_DEBUG, "read xml file for boolean alias vars");
     981  INDENT(LOG_DEBUG);
    919982  for(long i=0; i<modelData->nAliasBoolean; i++)
    920983  {
    921984    /* read var info */
    922985    read_value(mi.bAli[i]["name"], &(modelData->booleanAlias[i].info.name));
    923     DEBUG1(LOG_DEBUG, "| read var %s from setup file",modelData->booleanAlias[i].info.name);
     986    DEBUG1(LOG_DEBUG, "read var %s from setup file",modelData->booleanAlias[i].info.name);
     987   
     988    INDENT(LOG_DEBUG);
    924989    read_value(mi.bAli[i]["valueReference"], &(modelData->booleanAlias[i].info.id));
    925     DEBUG2(LOG_DEBUG, "| | read for %s id %d from setup file",modelData->booleanAlias[i].info.name,modelData->booleanAlias[i].info.id);
     990    DEBUG2(LOG_DEBUG, "read for %s id %d from setup file",modelData->booleanAlias[i].info.name,modelData->booleanAlias[i].info.id);
    926991    read_value(mi.bAli[i]["description"], &(modelData->booleanAlias[i].info.comment));
    927     DEBUG2(LOG_DEBUG, "| | read for %s comment %s from setup file",modelData->booleanAlias[i].info.name,modelData->booleanAlias[i].info.comment);
     992    DEBUG2(LOG_DEBUG, "read for %s comment %s from setup file",modelData->booleanAlias[i].info.name,modelData->booleanAlias[i].info.comment);
    928993    read_value(mi.bAli[i]["fileName"], (modelica_string*)&(modelData->booleanAlias[i].info.info.filename));
    929     DEBUG2(LOG_DEBUG, "| | read for %s filename %s from setup file",modelData->booleanAlias[i].info.name,modelData->booleanAlias[i].info.info.filename);
     994    DEBUG2(LOG_DEBUG, "read for %s filename %s from setup file",modelData->booleanAlias[i].info.name,modelData->booleanAlias[i].info.info.filename);
    930995    read_value(mi.bAli[i]["startLine"], (modelica_boolean*) &(modelData->booleanAlias[i].info.info.lineStart));
    931     DEBUG2(LOG_DEBUG, "| | read for %s lineStart %d from setup file",modelData->booleanAlias[i].info.name,modelData->booleanAlias[i].info.info.lineStart);
     996    DEBUG2(LOG_DEBUG, "read for %s lineStart %d from setup file",modelData->booleanAlias[i].info.name,modelData->booleanAlias[i].info.info.lineStart);
    932997    read_value(mi.bAli[i]["startColumn"], (modelica_boolean*) &(modelData->booleanAlias[i].info.info.colStart));
    933     DEBUG2(LOG_DEBUG, "| | read for %s colStart %d from setup file",modelData->booleanAlias[i].info.name,modelData->booleanAlias[i].info.info.colStart);
     998    DEBUG2(LOG_DEBUG, "read for %s colStart %d from setup file",modelData->booleanAlias[i].info.name,modelData->booleanAlias[i].info.info.colStart);
    934999    read_value(mi.bAli[i]["endLine"], (modelica_boolean*) &(modelData->booleanAlias[i].info.info.lineEnd));
    935     DEBUG2(LOG_DEBUG, "| | read for %s lineEnd %d from setup file",modelData->booleanAlias[i].info.name,modelData->booleanAlias[i].info.info.lineEnd);
     1000    DEBUG2(LOG_DEBUG, "read for %s lineEnd %d from setup file",modelData->booleanAlias[i].info.name,modelData->booleanAlias[i].info.info.lineEnd);
    9361001    read_value(mi.bAli[i]["endColumn"], (modelica_boolean*) &(modelData->booleanAlias[i].info.info.colEnd));
    937     DEBUG2(LOG_DEBUG, "| | read for %s colEnd %d from setup file",modelData->booleanAlias[i].info.name,modelData->booleanAlias[i].info.info.colEnd);
     1002    DEBUG2(LOG_DEBUG, "read for %s colEnd %d from setup file",modelData->booleanAlias[i].info.name,modelData->booleanAlias[i].info.info.colEnd);
    9381003    read_value(mi.bAli[i]["fileWritable"], (modelica_boolean*) &(modelData->booleanAlias[i].info.info.readonly));
    939     DEBUG2(LOG_DEBUG, "| | read for %s readonly %d from setup file",modelData->booleanAlias[i].info.name,modelData->booleanAlias[i].info.info.readonly);
    940 
     1004    DEBUG2(LOG_DEBUG, "read for %s readonly %d from setup file",modelData->booleanAlias[i].info.name,modelData->booleanAlias[i].info.info.readonly);
     1005    RELEASE(LOG_DEBUG);
     1006   
    9411007    std::string aliasTmp;
    9421008    read_value(mi.bAli[i]["alias"], &aliasTmp);
    … …  
    9461012      modelData->booleanAlias[i].negate = 0;
    9471013
    948     DEBUG2(LOG_DEBUG, "| read for %s negated %d from setup file", modelData->booleanAlias[i].info.name, modelData->booleanAlias[i].negate);
     1014    INFO2(LOG_DEBUG, "read for %s negated %d from setup file", modelData->booleanAlias[i].info.name, modelData->booleanAlias[i].negate);
    9491015
    9501016    /* filter internal variables */
    … …  
    9721038      THROW1("%s", msg.c_str());
    9731039    }
    974     DEBUG3(LOG_DEBUG, "| read for %s aliasID %d from %s from setup file",
     1040    DEBUG3(LOG_DEBUG, "read for %s aliasID %d from %s from setup file",
    9751041                modelData->booleanAlias[i].info.name,
    9761042                modelData->booleanAlias[i].nameID,
    9771043                modelData->booleanAlias[i].aliasType ? "boolean parameters" : "boolean variables");
    9781044  }
     1045  RELEASE(LOG_DEBUG);
    9791046
    9801047  /*
    9811048   * string all alias vars
    9821049   */
    983   DEBUG(LOG_DEBUG, "read xml file for string alias vars:");
     1050  INFO(LOG_DEBUG, "read xml file for string alias vars");
     1051  INDENT(LOG_DEBUG);
    9841052  for(long i=0; i<modelData->nAliasString; i++)
    9851053  {
    9861054    /* read var info */
    9871055    read_value(mi.sAli[i]["name"], &(modelData->stringAlias[i].info.name));
    988     DEBUG1(LOG_DEBUG, "| read var %s from setup file",modelData->stringAlias[i].info.name);
     1056    DEBUG1(LOG_DEBUG, "read var %s from setup file",modelData->stringAlias[i].info.name);
     1057   
     1058    INDENT(LOG_DEBUG);
    9891059    read_value(mi.sAli[i]["valueReference"], &(modelData->stringAlias[i].info.id));
    990     DEBUG2(LOG_DEBUG, "| | read for %s id %d from setup file",modelData->stringAlias[i].info.name,modelData->stringAlias[i].info.id);
     1060    DEBUG2(LOG_DEBUG, "read for %s id %d from setup file",modelData->stringAlias[i].info.name,modelData->stringAlias[i].info.id);
    9911061    read_value(mi.sAli[i]["description"], &(modelData->stringAlias[i].info.comment));
    992     DEBUG2(LOG_DEBUG, "| | read for %s comment %s from setup file",modelData->stringAlias[i].info.name,modelData->stringAlias[i].info.comment);
     1062    DEBUG2(LOG_DEBUG, "read for %s comment %s from setup file",modelData->stringAlias[i].info.name,modelData->stringAlias[i].info.comment);
    9931063    read_value(mi.sAli[i]["fileName"], (modelica_string*)&(modelData->stringAlias[i].info.info.filename));
    994     DEBUG2(LOG_DEBUG, "| | read for %s filename %s from setup file",modelData->stringAlias[i].info.name,modelData->stringAlias[i].info.info.filename);
     1064    DEBUG2(LOG_DEBUG, "read for %s filename %s from setup file",modelData->stringAlias[i].info.name,modelData->stringAlias[i].info.info.filename);
    9951065    read_value(mi.sAli[i]["startLine"], (modelica_string*) &(modelData->stringAlias[i].info.info.lineStart));
    996     DEBUG2(LOG_DEBUG, "| | read for %s lineStart %d from setup file",modelData->stringAlias[i].info.name,modelData->stringAlias[i].info.info.lineStart);
     1066    DEBUG2(LOG_DEBUG, "read for %s lineStart %d from setup file",modelData->stringAlias[i].info.name,modelData->stringAlias[i].info.info.lineStart);
    9971067    read_value(mi.sAli[i]["startColumn"], (modelica_string*) &(modelData->stringAlias[i].info.info.colStart));
    998     DEBUG2(LOG_DEBUG, "| | read for %s colStart %d from setup file",modelData->stringAlias[i].info.name,modelData->stringAlias[i].info.info.colStart);
     1068    DEBUG2(LOG_DEBUG, "read for %s colStart %d from setup file",modelData->stringAlias[i].info.name,modelData->stringAlias[i].info.info.colStart);
    9991069    read_value(mi.sAli[i]["endLine"], (modelica_string*) &(modelData->stringAlias[i].info.info.lineEnd));
    1000     DEBUG2(LOG_DEBUG, "| | read for %s lineEnd %d from setup file",modelData->stringAlias[i].info.name,modelData->stringAlias[i].info.info.lineEnd);
     1070    DEBUG2(LOG_DEBUG, "read for %s lineEnd %d from setup file",modelData->stringAlias[i].info.name,modelData->stringAlias[i].info.info.lineEnd);
    10011071    read_value(mi.sAli[i]["endColumn"], (modelica_string*) &(modelData->stringAlias[i].info.info.colEnd));
    1002     DEBUG2(LOG_DEBUG, "| | read for %s colEnd %d from setup file",modelData->stringAlias[i].info.name,modelData->stringAlias[i].info.info.colEnd);
     1072    DEBUG2(LOG_DEBUG, "read for %s colEnd %d from setup file",modelData->stringAlias[i].info.name,modelData->stringAlias[i].info.info.colEnd);
    10031073    read_value(mi.sAli[i]["fileWritable"], (modelica_string*) &(modelData->stringAlias[i].info.info.readonly));
    1004     DEBUG2(LOG_DEBUG, "| | read for %s readonly %d from setup file",modelData->stringAlias[i].info.name,modelData->stringAlias[i].info.info.readonly);
    1005 
     1074    DEBUG2(LOG_DEBUG, "read for %s readonly %d from setup file",modelData->stringAlias[i].info.name,modelData->stringAlias[i].info.info.readonly);
     1075    RELEASE(LOG_DEBUG);
     1076   
    10061077    std::string aliasTmp;
    10071078    read_value(mi.sAli[i]["alias"], &aliasTmp);
    … …  
    10111082      modelData->stringAlias[i].negate = 0;
    10121083
    1013     DEBUG2(LOG_DEBUG, "| read for %s negated %d from setup file", modelData->stringAlias[i].info.name, modelData->stringAlias[i].negate);
     1084    INFO2(LOG_DEBUG, "read for %s negated %d from setup file", modelData->stringAlias[i].info.name, modelData->stringAlias[i].negate);
    10141085   
    10151086    /* filter internal variables */
    … …  
    10371108      THROW1("%s", msg.c_str());
    10381109    }
    1039     DEBUG3(LOG_DEBUG, "| read for %s aliasID %d from %s from setup file",
     1110    DEBUG3(LOG_DEBUG, "read for %s aliasID %d from %s from setup file",
    10401111                modelData->stringAlias[i].info.name,
    10411112                modelData->stringAlias[i].nameID,
    10421113                modelData->stringAlias[i].aliasType ? "string parameters" : "string variables");
    10431114  }
     1115  RELEASE(LOG_DEBUG);
    10441116
    10451117  XML_ParserFree(parser);

  • SimulationRuntime/c/simulation/solver/delay.h

    rc18a4bd rb2a5200  
    5151}EXPRESSION_DELAY_BUFFER;
    5252
    53 
    54 
    5553#ifdef __cplusplus
    56 extern "C" {
     54  extern "C" {
    5755#endif
    5856
    … …  
    6260
    6361#ifdef __cplusplus
    64 }
     62  }
    6563#endif
    6664

  • SimulationRuntime/c/simulation/solver/model_help.c

    rc1aebce rb2a5200  
    218218}
    219219
     220#ifdef USE_DEBUG_OUTPUT
     221/*! \fn printAllVarsDebug
     222 *
     223 *  prints all variable values
     224 *
     225 *  \param [in]  [data]
     226 *  \param [in]  [ringSegment]
     227 */
     228void printAllVarsDebug(DATA *data, int ringSegment)
     229{
     230  long i;
     231  MODEL_DATA      *mData = &(data->modelData);
     232  SIMULATION_INFO *sInfo = &(data->simulationInfo);
     233
     234  DEBUG2(LOG_DEBUG, "Print values for buffer segment %d regarding point in time : %e", ringSegment, data->localData[ringSegment]->timeValue);
     235  INDENT(LOG_DEBUG);
     236
     237  DEBUG(LOG_DEBUG, "states variables");
     238  INDENT(LOG_DEBUG);
     239  for(i=0; i<mData->nStates; ++i)
     240  {
     241    DEBUG4(LOG_DEBUG, "%ld: %s = %g (pre: %g)", i+1, mData->realVarsData[i].info.name, data->localData[ringSegment]->realVars[i], sInfo->realVarsPre[i]);
     242  }
     243  RELEASE(LOG_DEBUG);
     244
     245  DEBUG(LOG_DEBUG, "derivatives variables");
     246  INDENT(LOG_DEBUG);
     247  for(i=mData->nStates; i<2*mData->nStates; ++i)
     248  {
     249    DEBUG4(LOG_DEBUG, "%ld: %s = %g (pre: %g)", i+1, mData->realVarsData[i].info.name, data->localData[ringSegment]->realVars[i], sInfo->realVarsPre[i]);
     250  }
     251  RELEASE(LOG_DEBUG);
     252
     253  DEBUG(LOG_DEBUG, "other real values");
     254  INDENT(LOG_DEBUG);
     255  for(i=2*mData->nStates; i<mData->nVariablesReal; ++i)
     256  {
     257    DEBUG4(LOG_DEBUG, "%ld: %s = %g (pre: %g)", i+1, mData->realVarsData[i].info.name, data->localData[ringSegment]->realVars[i], sInfo->realVarsPre[i]);
     258  }
     259  RELEASE(LOG_DEBUG);
     260
     261  DEBUG(LOG_DEBUG, "integer variables");
     262  INDENT(LOG_DEBUG);
     263  for(i=0; i<mData->nVariablesInteger; ++i)
     264  {
     265    DEBUG4(LOG_DEBUG, "%ld: %s = %ld (pre: %ld)", i+1, mData->integerVarsData[i].info.name, data->localData[ringSegment]->integerVars[i], sInfo->integerVarsPre[i]);
     266  }
     267  RELEASE(LOG_DEBUG);
     268
     269  DEBUG(LOG_DEBUG, "boolean variables");
     270  INDENT(LOG_DEBUG);
     271  for(i=0; i<mData->nVariablesBoolean; ++i)
     272  {
     273    DEBUG4(LOG_DEBUG, "%ld: %s = %s (pre: %s)", i+1, mData->booleanVarsData[i].info.name, data->localData[ringSegment]->booleanVars[i] ? "true" : "false", sInfo->booleanVarsPre[i] ? "true" : "false");
     274  }
     275  RELEASE(LOG_DEBUG);
     276
     277  DEBUG(LOG_DEBUG, "string variables");
     278  INDENT(LOG_DEBUG);
     279  for(i=0; i<mData->nVariablesString; ++i)
     280  {
     281    DEBUG4(LOG_DEBUG, "%ld: %s = %s (pre: %s)", i+1, mData->stringVarsData[i].info.name, data->localData[ringSegment]->stringVars[i], sInfo->stringVarsPre[i]);
     282  }
     283  RELEASE(LOG_DEBUG);
     284
     285  RELEASE(LOG_DEBUG);
     286}
     287#endif
     288
    220289
    221290/*! \fn printParameters
    … …  
    258327  for(i=0; i<mData->nParametersString; ++i)
    259328    INFO3(stream, "%ld: %s = %s", i+1, mData->stringParameterData[i].info.name, data->simulationInfo.stringParameter[i]);
     329  RELEASE(stream);
     330 
    260331  RELEASE(stream);
    261332}
    … …  
    351422  {
    352423    sData->realVars[i] = mData->realVarsData[i].attribute.start;
    353     INFO2(LOG_DEBUG, "Set Real var %s = %g", mData->realVarsData[i].info.name, sData->realVars[i]);
     424    DEBUG2(LOG_DEBUG, "set Real var %s = %g", mData->realVarsData[i].info.name, sData->realVars[i]);
    354425  }
    355426  for(i=0; i<mData->nVariablesInteger; ++i)
    356427  {
    357428    sData->integerVars[i] = mData->integerVarsData[i].attribute.start;
    358     INFO2(LOG_DEBUG, "Set Integer var %s = %ld", mData->integerVarsData[i].info.name, sData->integerVars[i]);
     429    DEBUG2(LOG_DEBUG, "set Integer var %s = %ld", mData->integerVarsData[i].info.name, sData->integerVars[i]);
    359430  }
    360431  for(i=0; i<mData->nVariablesBoolean; ++i)
    361432  {
    362433    sData->booleanVars[i] = mData->booleanVarsData[i].attribute.start;
    363     INFO2(LOG_DEBUG, "Set Boolean var %s = %s", mData->booleanVarsData[i].info.name, sData->booleanVars[i] ? "true" : "false");
     434    DEBUG2(LOG_DEBUG, "set Boolean var %s = %s", mData->booleanVarsData[i].info.name, sData->booleanVars[i] ? "true" : "false");
    364435  }
    365436  for(i=0; i<mData->nVariablesString; ++i)
    366437  {
    367438    sData->stringVars[i] = mData->stringVarsData[i].attribute.start;
    368     INFO2(LOG_DEBUG, "Set String var %s = %s", mData->stringVarsData[i].info.name, sData->stringVars[i]);
     439    DEBUG2(LOG_DEBUG, "set String var %s = %s", mData->stringVarsData[i].info.name, sData->stringVars[i]);
    369440  }
    370441}
    … …  
    387458  {
    388459    sInfo->realParameter[i] = mData->realParameterData[i].attribute.start;
    389     INFO2(LOG_DEBUG, "Set Real var %s = %g", mData->realParameterData[i].info.name, sInfo->realParameter[i]);
     460    DEBUG2(LOG_DEBUG, "set Real var %s = %g", mData->realParameterData[i].info.name, sInfo->realParameter[i]);
    390461  }
    391462  for(i=0; i<mData->nParametersInteger; ++i)
    392463  {
    393464    sInfo->integerParameter[i] = mData->integerParameterData[i].attribute.start;
    394     INFO2(LOG_DEBUG, "Set Integer var %s = %ld", mData->integerParameterData[i].info.name, sInfo->integerParameter[i]);
     465    DEBUG2(LOG_DEBUG, "set Integer var %s = %ld", mData->integerParameterData[i].info.name, sInfo->integerParameter[i]);
    395466  }
    396467  for(i=0; i<mData->nParametersBoolean; ++i)
    397468  {
    398469    sInfo->booleanParameter[i] = mData->booleanParameterData[i].attribute.start;
    399     INFO2(LOG_DEBUG, "Set Boolean var %s = %s", mData->booleanParameterData[i].info.name, sInfo->booleanParameter[i] ? "true" : "false");
     470    DEBUG2(LOG_DEBUG, "set Boolean var %s = %s", mData->booleanParameterData[i].info.name, sInfo->booleanParameter[i] ? "true" : "false");
    400471  }
    401472  for(i=0; i<mData->nParametersString; ++i)
    402473  {
    403474    sInfo->stringParameter[i] = mData->stringParameterData[i].attribute.start;
    404     INFO2(LOG_DEBUG, "Set String var %s = %s", mData->stringParameterData[i].info.name, sInfo->stringParameter[i]);
     475    DEBUG2(LOG_DEBUG, "set String var %s = %s", mData->stringParameterData[i].info.name, sInfo->stringParameter[i]);
    405476  }
    406477}

  • SimulationRuntime/c/simulation/solver/model_help.h

    r6f223854 rb2a5200  
    9292void copyStartValuestoInitValues(DATA *data);
    9393
     94#ifdef USE_DEBUG_OUTPUT
     95  void printAllVarsDebug(DATA *data, int ringSegment);
     96#endif
    9497void printAllVars(DATA *data, int ringSegment, int stream);
    9598void printParameters(DATA *data, int stream);

  • SimulationRuntime/c/simulation/solver/solver_main.c

    re735ef4 rb2a5200  
    411411  }
    412412
    413   if(ACTIVE_STREAM(LOG_DEBUG))
    414     printAllVars(data, 0, LOG_DEBUG);
     413#ifdef USE_DEBUG_OUTPUT
     414  printAllVarsDebug(data, 0);
     415#endif
    415416
    416417  /***** Start main simulation loop *****/
    … …  
    530531    sim_result.emit(&sim_result,data);
    531532
    532     if(ACTIVE_STREAM(LOG_DEBUG))
    533       printAllVars(data, 0, LOG_DEBUG);
     533#ifdef USE_DEBUG_OUTPUT
     534    printAllVarsDebug(data, 0);
     535#endif
    534536
    535537    /***** end of Emit this time step *****/
Note: See TracChangeset for help on using the changeset viewer.