Skip to content

Commit

Permalink
fixes for SCEMa to compile with deal.ii@8.5 and above
Browse files Browse the repository at this point in the history
  • Loading branch information
mvassaux committed Apr 9, 2020
1 parent a94e07e commit e99669d
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions headers/FE_problem.h
Original file line number Diff line number Diff line change
Expand Up @@ -1910,8 +1910,8 @@ namespace HMM
Utilities::int_to_string(timestep,4) +
".visit");
std::ofstream visit_master (visit_master_filename.c_str());
data_out.write_visit_record (visit_master, filenames_loc); // 8.4.1
//DataOutBase::write_visit_record (visit_master, filenames_loc); // 8.5.0
//data_out.write_visit_record (visit_master, filenames_loc); // 8.4.1
DataOutBase::write_visit_record (visit_master, filenames_loc); // 8.5.0

const std::string
pvtu_master_filename = (macrologloc + "/" + "history-" +
Expand All @@ -1927,8 +1927,8 @@ namespace HMM
".pvtu");
times_and_names.push_back (std::pair<double,std::string> (present_time, pvtu_master_filename_loc));
std::ofstream pvd_output (macrologloc + "/" + "history.pvd");
data_out.write_pvd_record (pvd_output, times_and_names); // 8.4.1
//DataOutBase::write_pvd_record (pvd_output, times_and_names); // 8.5.0
//data_out.write_pvd_record (pvd_output, times_and_names); // 8.4.1
DataOutBase::write_pvd_record (pvd_output, times_and_names); // 8.5.0
}
MPI_Barrier(FE_communicator);
}
Expand Down Expand Up @@ -2044,8 +2044,8 @@ namespace HMM
Utilities::int_to_string(timestep,4) +
".visit");
std::ofstream visit_master (visit_master_filename.c_str());
data_out.write_visit_record (visit_master, filenames_loc); // 8.4.1
//DataOutBase::write_visit_record (visit_master, filenames_loc); // 8.5.0
//data_out.write_visit_record (visit_master, filenames_loc); // 8.4.1
DataOutBase::write_visit_record (visit_master, filenames_loc); // 8.5.0

const std::string
pvtu_master_filename = (macrologloc + "/" + "solution-" +
Expand All @@ -2061,8 +2061,8 @@ namespace HMM
".pvtu");
times_and_names.push_back (std::pair<double,std::string> (present_time, pvtu_master_filename_loc));
std::ofstream pvd_output (macrologloc + "/" + "solution.pvd");
data_out.write_pvd_record (pvd_output, times_and_names); // 8.4.1
//DataOutBase::write_pvd_record (pvd_output, times_and_names); // 8.5.0
//data_out.write_pvd_record (pvd_output, times_and_names); // 8.4.1
DataOutBase::write_pvd_record (pvd_output, times_and_names); // 8.5.0
}
MPI_Barrier(FE_communicator);
}
Expand Down

0 comments on commit e99669d

Please sign in to comment.