Skip to content

Commit

Permalink
New log flags LOG_INIT_V and LOG_INIT_HOMOTOPY
Browse files Browse the repository at this point in the history 
Make the LOG_INIT log less verbose by moving informations to more
verbose flags
LOG_INIT_V. LOG_SOTI is not a subset of LOG_INIT any more but of
LOG_INIT_V.
Create new flag LOG_INIT_HOMOTOPY to dump only homotopy initialization
infos.

Updated testsuite to use LOG_INIT_V whenever values of initialization
are tested.
  • Loading branch information
@AnHeuermann @lochel
AnHeuermann authored and lochel committed Jan 13, 2020
1 parent 3bc99d0 commit 6421631
Show file tree
Hide file tree
Showing 17 changed files with 740 additions and 725 deletions.
8 changes: 4 additions & 4 deletions OMCompiler/Compiler/Template/CodegenC.tpl
View file
Expand Up @@ -3007,7 +3007,7 @@ template functionUpdateBoundVariableAttributes(SimCode simCode, list<SimEqSystem
<%minValueEquations |> SES_SIMPLE_ASSIGN(__) =>
<<
<%crefAttributes(cref)%>.min = <%cref(cref)%>;
infoStreamPrint(LOG_INIT, 0, "%s(min=<%crefToPrintfArg(cref)%>)", <%crefVarInfo(cref)%>.name, (<%crefType(cref)%>) <%crefAttributes(cref)%>.min);
infoStreamPrint(LOG_INIT_V, 0, "%s(min=<%crefToPrintfArg(cref)%>)", <%crefVarInfo(cref)%>.name, (<%crefType(cref)%>) <%crefAttributes(cref)%>.min);
<%cref(cref)%> = <%crefAttributes(cref)%>.start;
>>
;separator="\n"
Expand All @@ -3021,7 +3021,7 @@ template functionUpdateBoundVariableAttributes(SimCode simCode, list<SimEqSystem
<%maxValueEquations |> SES_SIMPLE_ASSIGN(__) =>
<<
<%crefAttributes(cref)%>.max = <%cref(cref)%>;
infoStreamPrint(LOG_INIT, 0, "%s(max=<%crefToPrintfArg(cref)%>)", <%crefVarInfo(cref)%>.name, (<%crefType(cref)%>) <%crefAttributes(cref)%>.max);
infoStreamPrint(LOG_INIT_V, 0, "%s(max=<%crefToPrintfArg(cref)%>)", <%crefVarInfo(cref)%>.name, (<%crefType(cref)%>) <%crefAttributes(cref)%>.max);
<%cref(cref)%> = <%crefAttributes(cref)%>.start;
>>
;separator="\n"
Expand All @@ -3035,7 +3035,7 @@ template functionUpdateBoundVariableAttributes(SimCode simCode, list<SimEqSystem
<%nominalValueEquations |> SES_SIMPLE_ASSIGN(__) =>
<<
<%crefAttributes(cref)%>.nominal = <%cref(cref)%>;
infoStreamPrint(LOG_INIT, 0, "%s(nominal=<%crefToPrintfArg(cref)%>)", <%crefVarInfo(cref)%>.name, (<%crefType(cref)%>) <%crefAttributes(cref)%>.nominal);
infoStreamPrint(LOG_INIT_V, 0, "%s(nominal=<%crefToPrintfArg(cref)%>)", <%crefVarInfo(cref)%>.name, (<%crefType(cref)%>) <%crefAttributes(cref)%>.nominal);
<%cref(cref)%> = <%crefAttributes(cref)%>.start;
>>
;separator="\n"
Expand Down Expand Up @@ -5493,7 +5493,7 @@ case SES_SIMPLE_ASSIGN_CONSTRAINTS(__) then
let postExp = if isStartCref(cref) then
<<
<%cref(popCref(cref))%> = <%cref(cref)%>;
infoStreamPrint(LOG_INIT, 0, "updated start value: %s(start=<%crefToPrintfArg(popCref(cref))%>)", <%crefVarInfo(popCref(cref))%>.name, (<%crefType(popCref(cref))%>) <%cref(popCref(cref))%>);
infoStreamPrint(LOG_INIT_V, 0, "updated start value: %s(start=<%crefToPrintfArg(popCref(cref))%>)", <%crefVarInfo(popCref(cref))%>.name, (<%crefType(popCref(cref))%>) <%cref(popCref(cref))%>);
>>
<<
<%modelicaLine(eqInfo(eq))%>
Expand Down
11 changes: 9 additions & 2 deletions OMCompiler/SimulationRuntime/c/simulation/simulation_runtime.cpp
View file
Expand Up @@ -187,9 +187,16 @@ void setGlobalVerboseLevel(int argc, char**argv)
}while(pos != string::npos);
}

/* print LOG_SOTI if LOG_INIT is enabled */
if(useStream[LOG_INIT])
/* print LOG_INIT and LOG_SOTI if LOG_INIT_V is active */
if(useStream[LOG_INIT_V] == 1)
{
useStream[LOG_INIT] = 1;
useStream[LOG_SOTI] = 1;
}

/* print LOG_INIT_HOMOTOPY if LOG_INIT is active */
if(useStream[LOG_INIT] == 1)
useStream[LOG_INIT_HOMOTOPY] = 1;

/* print LOG_STATS if LOG_SOLVER if active */
if(useStream[LOG_SOLVER_V] == 1)
Expand Down
52 changes: 27 additions & 25 deletions OMCompiler/SimulationRuntime/c/simulation/solver/initialization/initialization.c
View file
Expand Up @@ -89,8 +89,8 @@ void dumpInitialSolution(DATA *simData)
const MODEL_DATA *mData = simData->modelData;
const SIMULATION_INFO *sInfo = simData->simulationInfo;

if (ACTIVE_STREAM(LOG_INIT))
printParameters(simData, LOG_INIT);
if (ACTIVE_STREAM(LOG_INIT_V))
printParameters(simData, LOG_INIT_V);

if (!ACTIVE_STREAM(LOG_SOTI)) return;
infoStreamPrint(LOG_SOTI, 1, "### SOLUTION OF THE INITIALIZATION ###");
Expand Down Expand Up @@ -207,8 +207,8 @@ static int symbolic_initialization(DATA *data, threadData_t *threadData)
if ( (data->callback->useHomotopy == 1 && omc_flag[FLAG_HOMOTOPY_ON_FIRST_TRY] != 1) && omc_flag[FLAG_NO_HOMOTOPY_ON_FIRST_TRY] !=1 ) {
omc_flag[FLAG_HOMOTOPY_ON_FIRST_TRY] = 1;
init_lambda_steps = 2;
infoStreamPrint(LOG_INIT, 0, "Model contains homotopy operator: Use adaptive homotopy method to solve initialization problem. "
"To disable initialization with homotpy operator use \"-noHomotopyOnFirstTry\".");
infoStreamPrint(LOG_INIT_HOMOTOPY, 0, "Model contains homotopy operator: Use adaptive homotopy method to solve initialization problem. "
"To disable initialization with homotpy operator use \"-noHomotopyOnFirstTry\".");
}

adaptiveGlobal = data->callback->useHomotopy == 2; /* new global homotopy approach (adaptive lambda) */
Expand Down Expand Up @@ -241,12 +241,12 @@ static int symbolic_initialization(DATA *data, threadData_t *threadData)
MMC_TRY_INTERNAL(simulationJumpBuffer)
#endif
if (adaptiveGlobal && kinsol) {
infoStreamPrint(LOG_INIT, 0, "Automatically set -homotopyOnFirstTry, because trying without homotopy first is not supported for the adaptive global approach in combination with KINSOL.");
infoStreamPrint(LOG_INIT_HOMOTOPY, 0, "Automatically set -homotopyOnFirstTry, because trying without homotopy first is not supported for the adaptive global approach in combination with KINSOL.");
} else {
if (adaptiveGlobal)
data->callback->useHomotopy = 1; /* global homotopy (equidistant lambda) */
data->simulationInfo->lambda = 1.0;
infoStreamPrint(LOG_INIT, 0, "Try to solve the initialization problem without homotopy first.");
infoStreamPrint(LOG_INIT_HOMOTOPY, 0, "Try to solve the initialization problem without homotopy first.");
data->callback->functionInitialEquations(data, threadData);
solveWithGlobalHomotopy = 0;
}
Expand Down Expand Up @@ -277,14 +277,14 @@ static int symbolic_initialization(DATA *data, threadData_t *threadData)
char buffer[4096];
double lambda;

infoStreamPrint(LOG_INIT, 0, "Global homotopy with equidistant step size started.");
infoStreamPrint(LOG_INIT_HOMOTOPY, 0, "Global homotopy with equidistant step size started.");

#if !defined(OMC_NO_FILESYSTEM)
const char sep[] = ",";
if(ACTIVE_STREAM(LOG_INIT))
if(ACTIVE_STREAM(LOG_INIT_HOMOTOPY))
{
sprintf(buffer, "%s_equidistant_global_homotopy.csv", mData->modelFilePrefix);
infoStreamPrint(LOG_INIT, 0, "The homotopy path will be exported to %s.", buffer);
infoStreamPrint(LOG_INIT_HOMOTOPY, 0, "The homotopy path will be exported to %s.", buffer);
pFile = omc_fopen(buffer, "wt");
fprintf(pFile, "\"lambda\"");
for(i=0; i<mData->nVariablesReal; ++i) {
Expand All @@ -294,12 +294,12 @@ static int symbolic_initialization(DATA *data, threadData_t *threadData)
}
#endif

infoStreamPrint(LOG_INIT, 1, "homotopy process\n---------------------------");
infoStreamPrint(LOG_INIT_HOMOTOPY, 1, "homotopy process\n---------------------------");
for(step=0; step<init_lambda_steps; ++step)
{
data->simulationInfo->lambda = ((double)step)/(init_lambda_steps-1);
lambda = data->simulationInfo->lambda;
infoStreamPrint(LOG_INIT, 0, "homotopy parameter lambda = %g", lambda);
infoStreamPrint(LOG_INIT_HOMOTOPY, 0, "homotopy parameter lambda = %g", lambda);

if(data->simulationInfo->lambda > 1.0)
{
Expand All @@ -312,23 +312,25 @@ static int symbolic_initialization(DATA *data, threadData_t *threadData)
else
data->callback->functionInitialEquations(data, threadData);

infoStreamPrint(LOG_INIT, 0, "homotopy parameter lambda = %g done\n---------------------------", lambda);
infoStreamPrint(LOG_INIT_HOMOTOPY, 0, "homotopy parameter lambda = %g done\n---------------------------", lambda);

#if !defined(OMC_NO_FILESYSTEM)
if(ACTIVE_STREAM(LOG_INIT))
if(ACTIVE_STREAM(LOG_INIT_HOMOTOPY))
{
fprintf(pFile, "%.16g", lambda);
for(i=0; i<mData->nVariablesReal; ++i)
{
fprintf(pFile, "%s%.16g", sep, data->localData[0]->realVars[i]);
}
fprintf(pFile, "\n");
}
#endif
}
data->simulationInfo->homotopySteps += init_lambda_steps;
messageClose(LOG_INIT);
messageClose(LOG_INIT_HOMOTOPY);

#if !defined(OMC_NO_FILESYSTEM)
if(ACTIVE_STREAM(LOG_INIT))
if(ACTIVE_STREAM(LOG_INIT_HOMOTOPY))
fclose(pFile);
#endif
}
Expand All @@ -338,19 +340,19 @@ static int symbolic_initialization(DATA *data, threadData_t *threadData)
use ADAPTIVE GLOBAL HOMOTOPY APPROACH. */
if (adaptiveGlobal && solveWithGlobalHomotopy)
{
infoStreamPrint(LOG_INIT, 0, "Global homotopy with adaptive step size started.");
infoStreamPrint(LOG_INIT, 1, "homotopy process\n---------------------------");
infoStreamPrint(LOG_INIT_HOMOTOPY, 0, "Global homotopy with adaptive step size started.");
infoStreamPrint(LOG_INIT_HOMOTOPY, 1, "homotopy process\n---------------------------");

// Solve lambda0-DAE
data->simulationInfo->lambda = 0;
infoStreamPrint(LOG_INIT, 0, "solve simplified lambda0-DAE");
infoStreamPrint(LOG_INIT_HOMOTOPY, 0, "solve simplified lambda0-DAE");
data->callback->functionInitialEquations_lambda0(data, threadData);
infoStreamPrint(LOG_INIT, 0, "solving simplified lambda0-DAE done\n---------------------------");
infoStreamPrint(LOG_INIT_HOMOTOPY, 0, "solving simplified lambda0-DAE done\n---------------------------");

// Run along the homotopy path and solve the actual system
data->callback->functionInitialEquations(data, threadData);

messageClose(LOG_INIT);
messageClose(LOG_INIT_HOMOTOPY);
}

storeRelations(data);
Expand Down Expand Up @@ -469,7 +471,7 @@ int importStartValues(DATA *data, threadData_t *threadData, const char *pInitFil
}
if(pVar) {
omc_matlab4_val(&(mData->realVarsData[i].attribute.start), &reader, pVar, initTime);
infoStreamPrint(LOG_INIT, 0, "| %s(start=%g)", mData->realVarsData[i].info.name, mData->realVarsData[i].attribute.start);
infoStreamPrint(LOG_INIT_V, 0, "| %s(start=%g)", mData->realVarsData[i].info.name, mData->realVarsData[i].attribute.start);
} else if((strlen(mData->realVarsData[i].info.name) > 0) &&
(mData->realVarsData[i].info.name[0] != '$') &&
(strncmp(mData->realVarsData[i].info.name, "der($", 5) != 0)) {
Expand All @@ -491,7 +493,7 @@ int importStartValues(DATA *data, threadData_t *threadData, const char *pInitFil
if(pVar) {
omc_matlab4_val(&(mData->realParameterData[i].attribute.start), &reader, pVar, initTime);
data->simulationInfo->realParameter[i] = mData->realParameterData[i].attribute.start;
infoStreamPrint(LOG_INIT, 0, "| %s(start=%g)", mData->realParameterData[i].info.name, mData->realParameterData[i].attribute.start);
infoStreamPrint(LOG_INIT_V, 0, "| %s(start=%g)", mData->realParameterData[i].info.name, mData->realParameterData[i].attribute.start);
} else {
warningStreamPrint(LOG_INIT, 0, "unable to import real parameter %s from given file", mData->realParameterData[i].info.name);
}
Expand All @@ -509,7 +511,7 @@ int importStartValues(DATA *data, threadData_t *threadData, const char *pInitFil

if(pVar) {
omc_matlab4_val(&(mData->realParameterData[i].attribute.start), &reader, pVar, initTime);
infoStreamPrint(LOG_INIT, 0, "| %s(start=%g)", mData->realParameterData[i].info.name, mData->realParameterData[i].attribute.start);
infoStreamPrint(LOG_INIT_V, 0, "| %s(start=%g)", mData->realParameterData[i].info.name, mData->realParameterData[i].attribute.start);
} else {
warningStreamPrint(LOG_INIT, 0, "unable to import real parameter %s from given file", mData->realParameterData[i].info.name);
}
Expand All @@ -530,7 +532,7 @@ int importStartValues(DATA *data, threadData_t *threadData, const char *pInitFil
omc_matlab4_val(&value, &reader, pVar, initTime);
mData->integerParameterData[i].attribute.start = (modelica_integer)value;
data->simulationInfo->integerParameter[i] = (modelica_integer)value;
infoStreamPrint(LOG_INIT, 0, "| %s(start=%ld)", mData->integerParameterData[i].info.name, mData->integerParameterData[i].attribute.start);
infoStreamPrint(LOG_INIT_V, 0, "| %s(start=%ld)", mData->integerParameterData[i].info.name, mData->integerParameterData[i].attribute.start);
} else {
warningStreamPrint(LOG_INIT, 0, "unable to import integer parameter %s from given file", mData->integerParameterData[i].info.name);
}
Expand All @@ -550,7 +552,7 @@ int importStartValues(DATA *data, threadData_t *threadData, const char *pInitFil
omc_matlab4_val(&value, &reader, pVar, initTime);
mData->booleanParameterData[i].attribute.start = (modelica_boolean)value;
data->simulationInfo->booleanParameter[i] = (modelica_boolean)value;
infoStreamPrint(LOG_INIT, 0, "| %s(start=%s)", mData->booleanParameterData[i].info.name, mData->booleanParameterData[i].attribute.start ? "true" : "false");
infoStreamPrint(LOG_INIT_V, 0, "| %s(start=%s)", mData->booleanParameterData[i].info.name, mData->booleanParameterData[i].attribute.start ? "true" : "false");
} else {
warningStreamPrint(LOG_INIT, 0, "unable to import boolean parameter %s from given file", mData->booleanParameterData[i].info.name);
}
Expand Down

0 comments on commit 6421631

Please sign in to comment.