Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions deps/ops/code/OpsMod_ModelColumnIO/Ops_WriteModelColumn.inc
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ USE GenMod_UMHeaderConstants, ONLY: &
IC_LenCxCol

USE mpl, ONLY: &
mpl_comm_world, &
mpl_integer, &
mpl_real, &
mpl_success
Expand Down Expand Up @@ -169,7 +168,7 @@ CALL ops_mpl_gatherv ((/len_data/), &
mpl_displacements, &
mpl_integer, &
0, &
mpl_comm_world, &
mpi_group, &
Errstat)
IF (Errstat /= mpl_success) THEN
WRITE (ErrMess, '(A,I0)') "Error in mpl_gatherv (CX lengths), Errstat = ", Errstat
Expand Down Expand Up @@ -200,7 +199,7 @@ CALL ops_mpl_gatherv (CxData, &
mpl_displacements, &
mpl_real, &
0, &
mpl_comm_world, &
mpi_group, &
Errstat)
IF (Errstat /= mpl_success) THEN
WRITE (ErrMess, '(A,I0)') "Error in mpl_gatherv (CX data), Errstat = ", Errstat
Expand Down
3 changes: 1 addition & 2 deletions deps/ops/stubs/OpsMod_Varobs/Ops_WriteVarobs.inc
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ USE GenMod_MiscUMScienceConstants, ONLY: &
RMDI

USE mpl, ONLY: &
mpl_comm_world, &
mpl_real, &
mpl_success

Expand Down Expand Up @@ -164,7 +163,7 @@ CALL ops_mpl_gatherv (VarArray, &
displacements, &
mpl_real, &
0, &
mpl_comm_world, &
mpi_group, &
istat)
IF (istat /= mpl_success) THEN
WRITE (ErrMess, '(A,I0)') "Error in mpl_gatherv, istat = ", istat
Expand Down
6 changes: 0 additions & 6 deletions src/opsinputs/VarObsWriter.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,6 @@ class LocalEnvironment;
///
/// Most of the implementation is in Fortran (opsinputs_varobswriter_mod.F90).
///
/// \note This filter must only be used with ObsSpaces using the \c MPI_COMM_WORLD communicator,
/// otherwise a deadlock will occur while writing the VarObs file. This is due to a limitation of
/// the \c Ops_WriteVarobs function, which could be removed by replacing \c mpl_comm_world in the
/// call to \c Ops_Mpl_Gatherv by \c mpi_group (for consistency with all other MPI calls in \c
/// Ops_WriteVarobs).
///
/// \see VarObsWriterParameters for the list of accepted configuration parameters.
class VarObsWriter : public ufo::ObsFilterBase,
private util::ObjectCounter<VarObsWriter> {
Expand Down
Loading