Commit 471ccd94 authored by Christopher Subich's avatar Christopher Subich

wave_reader: allow FULL input types

Previously, wave_reader locked 'FULL' (3D) input behind enabling
restart.  This restriction was unnecessary, and doing so in fact made
the specification of u/v/w/rho filenames useless.

Deleting this check allows proper read-in of FULL datatypes, without
faking a restart.  The only functional difference is that if
perturbations are also enabled, they will be applied on top of the 3D
data read.  This seems to be desirable, since it makes the application
of the config-file settings more straightforward.
parent 79b17389
......@@ -186,14 +186,7 @@ class userControl : public BaseCase {
} else if (restarting and restart_from_dump) {
init_vels_dump(u, v, w);
} else {
// error check
if (input_data_types == FULL) {
if (master())
fprintf(stderr,"FULL option chosen, turn restart on\n");
MPI_Finalize(); exit(1);
}
// else start from other data formats
// FULL types can be passed directly to init_field
init_field("u", u_filename, u, input_data_types);
init_field("w", w_filename, w, input_data_types);
if (Ny > 1 || rot_f != 0) {
......@@ -244,14 +237,7 @@ class userControl : public BaseCase {
if (is_tracer)
init_tracer_dump("tracer",*tracers[TRCR]);
} else {
// error check
if (input_data_types == FULL) {
if (master())
fprintf(stderr,"FULL option chosen, turn restart on\n");
MPI_Finalize(); exit(1);
}
// else start from other data formats
// init_field can handle all input types
init_field("rho", rho_filename, *tracers[RHO], input_data_types);
if (is_tracer)
init_field("tracer", tracer_filename, *tracers[TRCR], input_data_types);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment