Skip to content

Commit a1c8344

Browse files
committed
correctly using log_scale in the ess
1 parent e55dcfb commit a1c8344

19 files changed

+25
-22
lines changed

example-files/alpha_pinene_ess_mpi2_config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<run>
33
<typebench>customized</typebench>
44
<id>0</id>
5-
<log_scale>5</log_scale>
5+
<log_scale>1</log_scale>
66
<output>0</output>
77
<verbose>1</verbose>
88
<local_search>1</local_search>

example-files/alpha_pinene_ess_mpi_config.xml

Lines changed: 5 additions & 5 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>4</log_scale>
5+
<log_scale>1</log_scale>
66
<output>0</output>
7-
<verbose>0</verbose>
7+
<verbose>1</verbose>
88
<local_search>1</local_search>
99
<stopping_criteria>
10-
<maxevaluation>3e3</maxevaluation>
10+
<maxevaluation>4e3</maxevaluation>
1111
<maxtime>1e10</maxtime>
1212
<vtr>0</vtr>
1313
</stopping_criteria>
@@ -56,10 +56,10 @@
5656
0, 0, 0, 0, 0
5757
</lb>
5858
<ub>
59-
0.001, 0.001, 0.001, 0.0001, 0.001
59+
1, 1, 1, 1, 1
6060
</ub>
6161
<point>
62-
0, 0, 0, 0, 0
62+
1, 1, 1, 1, 1
6363
</point>
6464
</problem>
6565

example-files/alpha_pinene_ess_serial_config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<run>
33
<typebench>customized</typebench>
44
<id>0</id>
5-
<log_scale>4</log_scale>
5+
<log_scale>1</log_scale>
66
<output>1</output>
77
<verbose>1</verbose>
88
<local_search>1</local_search>

example-files/logistic_model_ess_mpi2_config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<run>
33
<typebench>customized</typebench>
44
<id>0</id>
5-
<log_scale>2</log_scale>
5+
<log_scale>1</log_scale>
66
<output>1</output>
77
<verbose>1</verbose>
88
<local_search>1</local_search>

example-files/logistic_model_ess_mpi_config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<run>
33
<typebench>customized</typebench>
44
<id>0</id>
5-
<log_scale>2</log_scale>
5+
<log_scale>1</log_scale>
66
<output>0</output>
77
<verbose>1</verbose>
88
<local_search>1</local_search>

example-files/logistic_model_ess_serial_config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<run>
33
<typebench>customized</typebench>
44
<id>0</id>
5-
<log_scale>2</log_scale>
5+
<log_scale>1</log_scale>
66
<output>1</output>
77
<verbose>1</verbose>
88
<local_search>1</local_search>

example-files/lotka_volterra_ess_mpi2_config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<run>
33
<typebench>customized</typebench>
44
<id>0</id>
5-
<log_scale>4</log_scale>
5+
<log_scale>1</log_scale>
66
<output>0</output>
77
<verbose>0</verbose>
88
<local_search>1</local_search>

example-files/lotka_volterra_ess_mpi_config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<run>
33
<typebench>customized</typebench>
44
<id>0</id>
5-
<log_scale>2</log_scale>
5+
<log_scale>1</log_scale>
66
<output>0</output>
77
<verbose>0</verbose>
88
<local_search>1</local_search>

example-files/lotka_volterra_ess_serial_config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<run>
33
<typebench>customized</typebench>
44
<id>0</id>
5-
<log_scale>4</log_scale>
5+
<log_scale>1</log_scale>
66
<output>0</output>
77
<verbose>0</verbose>
88
<local_search>1</local_search>

modules/cuqdyn-c/src/ess_solver.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <../include/functions.h>
1111

1212
#include "cuqdyn.h"
13+
#include "method_module/common_solver_operations.h"
1314
#if defined(MPI2) || defined(MPI)
1415
#include <mpi.h>
1516
#endif
@@ -49,6 +50,7 @@ N_Vector execute_ess_solver(const char *file, const char *path, N_Vector texp, S
4950
{
5051
// PARSE THE OPTIONS OF THE SOLVER
5152
create_expetiment_struct(file, &(exptotal[i]), nproc, rank, path, init, texp, yexp, initial_condition);
53+
logandtranslation_(&exptotal[i]);
5254
if (initial_params != NULL)
5355
{
5456
for (int j = 0; j < NV_LENGTH_S(initial_params); j++)
@@ -77,6 +79,7 @@ N_Vector execute_ess_solver(const char *file, const char *path, N_Vector texp, S
7779
exptotal = (experiment_total *) malloc(sizeof(experiment_total));
7880
init = 1;
7981
create_expetiment_struct(file, &exptotal[0], nproc, rank, path, init, texp, yexp, initial_condition);
82+
logandtranslation_(&exptotal[0]);
8083

8184
if (initial_params != NULL)
8285
{

0 commit comments

Comments
 (0)