Skip to content

Commit

Permalink
[newSimulationRuntime]
Browse files Browse the repository at this point in the history 
	- fixed csv output
  - fixed lookup in ringbuffer
	- fixed solver(euler,rungekutta)



git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10536 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
Willi Braun committed Nov 17, 2011
1 parent 7ecc74d commit eea2f4e
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 35 deletions.
1 change: 1 addition & 0 deletions SimulationRuntime/c/math-support/initialization.c
View file
Expand Up @@ -1197,6 +1197,7 @@ int copyStartValuestoInitValues(_X_DATA *data, int optiMethod)
storeStartValues(data);
storePreValues(data);
storeStartValuesParam(data);
overwriteOldSimulationData(data);

return retVal;
}
Expand Down
6 changes: 4 additions & 2 deletions SimulationRuntime/c/math-support/ringbuffer.c
View file
Expand Up @@ -126,12 +126,14 @@ void rotateRingBuffer(RINGBUFFER *rb, int n, void **lookup)
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;

if(lookup)
{
for(i=0; i<rb->nElements; ++i)
lookup[i] = getRingData(rb, i);
for(i=0; i<rb->nElements; ++i){
lookup[i] = getRingData(rb, (rb->firstElement+i)%rb->bufferSize);
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion SimulationRuntime/c/simulation/results/simulation_result_csv.cpp
View file
Expand Up @@ -57,7 +57,7 @@ void simulation_result_csv::emit(_X_DATA *data)
const char* formatbool = "%i,";
const char* formatstring = "\"%s\",";
rt_tick(SIM_TIMER_OUTPUT);
fprintf(fout, format, globalData->timeValue);
fprintf(fout, format, data->localData[0]->time);

for (int i = 0; i < data->modelData.nVariablesReal; i++) if (!data->modelData.realData[i].filterOutput)
fprintf(fout, format, (data->localData[0])->realVars[i]);
Expand Down
8 changes: 6 additions & 2 deletions SimulationRuntime/c/simulation/simulation_runtime.cpp
View file
Expand Up @@ -385,8 +385,12 @@ void overwriteOldSimulationData(_X_DATA *data)
{
long i;

for(i=1; i<ringBufferLength(data->simulationData); ++i)
memcpy(getRingData(data->simulationData, 0), getRingData(data->simulationData, 1), sizeof(SIMULATION_DATA));
for(i=1; i<ringBufferLength(data->simulationData); ++i){
memcpy(data->localData[i]->realVars, data->localData[i-1]->realVars, sizeof(modelica_real)*data->modelData.nVariablesReal);
memcpy(data->localData[i]->integerVars, data->localData[i-1]->integerVars, sizeof(modelica_integer)*data->modelData.nVariablesInteger);
memcpy(data->localData[i]->booleanVars, data->localData[i-1]->booleanVars, sizeof(modelica_boolean)*data->modelData.nVariablesBoolean);
memcpy(data->localData[i]->stringVars, data->localData[i-1]->stringVars, sizeof(modelica_string)*data->modelData.nVariablesString);
}
}

/** function restoreExtrapolationDataOld
Expand Down
82 changes: 52 additions & 30 deletions SimulationRuntime/c/simulation/solver/solver_main.c
View file
Expand Up @@ -63,48 +63,48 @@ const double rungekutta_b[4] = { 1.0 / 6.0, 1.0 / 3.0, 1.0 / 3.0, 1.0 / 6.0 };
const double rungekutta_c[4] = { 0.0, 0.5, 0.5, 1.0 };


/*! \fn void printAllVars(_X_DATA *data)
/*! \fn void printAllVars(_X_DATA *data, int )
*
* prints all values
* prints all values as arguments it need data
* and which part of the ring should printed.
*
* author: wbraun
*/
void printAllVars(_X_DATA *data)
void printAllVars(_X_DATA *data, int ringSegment)
{
long i;
SIMULATION_DATA *sData = (SIMULATION_DATA*)getRingData(data->simulationData, 0);
MODEL_DATA *mData = &(data->modelData);
INFO("all real variables");
for(i=0; i<mData->nVariablesReal; ++i){
INFO2("sData->realVars[%ld] = %g",i,sData->realVars[i]);
INFO2("localData->realVars[%ld] = %g",i,data->localData[ringSegment]->realVars[i]);
}
INFO("all integer variables");
for(i=0; i<mData->nVariablesInteger; ++i){
INFO2("sData->integerVars[%ld] = %ld",i,sData->integerVars[i]);
INFO2("localData->integerVars[%ld] = %ld",i,data->localData[ringSegment]->integerVars[i]);
}
INFO("all boolean variables");
for(i=0; i<mData->nVariablesBoolean; ++i){
INFO2("sData->booleanVars[%ld] = %s",i,sData->booleanVars[i]?"true":"false");
INFO2("localData->booleanVars[%ld] = %s",i,data->localData[ringSegment]->booleanVars[i]?"true":"false");
}
INFO("all string variables");
for(i=0; i<mData->nVariablesString; ++i){
INFO2("sData->stringVars[%ld] = %s",i,sData->stringVars[i]);
INFO2("localData->stringVars[%ld] = %s",i,data->localData[ringSegment]->stringVars[i]);
}
INFO("all real parameters");
for(i=0; i<mData->nParametersReal; ++i){
INFO2("sData->realParameter[%ld] = %g",i,mData->realParameter[i].attribute.initial);
INFO2("mData->realParameter[%ld] = %g",i,mData->realParameter[i].attribute.initial);
}
INFO("all integer parameters");
for(i=0; i<mData->nParametersInteger; ++i){
INFO2("sData->integerParameter[%ld] = %ld",i,mData->integerParameter[i].attribute.initial);
INFO2("mData->integerParameter[%ld] = %ld",i,mData->integerParameter[i].attribute.initial);
}
INFO("all boolean parameters");
for(i=0; i<mData->nParametersBoolean; ++i){
INFO2("sData->booleanParameter[%ld] = %s",i,mData->booleanParameter[i].attribute.initial?"true":"false");
INFO2("mData->booleanParameter[%ld] = %s",i,mData->booleanParameter[i].attribute.initial?"true":"false");
}
INFO("all string parameters");
for(i=0; i<mData->nParametersString; ++i){
INFO2("sData->stringParameter[%ld] = %s",i,mData->stringParameter[i].attribute.initial);
INFO2("mData->stringParameter[%ld] = %s",i,mData->stringParameter[i].attribute.initial);
}

}
Expand Down Expand Up @@ -190,11 +190,15 @@ solver_main(_X_DATA* simData, double start, double stop, double step, long outpu

if (simInfo->numSteps > 0) { /* Use outputSteps if set, otherwise use step size. */
simInfo->stepSize = (simInfo->stopTime - simInfo->startTime) / simInfo->numSteps;
DEBUG_INFO1(LV_SOLVER,"Step size calculated = %g", simInfo->stepSize);
} else {
if (simInfo->stepSize == 0) { /* outputsteps not defined and zero step, use default 1e-3 */
simInfo->stepSize = 1e-3;
simInfo->stepSize = 2e-3;
DEBUG_INFO1(LV_SOLVER,"Set step size on default value = %g", simInfo->stepSize);
}
DEBUG_INFO1(LV_SOLVER,"Step size is set = %g", simInfo->stepSize);
}

/* initial solverInfo */
solverInfo.currentTime = simInfo->startTime;
solverInfo.currentStepSize = simInfo->stepSize;
Expand All @@ -218,7 +222,7 @@ solver_main(_X_DATA* simData, double start, double stop, double step, long outpu
globalData->terminal = 0;
globalData->oldTime = simInfo->startTime;
globalData->timeValue = simInfo->startTime;
sData->time = 0;
sData->time = simInfo->startTime;


switch (flag) {
Expand Down Expand Up @@ -282,8 +286,13 @@ solver_main(_X_DATA* simData, double start, double stop, double step, long outpu
}

/* debug print */
if (DEBUG_FLAG(LOG_SOLVER))
printAllVars(simData);
if (DEBUG_FLAG(LOG_SOLVER)){
for (i=0; i<3;i++){
INFO1("Print values for buffer segment = %d",i);
printAllVars(simData,i);
}
}

/*if (initialization(init_initMethod ? init_initMethod->c_str() : NULL,
init_optiMethod ? init_optiMethod->c_str() : NULL)) {
THROW("Error in initialization. Storing results and exiting.");
Expand Down Expand Up @@ -331,6 +340,14 @@ solver_main(_X_DATA* simData, double start, double stop, double step, long outpu
return 0;
}

/* debug print */
if (DEBUG_FLAG(LOG_SOLVER)){
for (i=0; i<3;i++){
INFO1("Print values for buffer segment = %d",i);
printAllVars(simData,i);
}
}

DEBUG_INFO(LV_SOLVER, "Performed initial value calculation.");
DEBUG_INFO2(LV_SOLVER, "Start numerical solver from %g to %g", sData->time, simInfo->stopTime);

Expand All @@ -350,6 +367,10 @@ solver_main(_X_DATA* simData, double start, double stop, double step, long outpu
* Start main simulation loop
*/
while (solverInfo.currentTime < simInfo->stopTime) {

/* rotate RingBuffer before step is calculated */
rotateRingBuffer(simData->simulationData, 1, simData->localData);

if (measure_time_flag) {
for (i = 0; i < globalData->nFunctions + globalData->nProfileBlocks; i++)
rt_clear(i + SIM_TIMER_FIRST_FUNCTION);
Expand Down Expand Up @@ -488,20 +509,21 @@ solver_main(_X_DATA* simData, double start, double stop, double step, long outpu

DEBUG_INFO1(LV_SOLVER, "** Step to %g Done!", solverInfo.currentTime);
/* debug print */
if (DEBUG_FLAG(LOG_SOLVER))
printAllVars(simData);
/* rotated Ring buffer when Step is done */
rotateRingBuffer(simData->simulationData, 1, NULL);

if (DEBUG_FLAG(LOG_SOLVER)){
for (i=0; i<3;i++){
INFO1("Print values for buffer segment = %d",i);
printAllVars(simData,i);
}
}
}


/* Last step with terminal()=true */
if (globalData->timeValue >= stop) {
globalData->terminal = 1;
if (solverInfo.currentTime >= stop) {
simData->simulationInfo.terminal = 1;
update_DAEsystem(simData);
sim_result_emit(simData);
globalData->terminal = 0;
simData->simulationInfo.terminal = 0;
}
communicateStatus("Finished", 1);

Expand Down Expand Up @@ -543,13 +565,13 @@ int
euler_ex_step(_X_DATA* simData, SOLVER_INFO* solverInfo) {
int i;
SIMULATION_DATA *sData = (SIMULATION_DATA*)simData->localData[0];
modelica_real* stateDer = sData->realVars + simData->modelData.nStates;
SIMULATION_DATA *sDataOld = (SIMULATION_DATA*)simData->localData[1];
modelica_real* stateDer = sDataOld->realVars + simData->modelData.nStates;

sData->time += solverInfo->currentStepSize;
for (i = 0; i < simData->modelData.nStates; i++) {
sData->realVars[i] += stateDer[i] * solverInfo->currentStepSize;
sData->realVars[i] = sDataOld->realVars[i] + stateDer[i] * solverInfo->currentStepSize;
}
sData->time += solverInfo->currentStepSize;
sData->time = sDataOld->time + solverInfo->currentStepSize;
functionODE(simData);
solverInfo->currentTime += solverInfo->currentStepSize;
return 0;
Expand Down Expand Up @@ -579,7 +601,7 @@ rungekutta_step(_X_DATA* simData, SOLVER_INFO* solverInfo) {
for (i = 0; i < simData->modelData.nStates; i++) {
sData->realVars[i] = backupstates[i] + solverInfo->currentStepSize * rungekutta_c[j] * k[j - 1][i];
}
sData->time += sDataOld->time + rungekutta_c[j] * solverInfo->currentStepSize;
sData->time = sDataOld->time + rungekutta_c[j] * solverInfo->currentStepSize;
functionODE(simData);
for (i = 0; i < simData->modelData.nStates; i++) {
k[j][i] = stateDer[i];
Expand All @@ -593,7 +615,7 @@ rungekutta_step(_X_DATA* simData, SOLVER_INFO* solverInfo) {
}
sData->realVars[i] = backupstates[i] + solverInfo->currentStepSize * sum;
}
sData->time += sDataOld->time + solverInfo->currentStepSize;
sData->time = sDataOld->time + solverInfo->currentStepSize;
functionODE(simData);
solverInfo->currentTime += solverInfo->currentStepSize;
return 0;
Expand Down

0 comments on commit eea2f4e

Please sign in to comment.