Changeset 1226 for trunk/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

Timestamp:

2008-11-27T18:41:45+01:00 (15 years ago)

Author:

smasson

Message:

bugfix of the coupling interface (commited during changeset:1218), see ticket:155

File:

• trunk/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) (10 diffs)

trunk/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

@@ -44 +44 @@
    INTEGER                    :: nerror            ! return error code
 
-   INTEGER, PUBLIC :: nrcv, nsnd    ! Number of received and sent coupling fields
-
    INTEGER, PARAMETER :: nmaxfld=40    ! Maximum number of coupling fields
    
@@ -75 +73 @@
 CONTAINS
 
-   SUBROUTINE cpl_prism_init
+   SUBROUTINE cpl_prism_init (kl_comm) 
 
       !!-------------------------------------------------------------------
@@ -85 +83 @@
       !! ** Method  :   OASIS3 MPI communication 
       !!--------------------------------------------------------------------
-      !!
+      INTEGER, INTENT(   OUT )   :: kl_comm       ! local communicator of the model
+      !!--------------------------------------------------------------------
 
       IF(lwp) WRITE(numout,*) 'cpl_prism_init : initialization in coupled ocean/atmosphere case'
@@ -101 +100 @@
       !------------------------------------------------------------------
 
-      CALL prism_get_localcomm_proto ( nlocalComm, nerror )
+      CALL prism_get_localcomm_proto ( kl_comm, nerror )
       IF ( nerror /= PRISM_Ok ) &
          CALL prism_abort_proto (ncomp_id, 'cpl_prism_init','Failure in prism_get_localcomm_proto' )
@@ -108 +107 @@
 
 
-   SUBROUTINE cpl_prism_define ()
+   SUBROUTINE cpl_prism_define (krcv, ksnd)
 
       !!-------------------------------------------------------------------
@@ -118 +117 @@
       !! ** Method  :   OASIS3 MPI communication 
       !!--------------------------------------------------------------------
-      !! * Arguments
-      !!
-      !! * Local declarations
-      !!
+      INTEGER, INTENT( IN    )   :: krcv, ksnd     ! Number of received and sent coupling fields
+      !
       INTEGER                    :: id_part
       INTEGER                    :: paral(5)       ! OASIS3 box partition
@@ -171 +168 @@
       ! ... Announce send variables. 
       !
-      DO ji = 1, nsnd
+      DO ji = 1, ksnd
          IF ( ssnd(ji)%laction ) THEN 
             CALL prism_def_var_proto (ssnd(ji)%nid, ssnd(ji)%clname, id_part, (/ 2, 0/),  &
@@ -184 +181 @@
       ! ... Announce received variables. 
       !
-      DO ji = 1, nrcv
+      DO ji = 1, krcv
          IF ( srcv(ji)%laction ) THEN 
             CALL prism_def_var_proto ( srcv(ji)%nid, srcv(ji)%clname, id_part, (/ 2, 0/),   &
@@ -292 +289 @@
             WRITE(numout,*) '     -     Sum value is ', SUM(pdata)
             WRITE(numout,*) '****************'
-            call flush(numout)
          ENDIF
       
@@ -329 +325 @@
 CONTAINS
 
-   SUBROUTINE cpl_prism_init
+   SUBROUTINE cpl_prism_init (kl_comm) 
+      INTEGER, INTENT(   OUT )   :: kl_comm       ! local communicator of the model
+      kl_comm = -1
       WRITE(numout,*) 'cpl_prism_init: Error you sould not be there...'
    END SUBROUTINE cpl_prism_init