Skip to content

Commit 8c61f42

Browse files
author
Willi Braun
committed
- removed LOG_ENDJAC git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@15186 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent a42a65a commit 8c61f42

File tree

5 files changed

+21
-34
lines changed

5 files changed

+21
-34
lines changed

‎SimulationRuntime/c/linearization/linearize.cpp‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,12 @@ int functionJacA(DATA* data, double* jac){
7070
for(i=0; i < data->simulationInfo.analyticJacobians[index].sizeCols; i++)
7171
{
7272
data->simulationInfo.analyticJacobians[index].seedVars[i] = 1.0;
73-
if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
73+
if(ACTIVE_STREAM(LOG_JAC))
7474
{
7575
printf("Caluculate one col:\n");
7676
for(j=0; j < data->simulationInfo.analyticJacobians[index].sizeCols;j++)
7777
{
7878
INFO2(LOG_JAC,"seed: data->simulationInfo.analyticJacobians[index].seedVars[%d]= %f",j,data->simulationInfo.analyticJacobians[index].seedVars[j]);
79-
INFO2(LOG_ENDJAC,"seed: data->simulationInfo.analyticJacobians[index].seedVars[%d]= %f",j,data->simulationInfo.analyticJacobians[index].seedVars[j]);
8079
}
8180
}
8281

@@ -86,12 +85,11 @@ int functionJacA(DATA* data, double* jac){
8685
{
8786
jac[k++] = data->simulationInfo.analyticJacobians[index].resultVars[j];
8887
INFO6(LOG_JAC,"write in jac[%d]-[%d,%d]=%g from row[%d]=%g",k-1,i,j,jac[k-1],i,data->simulationInfo.analyticJacobians[index].resultVars[j]);
89-
INFO6(LOG_ENDJAC,"write in jac[%d]-[%d,%d]=%g from row[%d]=%g",k-1,i,j,jac[k-1],i,data->simulationInfo.analyticJacobians[index].resultVars[j]);
9088
}
9189

9290
data->simulationInfo.analyticJacobians[index].seedVars[i] = 0.0;
9391
}
94-
if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
92+
if(ACTIVE_STREAM(LOG_JAC))
9593
{
9694
INFO(LOG_JAC,"Print jac:");
9795
for(i=0; i < data->simulationInfo.analyticJacobians[index].sizeRows;i++)
@@ -113,13 +111,12 @@ int functionJacB(DATA* data, double* jac){
113111
for(i=0; i < data->simulationInfo.analyticJacobians[index].sizeCols; i++)
114112
{
115113
data->simulationInfo.analyticJacobians[index].seedVars[i] = 1.0;
116-
if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
114+
if(ACTIVE_STREAM(LOG_JAC))
117115
{
118116
printf("Caluculate one col:\n");
119117
for(j=0; j < data->simulationInfo.analyticJacobians[index].sizeCols;j++)
120118
{
121119
INFO2(LOG_JAC,"seed: data->simulationInfo.analyticJacobians[index].seedVars[%d]= %f",j,data->simulationInfo.analyticJacobians[index].seedVars[j]);
122-
INFO2(LOG_ENDJAC,"seed: data->simulationInfo.analyticJacobians[index].seedVars[%d]= %f",j,data->simulationInfo.analyticJacobians[index].seedVars[j]);
123120
}
124121
}
125122

@@ -129,12 +126,11 @@ int functionJacB(DATA* data, double* jac){
129126
{
130127
jac[k++] = data->simulationInfo.analyticJacobians[index].resultVars[j];
131128
INFO6(LOG_JAC,"write in jac[%d]-[%d,%d]=%g from row[%d]=%g",k-1,i,j,jac[k-1],i,data->simulationInfo.analyticJacobians[index].resultVars[j]);
132-
INFO6(LOG_ENDJAC,"write in jac[%d]-[%d,%d]=%g from row[%d]=%g",k-1,i,j,jac[k-1],i,data->simulationInfo.analyticJacobians[index].resultVars[j]);
133129
}
134130

135131
data->simulationInfo.analyticJacobians[index].seedVars[i] = 0.0;
136132
}
137-
if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
133+
if(ACTIVE_STREAM(LOG_JAC))
138134
{
139135
INFO(LOG_JAC, "Print jac:");
140136
for(i=0; i < data->simulationInfo.analyticJacobians[index].sizeRows;i++)
@@ -155,11 +151,11 @@ int functionJacC(DATA* data, double* jac){
155151
for(i=0; i < data->simulationInfo.analyticJacobians[index].sizeCols; i++)
156152
{
157153
data->simulationInfo.analyticJacobians[index].seedVars[i] = 1.0;
158-
if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
154+
if(ACTIVE_STREAM(LOG_JAC))
159155
{
160156
printf("Caluculate one col:\n");
161157
for(j=0; j < data->simulationInfo.analyticJacobians[index].sizeCols;j++)
162-
INFO2((LOG_JAC | LOG_ENDJAC),"seed: data->simulationInfo.analyticJacobians[index].seedVars[%d]= %f",j,data->simulationInfo.analyticJacobians[index].seedVars[j]);
158+
INFO2(LOG_JAC,"seed: data->simulationInfo.analyticJacobians[index].seedVars[%d]= %f",j,data->simulationInfo.analyticJacobians[index].seedVars[j]);
163159
}
164160

165161
functionJacC_column(data);
@@ -168,12 +164,11 @@ int functionJacC(DATA* data, double* jac){
168164
{
169165
jac[k++] = data->simulationInfo.analyticJacobians[index].resultVars[j];
170166
INFO6(LOG_JAC,"write in jac[%d]-[%d,%d]=%g from row[%d]=%g",k-1,i,j,jac[k-1],i,data->simulationInfo.analyticJacobians[index].resultVars[j]);
171-
INFO6(LOG_ENDJAC,"write in jac[%d]-[%d,%d]=%g from row[%d]=%g",k-1,i,j,jac[k-1],i,data->simulationInfo.analyticJacobians[index].resultVars[j]);
172167
}
173168

174169
data->simulationInfo.analyticJacobians[index].seedVars[i] = 0.0;
175170
}
176-
if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
171+
if(ACTIVE_STREAM(LOG_JAC))
177172
{
178173
INFO(LOG_JAC, "Print jac:");
179174
for(i=0; i < data->simulationInfo.analyticJacobians[index].sizeRows;i++)
@@ -194,24 +189,24 @@ int functionJacD(DATA* data, double* jac){
194189
for(i=0; i < data->simulationInfo.analyticJacobians[index].sizeCols; i++)
195190
{
196191
data->simulationInfo.analyticJacobians[index].seedVars[i] = 1.0;
197-
if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
192+
if(ACTIVE_STREAM(LOG_JAC))
198193
{
199194
printf("Caluculate one col:\n");
200195
for(j=0; j < data->simulationInfo.analyticJacobians[index].sizeCols;j++)
201-
INFO2((LOG_JAC | LOG_ENDJAC),"seed: data->simulationInfo.analyticJacobians[index].seedVars[%d]= %f",j,data->simulationInfo.analyticJacobians[index].seedVars[j]);
196+
INFO2(LOG_JAC,"seed: data->simulationInfo.analyticJacobians[index].seedVars[%d]= %f",j,data->simulationInfo.analyticJacobians[index].seedVars[j]);
202197
}
203198

204199
functionJacD_column(data);
205200

206201
for(j = 0; j < data->simulationInfo.analyticJacobians[index].sizeRows; j++)
207202
{
208203
jac[k++] = data->simulationInfo.analyticJacobians[index].resultVars[j];
209-
INFO6((LOG_JAC | LOG_ENDJAC),"write in jac[%d]-[%d,%d]=%g from row[%d]=%g",k-1,i,j,jac[k-1],i,data->simulationInfo.analyticJacobians[index].resultVars[j]);
204+
INFO6(LOG_JAC,"write in jac[%d]-[%d,%d]=%g from row[%d]=%g",k-1,i,j,jac[k-1],i,data->simulationInfo.analyticJacobians[index].resultVars[j]);
210205
}
211206

212207
data->simulationInfo.analyticJacobians[index].seedVars[i] = 0.0;
213208
}
214-
if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
209+
if(ACTIVE_STREAM(LOG_JAC))
215210
{
216211
INFO(LOG_JAC, "Print jac:");
217212
for(i=0; i < data->simulationInfo.analyticJacobians[index].sizeRows;i++)

‎SimulationRuntime/c/math-support/ddassl.c‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3748,7 +3748,7 @@ doublereal ddanrm_(integer *neq, doublereal *v, doublereal *wt, doublereal *
37483748

37493749

37503750
/* WBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWB */
3751-
if(ipar[1] || ipar[2] ){
3751+
if(ipar[1]){
37523752
nrow = npdm1;
37533753
i__1 = *neq;
37543754
i__2 = *neq;
@@ -3771,8 +3771,6 @@ doublereal ddanrm_(integer *neq, doublereal *v, doublereal *wt, doublereal *
37713771
nrow += *neq;
37723772
}
37733773
}
3774-
if(ipar[2])
3775-
EXIT(0);
37763774
/* WBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWB */
37773775

37783776

@@ -3815,7 +3813,7 @@ doublereal ddanrm_(integer *neq, doublereal *v, doublereal *wt, doublereal *
38153813
/* L210: */
38163814
}
38173815
/* WBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWB */
3818-
if(ipar[1] || ipar[2] ){
3816+
if(ipar[1] ){
38193817
nrow = npdm1;
38203818
i__1 = *neq;
38213819
i__2 = *neq;
@@ -3838,8 +3836,6 @@ doublereal ddanrm_(integer *neq, doublereal *v, doublereal *wt, doublereal *
38383836
nrow += *neq;
38393837
}
38403838
}
3841-
if(ipar[2])
3842-
EXIT(0);
38433839
/* WBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWBWB */
38443840

38453841

‎SimulationRuntime/c/simulation/solver/dassl.c‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,11 @@ dasrt_initial(DATA* simData, SOLVER_INFO* solverInfo, DASSL_DATA *dasslData){
156156
dasslData->ngdummy = (fortran_integer) 0;
157157
dasslData->jroot = (fortran_integer*) calloc(simData->modelData.nZeroCrossings, sizeof(fortran_integer));
158158
dasslData->rpar = (double**) malloc(2*sizeof(double*));
159-
dasslData->ipar = (fortran_integer*) calloc(numStatistics, sizeof(fortran_integer));
159+
dasslData->ipar = (fortran_integer*) malloc(sizeof(fortran_integer));
160+
dasslData->ipar[0] = ACTIVE_STREAM(LOG_JAC);
160161
ASSERT(dasslData->ipar,"out of memory");
161162
dasslData->atol = (double*) malloc(simData->modelData.nStates*sizeof(double));
162163
dasslData->rtol = (double*) malloc(simData->modelData.nStates*sizeof(double));
163-
dasslData->ipar[0] = ACTIVE_STREAM(LOG_JAC);
164-
dasslData->ipar[1] = ACTIVE_STREAM(LOG_ENDJAC);
165164
dasslData->info = (fortran_integer*) calloc(infoLength, sizeof(fortran_integer));
166165
ASSERT(dasslData->info,"out of memory");
167166
dasslData->dasslStatistics = (unsigned int*) calloc(numStatistics, sizeof(unsigned int));
@@ -734,7 +733,7 @@ int jacA_num(DATA* data, double *t, double *y, double *yprime, double *delta, do
734733
{
735734
matrixA[i*data->modelData.nStates+j] = (dasslData->newdelta[j] - delta[j]) * deltaInv;
736735
/*
737-
if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
736+
if(ACTIVE_STREAM(LOG_JAC))
738737
{
739738
printf("%d: %e\n",i*data->modelData.nStates+j,matrixA[i*data->modelData.nStates+j]);
740739
}
@@ -745,7 +744,7 @@ int jacA_num(DATA* data, double *t, double *y, double *yprime, double *delta, do
745744

746745
/*
747746
* Debug output
748-
if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
747+
if(ACTIVE_STREAM(LOG_JAC))
749748
{
750749
INFO(LOG_SOLVER, "Print jac:");
751750
for(i=0; i < data->simulationInfo.analyticJacobians[index].sizeRows;i++)
@@ -831,13 +830,13 @@ int jacA_numColored(DATA* data, double *t, double *y, double *yprime, double *de
831830
j = 0;
832831
else
833832
j = data->simulationInfo.analyticJacobians[index].sparsePattern.leadindex[ii-1];
834-
/*INFO2(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC)," take for %d -> %d\n",j,ii); */
833+
/*INFO2(ACTIVE_STREAM(LOG_JAC)," take for %d -> %d\n",j,ii); */
835834
while(j < data->simulationInfo.analyticJacobians[index].sparsePattern.leadindex[ii])
836835
{
837836
l = data->simulationInfo.analyticJacobians[index].sparsePattern.index[j];
838837
k = l + ii*data->simulationInfo.analyticJacobians[index].sizeRows;
839838
matrixA[k] = (dasslData->newdelta[l] - delta[l]) * delta_hh[ii];
840-
/*INFO5(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC),"write %d. in jac[%d]-[%d,%d]=%e",ii,k,j,l,matrixA[k]);*/
839+
/*INFO5(ACTIVE_STREAM(LOG_JAC),"write %d. in jac[%d]-[%d,%d]=%e",ii,k,j,l,matrixA[k]);*/
841840
j++;
842841
};
843842
y[ii] = ysave[ii];
@@ -847,7 +846,7 @@ int jacA_numColored(DATA* data, double *t, double *y, double *yprime, double *de
847846

848847
/*
849848
* Debug output
850-
if(ACTIVE_STREAM(LOG_JAC) || ACTIVE_STREAM(LOG_ENDJAC))
849+
if(ACTIVE_STREAM(LOG_JAC))
851850
{
852851
INFO(LOG_SOLVER, "Print jac:");
853852
for(i=0; i < data->simulationInfo.analyticJacobians[index].sizeRows;i++)

‎SimulationRuntime/c/util/omc_error.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ const char *LOG_STREAM_NAME[LOG_MAX] = {
4949
"LOG_DEBUG",
5050
"LOG_DSS",
5151
"LOG_DSS_JAC",
52-
"LOG_ENDJAC",
5352
"LOG_EVENTS",
5453
"LOG_EVENTS_V",
5554
"LOG_INIT",
@@ -77,11 +76,10 @@ const char *LOG_STREAM_DESC[LOG_MAX] = {
7776
"additional debug information", /* LOG_DEBUG */
7877
"outputs information about dynamic state selection", /* LOG_DSS */
7978
"outputs jacobain of the dynamic state selection", /* LOG_DSS_JAC */
80-
"outputs the jacobian and exits the simulation", /* LOG_ENDJAC */
8179
"additional information during event iteration", /* LOG_EVENTS */
8280
"verbose logging of event system", /* LOG_EVENTS_V */
8381
"additional information during initialization", /* LOG_INIT */
84-
"outputs the jacobian matrix used by the integrator", /* LOG_JAC */
82+
"outputs the jacobian matrix used by dassl", /* LOG_JAC */
8583
"logging for linear systems", /* LOG_LS */
8684
"verbose logging of linear systems", /* LOG_LS_V */
8785
"logging for nonlinear systems", /* LOG_NLS */

‎SimulationRuntime/c/util/omc_error.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ enum LOG_STREAM
7676
LOG_DEBUG,
7777
LOG_DSS,
7878
LOG_DSS_JAC,
79-
LOG_ENDJAC,
8079
LOG_EVENTS,
8180
LOG_EVENTS_V,
8281
LOG_INIT,

0 commit comments

Comments
 (0)