Skip to content

Commit

Permalink
- fix for under-determined initialization problems
Browse files Browse the repository at this point in the history 
- update initialization-tests

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10944 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
@lochel
lochel committed Jan 23, 2012
1 parent d7ac567 commit e1e3e33
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 19 deletions.
33 changes: 19 additions & 14 deletions SimulationRuntime/c/math-support/initialization.c
View file
Expand Up @@ -456,16 +456,17 @@ static int reportResidualValue(DATA* data, double funcValue, double* initialResi
* \param [ref] [data]
* \param [in] [nz] number of unfixed states and unfixed parameters
* \param [in] [z] vector of unfixed states and unfixed parameters
* \param [in] [zName] variable names
* \param [in] [zNominal] vector of nominal-values for z
* \param [in] [initialResiduals]
*
* \author lochel
*/
static int nelderMeadEx_initialization(DATA *data, long nz, double *z, double *zNominal, double* initialResiduals)
static int nelderMeadEx_initialization(DATA *data, long nz, double *z, char** zName, double *zNominal, double* initialResiduals)
{
double STOPCR = 1.e-16;
double lambda_step = 0.1;
long NLOOP = 1000 * nz;
long NLOOP = 10000 * nz;

double funcValue;

Expand All @@ -490,7 +491,7 @@ static int nelderMeadEx_initialization(DATA *data, long nz, double *z, double *z

DEBUG_INFO(LOG_INIT, "starting with...");
for(i=0; i<nz; i++)
DEBUG_INFO_AL3(LOG_INIT, " z[%ld] = %g [nominal = %g]", i, z[i], zNominal[i]);
DEBUG_INFO_AL4(LOG_INIT, " z[%ld]: %s(nominal=%g) = %g", i, zName[i], zNominal[i], z[i]);
DEBUG_INFO_AL1(LOG_INIT, " funcValue = %g", funcValue);

for(l=0; l<100 && funcValue > STOPCR; l++)
Expand All @@ -510,12 +511,11 @@ static int nelderMeadEx_initialization(DATA *data, long nz, double *z, double *z

funcValue = leastSquareWithLambda(data, nz, z, zNominal, initialResidualScalingCoefficients, 1.0, initialResiduals);

DEBUG_INFO(LOG_INIT, "ending with...");
DEBUG_INFO_AL1(LOG_INIT, " iteration=%ld", iteration);
DEBUG_INFO_AL1(LOG_INIT, " lambda = %g", lambda);
DEBUG_INFO1(LOG_INIT, "ending with funcValue = %g", funcValue);
DEBUG_INFO_AL1(LOG_INIT, " iterations: %ld", iteration);
DEBUG_INFO_AL1(LOG_INIT, " lambda: %g", lambda);
for(i=0; i<nz; i++)
DEBUG_INFO_AL2(LOG_INIT, " z[%ld] = %g", i, z[i]);
DEBUG_INFO_AL1(LOG_INIT, " funcValue = %g", funcValue);
DEBUG_INFO_AL3(LOG_INIT, " z[%ld]: %s = %g", i, zName[i], z[i]);

if(funcValue < bestFuncValue)
{
Expand All @@ -532,6 +532,8 @@ static int nelderMeadEx_initialization(DATA *data, long nz, double *z, double *z
free(initialResidualScalingCoefficients);
free(bestZ);

DEBUG_INFO_AL1(LOG_INIT, " optimization-calls: %ld", l);

/* up-scale */
for(i=0; i<nz; i++)
z[i] *= zNominal[i];
Expand Down Expand Up @@ -691,38 +693,41 @@ static int initialize(DATA *data, int optiMethod)
initData->z[i] -= h;
}

for(j=0; j < initData->nz-data->modelData.nInitEquations; ++j)
for(j=0; j < data->modelData.nInitEquations; ++j)
{
k = 0;
for(i=1; i<initData->nz; ++i)
if(z_f[i] > z_f[k])
k = i;

z_f[k] = -1.0;
}

k = 0;
DEBUG_INFO(LOG_INIT, "setting fixed=true for:");
for(i=0; i<data->modelData.nStates; ++i)
{
if(data->modelData.realVarsData[i].attribute.fixed == 0)
{
if(z_f[k] != -1.0)
if(z_f[k] >= 0.0)
{
data->modelData.realVarsData[i].attribute.fixed = 1;
DEBUG_INFO1(LOG_INIT, " %s", initData->zName[k]);
DEBUG_INFO2(LOG_INIT, " %s(fixed=true) = %g", initData->zName[k], initData->z[k]);
}
k++;
}
}
for(i=0; i<data->modelData.nParametersReal; ++i)
{
if(data->modelData.realParameterData[i].attribute.fixed == 0)
{
if(z_f[k] >= 0.0)
{
data->modelData.realParameterData[i].attribute.fixed = 1;
DEBUG_INFO1(LOG_INIT, " %s", initData->zName[k]);
DEBUG_INFO2(LOG_INIT, " %s(fixed=true) = %g", initData->zName[k], initData->z[k]);
}
k++;
}
}

free(z_f);

Expand All @@ -746,7 +751,7 @@ static int initialize(DATA *data, int optiMethod)
DEBUG_INFO_AL2(LOG_INIT, " [%ld] %s", i, initData->zName[i]);

if(optiMethod == IOM_NELDER_MEAD_EX)
retVal = nelderMeadEx_initialization(data, initData->nz, initData->z, initData->zNominal, initialResiduals);
retVal = nelderMeadEx_initialization(data, initData->nz, initData->z, initData->zName, initData->zNominal, initialResiduals);
else
{
WARNING1("unrecognized option -iom %s", optiMethodStr[optiMethod]);
Expand Down
10 changes: 5 additions & 5 deletions SimulationRuntime/c/util/varinfo.c
View file
Expand Up @@ -38,19 +38,19 @@ void printErrorEqSyst(equationSystemError err, struct EQUATION_INFO eq, double v
{
switch (err) {
case ERROR_AT_TIME:
WARNING2("Error solving nonlinear system %s at time %g\n", eq.name, var);
WARNING2("Error solving nonlinear system %s at time %g", eq.name, var);
break;
case NO_PROGRESS_START_POINT:
WARNING2("Solving nonlinear system %s: iteration not making progress, trying with different starting points (+%g)\n", eq.name, var);
WARNING2("Solving nonlinear system %s: iteration not making progress, trying with different starting points (+%g)", eq.name, var);
break;
case NO_PROGRESS_FACTOR:
WARNING2("Solving nonlinear system %s: iteration not making progress, trying to decrease factor to %g\n", eq.name, var);
WARNING2("Solving nonlinear system %s: iteration not making progress, trying to decrease factor to %g", eq.name, var);
break;
case IMPROPER_INPUT:
WARNING2("improper input parameters to nonlinear eq. syst: %s at time %g\n", eq.name, var);
WARNING2("improper input parameters to nonlinear eq. syst: %s at time %g", eq.name, var);
break;
default:
WARNING3("Unknown equation system error: %d %s %g\n", err, eq.name, var);
WARNING3("Unknown equation system error: %d %s %g", err, eq.name, var);
break;
}
}
Expand Down

0 comments on commit e1e3e33

Please sign in to comment.