Skip to content

Commit 464ab2d

Browse files
committed
<point> tag is needed in the sacess xml
1 parent d9fc20c commit 464ab2d

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

example-files/alpha_pinene_ess_mpi_config.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<run>
33
<typebench>customized</typebench>
44
<id>0</id>
5-
<log_scale>5</log_scale>
5+
<log_scale>4</log_scale>
66
<output>0</output>
77
<verbose>0</verbose>
88
<local_search>1</local_search>
99
<stopping_criteria>
10-
<maxevaluation>3e5</maxevaluation>
10+
<maxevaluation>3e3</maxevaluation>
1111
<maxtime>1e10</maxtime>
1212
<vtr>0</vtr>
1313
</stopping_criteria>
@@ -53,11 +53,14 @@
5353
<int_var> 0 </int_var>
5454
<bin_var> 0 </bin_var>
5555
<lb>
56-
0, 0, 0, 0, 0.000001
56+
0, 0, 0, 0, 0
5757
</lb>
5858
<ub>
5959
0.001, 0.001, 0.001, 0.0001, 0.001
6060
</ub>
61+
<point>
62+
0, 0, 0, 0, 0
63+
</point>
6164
</problem>
6265

6366
</xml>

modules/cuqdyn-c/src/ess_solver.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ N_Vector execute_ess_solver(const char *file, const char *path, N_Vector texp, S
5151
create_expetiment_struct(file, &(exptotal[i]), nproc, rank, path, init, texp, yexp, initial_condition);
5252
if (initial_params != NULL)
5353
{
54-
for (int i = 0; i < NV_LENGTH_S(initial_params); i++)
54+
for (int j = 0; j < NV_LENGTH_S(initial_params); j++)
5555
{
56-
exptotal[0].test.bench.X0[0][i] = NV_Ith_S(initial_params, i);
56+
exptotal[i].test.bench.X0[0][j] = NV_Ith_S(initial_params, j);
5757
}
5858
}
5959
init = 0;

modules/cuqdyn-c/src/functions.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,27 +58,19 @@ void *ode_model_obj_func(double *x, void *data)
5858
const int rows = SM_ROWS_D(result);
5959
const int cols = SM_COLUMNS_D(result);
6060

61-
// sunrealtype R[(cols - 1) * rows];
6261
sunrealtype J = 0.0;
6362

64-
long index = 0;
65-
6663
for (long i = 0; i < rows; ++i)
6764
{
6865
// Note that the first col of the result matrix is t
6966
for (long j = 1; j < cols; ++j)
7067
{
7168
const sunrealtype diff = SM_ELEMENT_D(result, i, j) - SM_ELEMENT_D(exptotal->yexp, i, j - 1);
7269
J += diff * diff;
73-
// R[index++] = SM_ELEMENT_D(result, i, j) - SM_ELEMENT_D(exptotal->yexp, i, j - 1);
7470
}
7571
}
7672

77-
// TODO: I'm not sure about this. res->J is a pointer what makes no sense
7873
res->value = J;
79-
// res->g = 0;
80-
// res->R = R;
81-
// res->size_r = (cols - 1) * rows;
8274

8375
N_VDestroy(parameters);
8476
SUNMatDestroy(result);

0 commit comments

Comments
 (0)