Skip to content
Snippets Groups Projects
Commit 9156c048 authored by Moritz Hanke's avatar Moritz Hanke
Browse files

renames routine yac_couple_config_set_output_filename to...

renames routine yac_couple_config_set_output_filename to yac_couple_config_set_config_output_filename
parent b0526bbd
No related branches found
No related tags found
No related merge requests found
......@@ -140,7 +140,7 @@ enum yaml_debug_sync_loc_key_types {
struct debug_config_file_buffer {
struct debug_config_file {
char const * name;
enum yac_config_filetype type;
enum yac_text_filetype type;
} config_file[SYNC_LOC_COUNT];
char const * sync_loc_ref[SYNC_LOC_COUNT];
};
......@@ -1459,7 +1459,7 @@ static struct debug_config_file yaml_parse_config_file_value(
filename_node, strcat(strcpy(str_buffer, file_type_name), " name"),
yaml_filename);
config_file.type =
(enum yac_config_filetype)
(enum yac_text_filetype)
yaml_parse_enum_value(
config_filetypes, num_config_filetypes,
filetype_node, strcat(strcpy(str_buffer, file_type_name), " type"),
......@@ -1562,7 +1562,7 @@ static void yaml_parse_debug_global_config(
for (int i = 0; i < SYNC_LOC_COUNT; ++i)
if (global_config_buffer.config_file[i].name != NULL)
yac_couple_config_set_output_filename(
yac_couple_config_set_config_output_filename(
couple_config, global_config_buffer.config_file[i].name,
global_config_buffer.config_file[i].type,
global_config_buffer.sync_loc_ref[i]);
......
......@@ -28,7 +28,7 @@ enum flag_value {
struct yac_couple_config_config_output {
char const * name;
enum yac_config_filetype type;
enum yac_text_filetype type;
char const * ref;
};
......@@ -2252,7 +2252,7 @@ static void yac_couple_config_unpack_config_output(
MPI_Unpack(
buffer, buffer_size, position, &filetype_int, 1, MPI_INT, comm),
comm);
config_output->type = (enum yac_config_filetype)filetype_int;
config_output->type = (enum yac_text_filetype)filetype_int;
config_output->ref =
yac_couple_config_unpack_string(buffer, buffer_size, position, comm);
}
......@@ -2677,24 +2677,24 @@ void yac_couple_config_sync(
}
}
void yac_couple_config_set_output_filename(
void yac_couple_config_set_config_output_filename(
struct yac_couple_config * couple_config,
char const * filename, enum yac_config_filetype filetype, char const * ref) {
char const * filename, enum yac_text_filetype filetype, char const * ref) {
YAC_ASSERT(
filename != NULL,
"ERROR(yac_couple_config_set_output_filename): filename is NULL");
"ERROR(yac_couple_config_set_config_output_filename): filename is NULL");
YAC_ASSERT_F(
(filetype == YAC_CONFIG_FILETYPE_YAML) ||
(filetype == YAC_CONFIG_FILETYPE_JSON),
"ERROR(yac_couple_config_set_output_filename): "
"ERROR(yac_couple_config_set_config_output_filename): "
"invalid output configuration filetype (type = %d)",
(int)filetype);
YAC_ASSERT(
ref != NULL,
"ERROR(yac_couple_config_set_output_filename): ref is NULL");
"ERROR(yac_couple_config_set_config_output_filename): ref is NULL");
// check whether there already exists a config output with the same reference
for (size_t i = 0; i < couple_config->num_config_outputs; ++i) {
......@@ -2702,7 +2702,7 @@ void yac_couple_config_set_output_filename(
YAC_ASSERT_F(
!strcmp(couple_config->config_outputs[i].name, filename) &&
couple_config->config_outputs[i].type == filetype,
"ERROR(yac_couple_config_set_output_filename): "
"ERROR(yac_couple_config_set_config_output_filename): "
"an filename has already been set for reference "
"(ref \"%s\" curr filename \"%s\" filetype %d; "
"new filename \"%s\" filetype %d",
......
......@@ -42,7 +42,7 @@ enum yac_reduction_type {
TIME_MAXIMUM = 4,
};
enum yac_config_filetype {
enum yac_text_filetype {
YAC_CONFIG_FILETYPE_YAML = 0, //!< YAML format
YAC_CONFIG_FILETYPE_JSON = 1, //!< JSON format
};
......@@ -239,7 +239,7 @@ char const * yac_couple_config_get_tgt_mask_name(
* to file after it has been synchronised between
* all processes, if a filename and -type have been
* set for the provided reference
* (see \ref yac_couple_config_set_output_filename)
* (see \ref yac_couple_config_set_config_output_filename)
*/
void yac_couple_config_sync(
struct yac_couple_config * couple_config, MPI_Comm comm,
......@@ -257,9 +257,9 @@ void yac_couple_config_sync(
* \ref yac_couple_config_sync in order to select
* the filename
*/
void yac_couple_config_set_output_filename(
void yac_couple_config_set_config_output_filename(
struct yac_couple_config * couple_config,
char const * filename, enum yac_config_filetype filetype, char const * ref);
char const * filename, enum yac_text_filetype filetype, char const * ref);
/**
* returns whether YAC aborts if for a defined couple at least one
......
......@@ -516,9 +516,9 @@ void yac_cset_config_output_file_instance(
YAC_INSTANCE_CONFIG_OUTPUT_REF_SYNC,
YAC_INSTANCE_CONFIG_OUTPUT_REF_ENDDEF};
yac_couple_config_set_output_filename(
yac_couple_config_set_config_output_filename(
yac_instance_get_couple_config(instance), filename,
(enum yac_config_filetype)fileformat,
(enum yac_text_filetype)fileformat,
output_refs[sync_location]);
}
......
......@@ -82,7 +82,7 @@ int main(int argc, char** argv) {
struct {
int emit_flags;
int parse_flags;
enum yac_config_filetype filetype;
enum yac_text_filetype filetype;
char const * ext;
} formats[] =
{{.emit_flags = YAC_YAML_EMITTER_DEFAULT,
......@@ -128,9 +128,9 @@ int main(int argc, char** argv) {
char test_reference[32];
sprintf(test_reference, "test_ref_%s", formats[i].ext);
yac_couple_config_set_output_filename(
yac_couple_config_set_config_output_filename(
couple_config, config_filename, formats[i].filetype, test_reference);
yac_couple_config_set_output_filename(
yac_couple_config_set_config_output_filename(
couple_config, debug_global_config_file_def_comp,
YAC_CONFIG_FILETYPE_YAML, YAC_INSTANCE_CONFIG_OUTPUT_REF_COMP);
yac_couple_config_sync(couple_config, MPI_COMM_WORLD, test_reference);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment