rearrange and add one barrier - hopefully fixes issues with hdf5 output with var_dt

mwarusz · mwarusz · commit 64001fc80579 · 2017-01-24T09:19:27.000+01:00
diff --git a/libmpdata++/output/detail/output_common.hpp b/libmpdata++/output/detail/output_common.hpp
@@ -51,10 +51,9 @@ namespace libmpdataxx
           {
             for (const auto &v : outvars)
               intrp_vars[v.first](this->ijk) = this->mem->advectee(v.first)(this->ijk);
+            this->mem->barrier();
           }
 
-          this->mem->barrier();
-
 	  if (this->rank == 0) 
           {
             record_time = this->time;
@@ -105,6 +104,7 @@ namespace libmpdataxx
                 intrp_vars[v.first](this->ijk) += (record_time - prev_time) / (this->time - prev_time) *
                                                    this->mem->advectee(v.first)(this->ijk);
               }
+              this->mem->barrier();
           }
 
 	  if (this->rank == 0)

Original file line number	Diff line number	Diff line change
`@@ -51,10 +51,9 @@ namespace libmpdataxx`
`51`	`51`	`{`
`52`	`52`	`for (const auto &v : outvars)`
`53`	`53`	`intrp_vars[v.first](this->ijk) = this->mem->advectee(v.first)(this->ijk);`
	`54`	`+ this->mem->barrier();`
`54`	`55`	`}`
`55`	`56`
`56`		`- this->mem->barrier();`
`57`		`-`
`58`	`57`	`if (this->rank == 0)`
`59`	`58`	`{`
`60`	`59`	`record_time = this->time;`
`@@ -105,6 +104,7 @@ namespace libmpdataxx`
`105`	`104`	`intrp_vars[v.first](this->ijk) += (record_time - prev_time) / (this->time - prev_time) *`
`106`	`105`	`this->mem->advectee(v.first)(this->ijk);`
`107`	`106`	`}`
	`107`	`+ this->mem->barrier();`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`if (this->rank == 0)`