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

Timestamp:

2018-02-08T15:41:43+01:00 (6 years ago)

Author:

dancopsey

Message:

Changed number of rivers to be nn_cpl_river which is fed in from the nam_cpl_rnf_1d namelist. Made new scheme turn on and off by setting sn_rcv_rnf%cldes = 'coupled1d'

File:

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

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

@@ -31 +31 @@
    USE in_out_manager               ! I/O manager
    USE lbclnk                       ! ocean lateral boundary conditions (or mpp link)
+   USE cpl_rnf_1d, ONLY: nn_cpl_river, runoff_id   ! Variables used in 1D river outflow
 
    IMPLICIT NONE
@@ -68 +69 @@
    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 in coupled runoff using 1D array
-   
-   INTEGER, PUBLIC :: runoff_id
+   
+   
    
    TYPE, PUBLIC ::   FLD_CPL               !: Type for coupling field information
@@ -206 +206 @@
       paral(1) = 0                                              ! serial partitioning
       paral(2) = 0   
-      paral(3) = n_rivers                                       ! size of array to couple
+      paral(3) = nn_cpl_river                                       ! size of array to couple
       paral(4) = 0
       paral(5) = 0
       
-      CALL oasis_def_partition ( id_part_rnf_1d, paral, nerror, n_rivers )
+      CALL oasis_def_partition ( id_part_rnf_1d, paral, nerror, nn_cpl_river )
       
       ! ... Announce send variables. 
@@ -305 +305 @@
       ! 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 )
+                     &                OASIS_In           , (/ 1, nn_cpl_river /) , OASIS_REAL, nerror )
       IF ( nerror /= OASIS_Ok ) THEN
           WRITE(numout,*) 'Failed to define transient runoffo'