Changeset 12675 for NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/cpl_oasis3.F90

Timestamp:

2020-04-03T18:00:43+02:00 (4 years ago)

Author:

dancopsey

Message:

Fix compile errors.

File:

• NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/cpl_oasis3.F90 (modified) (6 diffs)

NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/cpl_oasis3.F90

@@ -33 +33 @@
    USE in_out_manager               ! I/O manager
    USE lbclnk                       ! ocean lateral boundary conditions (or mpp link)
+   USE lib_mpp
 
    IMPLICIT NONE
@@ -52 +53 @@
    PUBLIC   cpl_finalize
 
+#if defined key_mpp_mpi
+   INCLUDE 'mpif.h'
+#endif
+
+   INTEGER, PARAMETER         ::   localRoot  = 0
    INTEGER, PUBLIC            ::   OASIS_Rcv  = 1    !: return code if received field
    INTEGER, PUBLIC            ::   OASIS_idle = 0    !: return code if nothing done by oasis
@@ -115 +121 @@
       CHARACTER(len = *), INTENT(in   ) ::   cd_modname   ! model name as set in namcouple file
       INTEGER           , INTENT(  out) ::   kl_comm      ! local communicator of the model
+      INTEGER                           ::   error
       !!--------------------------------------------------------------------
 
@@ -627 +634 @@
                      WRITE(numout,*) '     - Start of data is ', pdata(1:number_to_print)
                      WRITE(numout,*) '****************'
-                     IF(lflush) CALL flush(numout)
                   ENDIF
                   
@@ -635 +641 @@
             
        ENDDO
-       
+
+#if defined key_mpp_mpi
        ! Set the precision that we want to broadcast using MPI_BCAST
        SELECT CASE( wp )
@@ -651 +658 @@
        ! to deal with that w/o NEMO adopting a UM-style test mechanism
        ! to determine active put/get timesteps. 
-       CALL mpi_bcast( pdata, nitems, MPI_WORKING_PRECISION, localRoot, mpi_comm_opa, ierr )
+       CALL mpi_bcast( pdata, nitems, MPI_WORKING_PRECISION, localRoot, mpi_comm_oce, ierr )
+#else
+       CALL oasis_abort( ncomp_id, "cpl_rcv_1d", "Unable to use mpi_bcast without key_mpp_mpi present. Please add key_mpp_mpi to your list of NEMO keys." )
+#endif
 
       !