Skip to content

Commit

Permalink
- continue using new simulation_data struct in initialization
Browse files Browse the repository at this point in the history 
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10487 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
@lochel
lochel committed Nov 13, 2011
1 parent 4842db0 commit 735368b
Show file tree
Hide file tree
Showing 7 changed files with 220 additions and 35 deletions.
5 changes: 5 additions & 0 deletions SimulationRuntime/c/math-support/events.c
View file
Expand Up @@ -1081,6 +1081,11 @@ SaveZeroCrossings()
function_onlyZeroCrossings(gout, &globalData->timeValue);
}

void SaveZeroCrossingsX(_X_DATA *data)
{
THROW("SaveZeroCrossingsX is not implemented yet!");
}

void
SaveZeroCrossingsAfterEvent()
{
Expand Down
2 changes: 2 additions & 0 deletions SimulationRuntime/c/math-support/events.h
View file
Expand Up @@ -35,6 +35,7 @@
#ifndef _EVENTS_H_
#define _EVENTS_H_

#include "simulation_data.h"
#include "list.h"

#ifdef __cplusplus
Expand Down Expand Up @@ -97,6 +98,7 @@ extern "C" {
void FindRoot(double*);
int checkForDiscreteChanges();
void SaveZeroCrossings();
void SaveZeroCrossingsX(_X_DATA *data);
void SaveZeroCrossingsAfterEvent();
void initializeZeroCrossings();
void correctDirectionZeroCrossings();
Expand Down
217 changes: 186 additions & 31 deletions SimulationRuntime/c/math-support/initialization.c
View file
Expand Up @@ -28,7 +28,7 @@
*
*/

/*! \file simulation_init.c
/*! \file initialization.c
*/

#include "initialization.h"
Expand Down Expand Up @@ -127,7 +127,7 @@ void leastSquare(long *nz, double *z, double *funcValue)
for(j=0; i<globalData->nInitialResiduals; j++)
*funcValue += globalData->initialResiduals[j] * globalData->initialResiduals[j];

DEBUG_INFO1(LV_INIT, "info | leastSquare | leastSquare-Value: %g", *funcValue);
DEBUG_INFO1(LV_INIT, "leastSquare | leastSquare-Value: %g", *funcValue);
}

/*! \fn double leastSquareWithLambda(long nz, double *z, double lambda)
Expand Down Expand Up @@ -243,7 +243,7 @@ void NelderMeadOptimization(long N,

/* dump every dump-th step */
if(dump && !(iteration % dump))
INFO3("info | NelderMeadOptimization | lambda=%g / step=%d / f=%g", lambda, (int)iteration, leastSquare(N, simplex, scale, lambda));
INFO3("NelderMeadOptimization | lambda=%g / step=%d / f=%g", lambda, (int)iteration, leastSquare(N, simplex, scale, lambda));

/* func-values for the simplex */
for(x=0; x<N+1; x++)
Expand All @@ -262,8 +262,8 @@ void NelderMeadOptimization(long N,
lambda += lambda_step;
if(lambda > 1.0)
lambda = 1.0;

DEBUG_INFO3(LV_INIT, "info | NelderMeadOptimization | increasing lambda to %g in step %d at f=%g", lambda, (int)iteration, leastSquare(N, simplex, scale, lambda));
DEBUG_INFO3(LV_INIT, "NelderMeadOptimization | increasing lambda to %g in step %d at f=%g", lambda, (int)iteration, leastSquare(N, simplex, scale, lambda));
continue;
}

Expand Down Expand Up @@ -581,7 +581,7 @@ int nelderMeadEx_initialization(long nz, double *z, double *scale)

if(lambda < 1.0)
{
DEBUG_INFO1(LV_INIT, "error | nelderMeadEx_initialization | lambda = %g", lambda);
DEBUG_INFO1(LV_INIT, "nelderMeadEx_initialization | lambda = %g", lambda);
return -1;
}

Expand Down Expand Up @@ -867,13 +867,167 @@ int initialization(const char* pInitMethod, const char* pOptiMethod)

/* use of new simulation_data struct _X_DATA */
#include "simulation_data.h"
#include "modelica_string.h"

/* done */
/*! \fn void storeStartValues(_X_DATA *data)
*
* sets all values to their start-attribute
*
* author: lochel
*/
void storeStartValues(_X_DATA *data)
{
SIMULATION_DATA *sData = (SIMULATION_DATA*)getRingData(data->simulationData, 0);
MODEL_DATA *mData = &(data->modelData);
long i;

for(i=0; i<mData->nVariablesReal; ++i)
sData->realVars[i] = mData->realData[i].attribute.start;
for(i=0; i<mData->nVariablesInteger; ++i)
sData->integerVars[i] = mData->integerData[i].attribute.start;
for(i=0; i<mData->nVariablesBoolean; ++i)
sData->booleanVars[i] = mData->booleanData[i].attribute.start;
for(i=0; i<mData->nVariablesString; ++i)
{
free_modelica_string(sData->stringVars[i]);
sData->stringVars[i] = copy_modelica_string(mData->stringData[i].attribute.start);
}
}

/* done */
/*! \fn void storePreValues(_X_DATA *data)
*
* copys all the values into their pre-values
*
* author: lochel
*/
void storePreValues(_X_DATA *data)
{
SIMULATION_DATA *sData = (SIMULATION_DATA*)getRingData(data->simulationData, 0);
MODEL_DATA *mData = &(data->modelData);

memcpy(sData->realVarsPre, sData->realVars, sizeof(modelica_real)*mData->nVariablesReal);
memcpy(sData->integerVarsPre, sData->integerVars, sizeof(modelica_integer)*mData->nVariablesInteger);
memcpy(sData->booleanVarsPre, sData->booleanVars, sizeof(modelica_boolean)*mData->nVariablesBoolean);
memcpy(sData->stringVarsPre, sData->stringVars, sizeof(modelica_string)*mData->nVariablesString);
}

/*! \fn int initializeX(_X_DATA *data, int optiMethod)
*
* author: lochel
*/
int initializeX(_X_DATA *data, int optiMethod)
{
long nz = 0;
int ind = 0, indAct = 0, indz = 0;
int retVal = 0;
int startIndPar = 0;
int endIndPar = 0;
double *z = 0;
double *scale = 0;
fortran_integer i = 0;

THROW("needs to be updated");

for(ind=0, nz=0; ind<globalData->nStates; ind++)
{
if(globalData->initFixed[ind]==0)
{
DEBUG_INFO1(LV_INIT, "state %s is unfixed", globalData->statesNames[ind].name);
nz++;
}
}

startIndPar = 2*globalData->nStates+globalData->nAlgebraic+globalData->intVariables.nAlgebraic+globalData->boolVariables.nAlgebraic;
endIndPar = startIndPar+globalData->nParameters;
for(ind = startIndPar; ind < endIndPar; ind++)
{
if(globalData->initFixed[ind]==0 && globalData->var_attr[ind-globalData->nStates]==1)
{
DEBUG_INFO1(LV_INIT, "parameter %s is unfixed", globalData->parametersNames[ind-startIndPar].name);
nz++;
}
}

if(DEBUG_FLAG(LV_INIT))
{
INFO1("initialize | initialization by method: %s", optiMethodStr[optiMethod]);
INFO_AL(" fixed attribute for states:");
for(i=0;i<globalData->nStates; i++)
INFO_AL2(" %s(fixed=%s)", globalData->statesNames[i].name, (globalData->initFixed[i] ? "true" : "false"));
INFO_AL1(" number of non-fixed variables: %d", (int)nz);
}

/* No initial values to calculate. */
if(nz == 0)
{
DEBUG_INFO(LV_INIT, "no initial values to calculate");
return 0;
}

z = (double*)calloc(nz, sizeof(double));
scale = (double*)calloc(nz, sizeof(double));
ASSERT(z, "out of memory");
ASSERT(scale, "out of memory");

/* Fill z with the non-fixed variables from x and p */
for(ind=0, indAct=0, indz=0; ind<globalData->nStates; ind++)
{
if(globalData->initFixed[indAct++] == 0)
{
scale[indz] = hasNominalValue[ind] ? fabs(nominalValue[ind]) : 1;
z[indz++] = globalData->states[ind];
}
}

/* for real parameters */
for(ind=0, indAct=startIndPar; ind<globalData->nParameters; ind++)
{
if(globalData->initFixed[indAct++]==0 && globalData->var_attr[indAct-globalData->nStates]==1)
{
scale[indz] = hasNominalValue[globalData->nStates+globalData->nAlgebraic+ind] ? fabs(nominalValue[globalData->nStates+globalData->nAlgebraic+ind]) : 1;
z[indz++] = globalData->parameters[ind];
}
}

if(optiMethod == IOM_SIMPLEX)
{
retVal = simplex_initialization(nz, z);
}
else if(optiMethod == IOM_NELDER_MEAD_EX)
{
retVal = nelderMeadEx_initialization(nz, z, scale);
}
else if(optiMethod == IOM_NEWUOA)
{
retVal = newuoa_initialization(nz, z);
}
else
{
WARNING1("unrecognized option -iom %s", optiMethodStr[optiMethod]);
WARNING_AL("current options are: simplex, nelder_mead_ex or newuoa");
retVal= -1;
}

free(z);
free(scale);
return retVal;
}

/*! \fn int old_initializationX(_X_DATA *data, int optiMethod)
*
* author: lochel
*/
int old_initializationX(_X_DATA *data, int optiMethod)
{
int retVal = 0;

/* call initialize function and save start values */
saveall(); /* if initial_function() uses pre-values */
storeStartValues(data);
storePreValues(data); /* if initial_function() uses pre-values */
initial_function(); /* set all start-Values */
THROW("needs to be updated");
storeExtrapolationDataEvent();
saveall(); /* to provide all valid pre-values */

Expand Down Expand Up @@ -923,63 +1077,64 @@ int old_initializationX(_X_DATA *data, int optiMethod)
return retVal;
}

void storePreValues(_X_DATA *data)
{
SIMULATION_DATA *sData = (SIMULATION_DATA*)getRingData(data->simulationData, 0);
MODEL_DATA *mData = &(data->modelData);

memcpy(sData->realVarsPre, sData->realVars, sizeof(modelica_real)*mData->nVariablesReal);
memcpy(sData->integerVarsPre, sData->integerVars, sizeof(modelica_real)*mData->nVariablesInteger);
memcpy(sData->booleanVarsPre, sData->booleanVars, sizeof(modelica_real)*mData->nVariablesBoolean);
memcpy(sData->stringVarsPre, sData->stringVars, sizeof(modelica_real)*mData->nVariablesString);
}

/*! \fn int state_initializationX(_X_DATA *data, int optiMethod)
*
* author: lochel
*/
int state_initializationX(_X_DATA *data, int optiMethod)
{
int retVal = 0;

/* call initialize function and save start values */
saveall(); /* if initial_function() uses pre-values */
storeStartValues(data);
storePreValues(data); /* if initial_function() uses pre-values */
initial_function(); /* set all start-Values */
storeExtrapolationDataEvent();
saveall(); /* to provide all valid pre-values */
THROW("needs to be updated");
storePreValues(data); /* to provide all valid pre-values */
overwriteOldSimulationData(data);

/* Initialize all relations that are ZeroCrossings */
update_DAEsystem();
THROW("update_DAEsystem() needs to be updated");

/* And restore start values and helpvars */
restoreExtrapolationDataOld();
restoreHelpVars();
saveall();
/* restoreHelpVars(); /* ??? */
storePreValues(data);

/* start with the real initialization */
globalData->init = 1; /* to evaluate when-equations with initial()-conditions */

retVal = initialize(IOM_NELDER_MEAD_EX);
retVal = initializeX(data, IOM_NELDER_MEAD_EX);

saveall(); /* save pre-values */
storeExtrapolationDataEvent(); /* if there are non-linear equations */
storePreValues(data); /* save pre-values */
overwriteOldSimulationData(data); /* if there are non-linear equations */

update_DAEsystem(); /* evaluate discrete variables */
THROW("update_DAEsystem() needs to be updated");

/* valid system for the first time! */

SaveZeroCrossings();
saveall();
storeExtrapolationDataEvent();
SaveZeroCrossingsX(data);
storePreValues(data); /* save pre-values */
overwriteOldSimulationData(data); /* if there are non-linear equations */

globalData->init = 0;

/* fall-back case */
if(retVal)
{
DEBUG_INFO(LV_INIT, "state_initialization | init. failed! use old initialization method");
return old_initialization(optiMethod);
return old_initializationX(data, optiMethod);
}

return retVal;
}

/* done */
/*! \fn int initializationX(_X_DATA *data, const char* pInitMethod, const char* pOptiMethod)
*
* author: lochel
*/
int initializationX(_X_DATA *data, const char* pInitMethod, const char* pOptiMethod)
{
int initMethod = IIM_STATE; /* default method */
Expand Down
7 changes: 5 additions & 2 deletions SimulationRuntime/c/math-support/ringbuffer.c
View file
Expand Up @@ -73,8 +73,9 @@ void freeRingBuffer(RINGBUFFER *rb)

void *getRingData(RINGBUFFER *rb, int i)
{
ASSERT3(i < rb->nElements, "index [%d] out of range [%d:%d]", i, (-rb->nElements+1), (rb->nElements-1));
ASSERT3(-rb->nElements < i, "index [%d] out of range [%d:%d]", i, 0, (-rb->nElements+1));
ASSERT(rb->nElements > 0, "empty RingBuffer");
ASSERT3(i < rb->nElements, "index [%d] out of range [%d:%d]", i, -rb->nElements+1, rb->nElements-1);
ASSERT3(-rb->nElements < i, "index [%d] out of range [%d:%d]", i, -rb->nElements+1, rb->nElements-1);
return ((char*)rb->buffer)+(((rb->firstElement+i)%rb->bufferSize)*rb->itemSize);
}

Expand Down Expand Up @@ -105,6 +106,7 @@ void appendRingData(RINGBUFFER *rb, void *value)

void dequeueNFirstRingDatas(RINGBUFFER *rb, int n)
{
ASSERT(rb->nElements > 0, "empty RingBuffer");
ASSERT3(n < rb->nElements, "index [%d] out of range [%d:%d]", n, 0, rb->nElements-1);
ASSERT3(0 <= n, "index [%d] out of range [%d:%d]", n, 0, rb->nElements-1);

Expand All @@ -119,6 +121,7 @@ int ringBufferLength(RINGBUFFER *rb)

void rotateRingBuffer(RINGBUFFER *rb, int n)
{
ASSERT(rb->nElements > 0, "empty RingBuffer");
ASSERT3(n < rb->nElements, "index [%d] out of range [%d:%d]", n, 0, rb->nElements-1);
ASSERT3(0 <= n, "index [%d] out of range [%d:%d]", n, 0, rb->nElements-1);
rb->firstElement = (rb->firstElement+n)%rb->bufferSize;
Expand Down

0 comments on commit 735368b

Please sign in to comment.