Changeset 9242 for branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

Timestamp:

2018-01-16T15:42:45+01:00 (6 years ago)

Author:

dancopsey

Message:

Fixed receiving of up to 2000 rivers.

File:

• branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90 (modified) (7 diffs)

branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

@@ -38 +38 @@
    PUBLIC   cpl_define
    PUBLIC   cpl_snd
-   PUBLIC   runoff_rcv
    PUBLIC   cpl_rcv
    PUBLIC   cpl_freq
@@ -69 +68 @@
    INTEGER, PUBLIC, PARAMETER ::   nmaxcat=5    ! Maximum number of coupling fields
    INTEGER, PUBLIC, PARAMETER ::   nmaxcpl=5    ! Maximum number of coupling fields
-   INTEGER, PUBLIC, PARAMETER ::   n_rivers=2000  ! Total number of rivers whose runoff is passed from the atmosphere
+   INTEGER, PUBLIC, PARAMETER ::   n_rivers=2000  ! Total number of rivers in coupled runoff using 1D array
    
-   INTEGER :: runoff_id
+   INTEGER, PUBLIC :: runoff_id
    
    TYPE, PUBLIC ::   FLD_CPL               !: Type for coupling field information
@@ -141 +140 @@
       !
       INTEGER :: id_part        ! Partition for all 2D model fields to be coupled
-      INTEGER :: id_part_r      ! Partition for river runoff
+      INTEGER :: id_part_rnf_1d ! Partition for river runoff using 1D array
       INTEGER :: paral(5)       ! OASIS3 box partition
       INTEGER :: ishape(2,2)    ! shape of arrays passed to PSMILe
@@ -203 +202 @@
       CALL oasis_def_partition ( id_part, paral, nerror )
       !
-      ! Another partition is needed for river runoff
+      ! Another partition is needed for river runoff when using 1D array
       
       paral(1) = 0                                              ! serial partitioning
@@ -211 +210 @@
       paral(5) = 0
       
-      CALL oasis_def_partition ( id_part_r, paral, nerror, n_rivers )
+      CALL oasis_def_partition ( id_part_rnf_1d, paral, nerror, n_rivers )
       
       ! ... Announce send variables. 
@@ -304 +303 @@
       END DO
       
-      ! Define river runoff
-      CALL oasis_def_var (runoff_id, 'runoffo', id_part_r   , (/ 1, 0 /),   &
+      ! Define coupled river runoff using 1D array 
+      CALL oasis_def_var (runoff_id, 'runoffo', id_part_rnf_1d   , (/ 1, 0 /),   &
                      &                OASIS_In           , (/ 1, n_rivers /) , OASIS_REAL, nerror )
       IF ( nerror /= OASIS_Ok ) THEN
@@ -439 +438 @@
    END SUBROUTINE cpl_rcv
    
-   SUBROUTINE runoff_rcv( kstep)
-      
-      INTEGER                   , INTENT(in   ) ::   kstep     ! ocean time-step in seconds
-      
-      INTEGER  ::   kinfo                  ! OASIS3 info argument    
-      REAL(wp) ::   runoff(n_rivers)             ! River runoff. One value per river.
-   
-      ! Get the river runoff sent by the atmosphere
-      CALL oasis_get ( runoff_id, kstep, runoff, kinfo )
-      ! IF ( narea == 1 ) THEN
-         WRITE(numout,*)' narea = ', narea
-         WRITE(numout,*)' kstep = ', kstep
-         WRITE(numout,*)' River runoff = ', runoff
-         WRITE(numout,*)' kinfo = ', kinfo
-         WRITE(numout,*)'-------'
-      ! ENDIF
-   
-   
-   END SUBROUTINE runoff_rcv
-
-
    INTEGER FUNCTION cpl_freq( cdfieldname )  
       !!---------------------------------------------------------------------