Skip to content

Commit

Permalink
Removed warnings and double reading of input files
Browse files Browse the repository at this point in the history
  • Loading branch information
sofiemartins committed Sep 11, 2024
1 parent 34ac29e commit a623cbc
Show file tree
Hide file tree
Showing 32 changed files with 19 additions and 610 deletions.
2 changes: 0 additions & 2 deletions Disconnected/compute_loops.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,7 @@ int main(int argc, char *argv[]) {
setup_process(&argc, &argv);
setup_gauge_fields();

read_input(glb_var.read, get_input_filename());
read_input(disc_var.read, get_input_filename());
read_input(rlx_var.read, get_input_filename());
strcpy(list_filename, disc_var.configlist);
lprintf("MAIN", 0, "list_filename = %s \n", list_filename, disc_var.configlist);

Expand Down
73 changes: 0 additions & 73 deletions HMC/hmc_forces.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,63 +176,9 @@ int main(int argc, char *argv[]) {
FILE *list;
filename_t fpars;

read_cmdline(argc, argv);

/* setup process communications */
setup_process(&argc, &argv);

/* read global variables file */
read_input(glb_var.read, input_filename);

setup_replicas();

/* logger setup */
read_input(logger_var.read, input_filename);
logger_set_input(&logger_var);
if (PID != 0) {
logger_disable();
} /* disable logger for MPI processes != 0 */
else {
FILE *stderrp;
sprintf(sbuf, ">>%s", output_filename);
logger_stdout(sbuf);
stderrp = freopen(error_filename, "w", stderr);
error(stderrp == NULL, 1, "main [hmc.c]", "Cannot redirect the stderr");
}

print_compiling_info_short();
lprintf("MAIN", 0, "[RepID: %d][world_size: %d]\n[MPI_ID: %d][MPI_size: %d]\n\n", RID, WORLD_SIZE, MPI_PID, MPI_WORLD_SIZE);

// lprintf("MAIN",0,"Logger lelvel: %d\n",logger_getlevel(0));

/* setup lattice geometry */
if (geometry_init() == 1) {
finalize_process();
return 0;
}
geometry_mpi_eo();
/* test_geometry_mpi_eo(); */
/* setup random numbers */
read_input(rlx_var.read, input_filename);
//slower(rlx_var.rlxd_start); //convert start variable to lowercase
if (strcmp(rlx_var.rlxd_start, "continue") == 0 && rlx_var.rlxd_state[0] != '\0') {
/*load saved state*/
lprintf("MAIN", 0, "Loading rlxd state from file [%s]\n", rlx_var.rlxd_state);
read_ranlxd_state(rlx_var.rlxd_state);
} else {
lprintf("MAIN", 0, "RLXD [%d,%d]\n", rlx_var.rlxd_level, rlx_var.rlxd_seed + MPI_PID);
rlxd_init(rlx_var.rlxd_level, rlx_var.rlxd_seed);
}

#ifdef GAUGE_SUN
lprintf("MAIN", 0, "Gauge group: SU(%d)\n", NG);
#elif GAUGE_SON
lprintf("MAIN", 0, "Gauge group: SO(%d)\n", NG);
#else
lprintf("MAIN", 0, "Default gauge group: SU(%d)\n", NG);
#endif
lprintf("MAIN", 0, "Fermion representation: " REPR_NAME " [dim=%d]\n", NF);

/* Init Monte Carlo */
init_mc(&flow, input_filename);
parse_cnfg_filename(cnfg_filename, &fpars);
Expand All @@ -241,25 +187,6 @@ int main(int argc, char *argv[]) {
error((list = fopen(list_filename, "r")) == NULL, 1, "main [mk_mesons.c]", "Failed to open list file\n");
}

print_compiling_info_short();
lprintf("MAIN", 0, "PId = %d [world_size: %d]\n\n", PID, WORLD_SIZE);
lprintf("MAIN", 0, "input file [%s]\n", input_filename);
lprintf("MAIN", 0, "output file [%s]\n", output_filename);
if (list_filename[0] != 0) {
lprintf("MAIN", 0, "list file [%s]\n", list_filename);
} else {
lprintf("MAIN", 0, "cnfg file [%s]\n", cnfg_filename);
}

parse_cnfg_filename(cnfg_filename, &fpars);

GLB_T = fpars.t;
GLB_X = fpars.x;
GLB_Y = fpars.y;
GLB_Z = fpars.z;
error(fpars.type == UNKNOWN_CNFG, 1, "measure_spectrum.c", "Bad name for a configuration file");
error(fpars.nc != NG, 1, "measure_spectrum.c", "Bad NG");

int i = 0;
while (1) {
double times[num_mon()];
Expand Down
2 changes: 2 additions & 0 deletions LibHR/Update/Dphi.c
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,9 @@ void Dphi_cpu_(spinor_field *restrict out, spinor_field *restrict in) {
// this is achieved with comparing the condition to be different than repeat=0,1

_MASTER_FOR(out->type, ix) {
#ifdef _OPENMP
register int thread0 = hr_threadId();
#endif
register suNf_spinor *r = _FIELD_AT(out, ix);
if (repeat == 0) { _spinor_zero_f(*r); }

Expand Down
1 change: 0 additions & 1 deletion ModeNumber/mk_eigvals.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ int main(int argc, char *argv[]) {
/* setup process id and communications */
setup_process(&argc, &argv);
setup_gauge_fields();
read_input(glb_var.read, get_input_filename());
read_input(eig_var.read, get_input_filename());
lprintf("MAIN", 0, "list file: [%s]\n", eig_var.configlist);
if (strcmp(eig_var.configlist, "") != 0) {
Expand Down
3 changes: 1 addition & 2 deletions ModeNumber/mk_modenumber.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,14 @@ input_nu nu_var = init_input_nu(nu_var);

int main(int argc, char *argv[]) {
char tmp[1024];
FILE *list;
FILE *list = NULL;
char *cptr;
int neig;
double M[1024];

/* setup process id and communications */
setup_process(&argc, &argv);
setup_gauge_fields();
read_input(glb_var.read, get_input_filename());
read_input(nu_var.read, get_input_filename());
hevamass = nu_var.mass;
strcpy(tmp, nu_var.list);
Expand Down
28 changes: 1 addition & 27 deletions Reweight/reweight.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,40 +180,14 @@ int main(int argc, char *argv[]) {
char sbuf[512];
char rbuf[512];

// Read commandline
read_cmdline(argc, argv);

// Setup process
setup_process(&argc, &argv);
setup_gauge_fields();
logger_setlevel(0, 10);

if (PID != 0) {
logger_disable();
} else {
sprintf(sbuf, ">>%s", output_filename);
logger_stdout(sbuf);
sprintf(sbuf, "err_%d", PID);
freopen(sbuf, "w", stderr);
}

// Read settings
read_input(glb_var.read, input_filename);
read_input(rlx_var.read, input_filename);
read_input(rw_var.read, input_filename);

// Initialize stuff
rlxd_init(rlx_var.rlxd_level, rlx_var.rlxd_seed);

if (geometry_init() == 1) {
finalize_process();
return 0;
}

geometry_mpi_eo();

// Allocate gauge field
u_gauge = alloc_suNg_field(&glattice);
u_gauge_f = alloc_suNf_field(&glattice);
unit_u(u_gauge);
represent_gauge_field();

Expand Down
2 changes: 0 additions & 2 deletions Scattering/scatter.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ int main(int argc, char *argv[]) {

setup_gauge_fields();

read_input(glb_var.read, get_input_filename());
read_input(mes_var.read, get_input_filename());
read_input(rlx_var.read, get_input_filename());

#ifdef WITH_CLOVER
clover_init(mes_var.csw);
Expand Down
4 changes: 1 addition & 3 deletions Scattering/scattering_lengths.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ typedef struct {

int main(int argc, char *argv[]) {
int k;
FILE *list;
FILE *list = NULL;
int nm;
double m[256];
int seq_prop = 0;
Expand All @@ -79,9 +79,7 @@ int main(int argc, char *argv[]) {

setup_gauge_fields();

read_input(glb_var.read, get_input_filename());
read_input(mes_var.read, get_input_filename());
read_input(rlx_var.read, get_input_filename());
if (strcmp(mes_var.seq_prop, "true") == 0) { seq_prop = 1; }
if (strcmp(mes_var.seq_prop, "none") == 0) { seq_prop = 2; }
if (strcmp(mes_var.seq_prop, "false") == 0) { seq_prop = 0; }
Expand Down
4 changes: 1 addition & 3 deletions Scattering/sigma_triangle.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ typedef struct {

int main(int argc, char *argv[]) {
int k;
FILE *list;
FILE *list = NULL;
int nm;
double m[256];
int seq_prop = 0;
Expand All @@ -81,9 +81,7 @@ int main(int argc, char *argv[]) {

setup_gauge_fields();

read_input(glb_var.read, get_input_filename());
read_input(mes_var.read, get_input_filename());
read_input(rlx_var.read, get_input_filename());
if (strcmp(mes_var.seq_prop, "true") == 0) { seq_prop = 1; }

strcpy(list_filename, mes_var.configlist);
Expand Down
2 changes: 0 additions & 2 deletions Spectrum/measure_formfactor.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,6 @@ int main(int argc, char *argv[]) {
read_cmdline(argc, argv);
setup_process(&argc, &argv);

read_input(glb_var.read, input_filename);

/* logger setup */
/* disable logger for MPI processes != 0 */
logger_setlevel(0, 30);
Expand Down
2 changes: 0 additions & 2 deletions Spectrum/measure_spectrum.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,7 @@ int main(int argc, char *argv[]) {

setup_gauge_fields();

read_input(glb_var.read, get_input_filename());
read_input(mes_var.read, get_input_filename());
read_input(rlx_var.read, get_input_filename());
read_input(ff_var.read, get_input_filename());
strcpy(list_filename, mes_var.configlist);

Expand Down
3 changes: 0 additions & 3 deletions Spectrum/mk_mesons.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,6 @@ int main(int argc, char *argv[]) {
read_cmdline(argc, argv);
setup_process(&argc, &argv);

read_input(glb_var.read, input_filename);
read_input(rlx_var.read, input_filename);

/* logger setup */
/* disable logger for MPI processes != 0 */
logger_setlevel(0, 30);
Expand Down
60 changes: 1 addition & 59 deletions Spectrum/mk_mesons_with_z2semwall.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,50 +156,10 @@ int main(int argc, char *argv[]) {
double m[256];

/* setup process id and communications */
read_cmdline(argc, argv);
setup_process(&argc, &argv);

read_input(glb_var.read, input_filename);
read_input(rlx_var.read, input_filename);

/* logger setup */
/* disable logger for MPI processes != 0 */
logger_setlevel(0, 30);
if (PID != 0) { logger_disable(); }
if (PID == 0) {
sprintf(tmp, ">%s", output_filename);
logger_stdout(tmp);
sprintf(tmp, "err_%d", PID);
if (!freopen(tmp, "w", stderr)) { lprintf("MAIN", 0, "Error out not open\n"); }
}

print_compiling_info_short();
lprintf("MAIN", 0, "PId = %d [world_size: %d]\n\n", PID, WORLD_SIZE);
lprintf("MAIN", 0, "input file [%s]\n", input_filename);
lprintf("MAIN", 0, "output file [%s]\n", output_filename);
if (list_filename != NULL) {
lprintf("MAIN", 0, "list file [%s]\n", list_filename);
} else {
lprintf("MAIN", 0, "cnfg file [%s]\n", cnfg_filename);
}

/* read & broadcast parameters */
parse_cnfg_filename(cnfg_filename, &fpars);
setup_gauge_fields();

read_input(mes_var.read, input_filename);
GLB_T = fpars.t;
GLB_X = fpars.x;
GLB_Y = fpars.y;
GLB_Z = fpars.z;
error(fpars.type == UNKNOWN_CNFG, 1, "mk_mesons.c", "Bad name for a configuration file");
error(fpars.nc != NG, 1, "mk_mesons.c", "Bad NG");

lprintf("MAIN", 0, "RLXD [%d,%d]\n", rlx_var.rlxd_level, rlx_var.rlxd_seed);
rlxd_init(rlx_var.rlxd_level, rlx_var.rlxd_seed);
srand(rlx_var.rlxd_seed + PID);

lprintf("MAIN", 0, "Gauge group: SU(%d)\n", NG);
lprintf("MAIN", 0, "Fermion representation: " REPR_NAME " [dim=%d]\n", NF);

nm = 0;
if (fpars.type == DYNAMICAL_CNFG) {
Expand All @@ -216,24 +176,6 @@ int main(int argc, char *argv[]) {
}
}

/* setup communication geometry */
if (geometry_init() == 1) {
finalize_process();
return 0;
}

/* setup lattice geometry */
geometry_mpi_eo();
/* test_geometry_mpi_eo(); */

init_BCs(NULL);

/* alloc global gauge fields */
u_gauge = alloc_suNg_field(&glattice);
#ifdef ALLOCATE_REPR_GAUGE_FIELD
u_gauge_f = alloc_suNf_field(&glattice);
#endif

lprintf("MAIN", 0, "Inverter precision = %e\n", mes_var.precision);
for (k = 0; k < nm; k++) {
lprintf("MAIN", 0, "Mass[%d] = %f\n", k, m[k]);
Expand Down
3 changes: 0 additions & 3 deletions Spectrum/mk_mesons_with_z2semwall_new.c
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,6 @@ int main(int argc, char *argv[]) {
read_cmdline(argc, argv);
setup_process(&argc, &argv);

read_input(glb_var.read, input_filename);
read_input(rlx_var.read, input_filename);

/* logger setup */
/* disable logger for MPI processes != 0 */
logger_setlevel(0, 30);
Expand Down
Loading

0 comments on commit a623cbc

Please sign in to comment.