[cig-commits] [commit] master: Simplify logic and fix output bug for 3d. (accea62)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Jun 16 10:45:32 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/40944f3a0c6a71132cbdf1d431046b3c444f459e...cbc3b2ab6317c0e8dd95a2f58111ede8beadf8d7
>---------------------------------------------------------------
commit accea6259228bb86bb6554c04e3a38ad49093d9a
Author: Rene Gassmoeller <R.Gassmoeller at mailbox.org>
Date: Mon Jun 16 19:34:06 2014 +0200
Simplify logic and fix output bug for 3d.
>---------------------------------------------------------------
accea6259228bb86bb6554c04e3a38ad49093d9a
source/velocity_boundary_conditions/gplates.cc | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source/velocity_boundary_conditions/gplates.cc b/source/velocity_boundary_conditions/gplates.cc
index c37ad13..44e90c7 100644
--- a/source/velocity_boundary_conditions/gplates.cc
+++ b/source/velocity_boundary_conditions/gplates.cc
@@ -610,15 +610,12 @@ namespace aspect
Interface<dim>::update ();
time_relative_to_vel_file_start_time = this->get_time() - velocity_file_start_time;
- const bool first_process = (Utilities::MPI::this_mpi_process (this->get_mpi_communicator ())
- == 0);
// If the boundary condition is constant, switch off time_dependence end leave function.
// This also sets time_weight to 1.0
if ((create_filename (current_time_step) == create_filename (current_time_step+1)) && time_dependent)
{
- if (first_process)
- lookup->screen_output<dim> (pointone, pointtwo,this->get_pcout());
+ lookup->screen_output<dim> (pointone, pointtwo,this->get_pcout());
lookup->load_file (create_filename (current_time_step),
this->get_pcout());
@@ -628,7 +625,7 @@ namespace aspect
if (time_dependent && (time_relative_to_vel_file_start_time >= 0.0))
{
- if ((current_time_step < 0) && (first_process) && (dim == 2))
+ if (current_time_step < 0)
lookup->screen_output<dim> (pointone, pointtwo,this->get_pcout());
if (static_cast<int> (time_relative_to_vel_file_start_time / time_step) > current_time_step)
More information about the CIG-COMMITS
mailing list