Changeset 9313 for branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_rnf_1d.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_rnf_1d.F90 (modified) (7 diffs)

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

@@ -22 +22 @@
    USE dom_oce         ! Domain sizes (for grid box area e1e2t)
    USE sbc_oce         ! Surface boundary condition: ocean fields
-   USE cpl_oasis3      ! Coupling information (for n_rivers and runoff_id)
    
    IMPLICIT NONE
@@ -36 +35 @@
    
    TYPE(RIVERS_DATA), PUBLIC, TARGET :: rivers  !: River data
+   
+   INTEGER, PUBLIC            :: nn_cpl_river   ! Maximum number of rivers being passed through the coupler
+   INTEGER, PUBLIC            :: runoff_id      ! OASIS coupling id used in oasis_get command
    
 CONTAINS
@@ -57 +59 @@
       REAL(wp), POINTER, DIMENSION(:,:)         ::   river_number        ! 2D array containing the river outflow numbers
       
-      NAMELIST/nam_cpl_rnf_1d/file_riv_number
+      NAMELIST/nam_cpl_rnf_1d/file_riv_number, nn_cpl_river
       !!----------------------------------------------------------------------
 
@@ -114 +116 @@
       
       ! Get the area of each river outflow
-      ALLOCATE( rivers%river_area( n_rivers ) )
+      ALLOCATE( rivers%river_area( nn_cpl_river ) )
       rivers%river_area(:) = 0.0
       DO ii = 1, jpi
         DO jj = 1, jpj
-          IF ( rivers%river_number(ii,jj) > 0 .AND. rivers%river_number(ii,jj) <= n_rivers ) THEN
+          IF ( rivers%river_number(ii,jj) > 0 .AND. rivers%river_number(ii,jj) <= nn_cpl_river ) THEN
             rivers%river_area(rivers%river_number(ii,jj)) = rivers%river_area(rivers%river_number(ii,jj)) + e1e2t(ii,jj)
           END IF
@@ -125 +127 @@
       
       ! Use mpp_sum to add together river areas on other processors
-      CALL mpp_sum( rivers%river_area, n_rivers )
+      CALL mpp_sum( rivers%river_area, nn_cpl_river )
       WRITE(numout,*) 'Area of river number 1 is ',rivers%river_area(1)
       WRITE(numout,*) 'Area of river number 10 is ',rivers%river_area(10)
@@ -147 +149 @@
       
       INTEGER  ::   kinfo                  ! OASIS3 info argument    
-      REAL(wp) ::   runoff_1d(n_rivers)    ! River runoff. One value per river.
+      REAL(wp) ::   runoff_1d(nn_cpl_river)    ! River runoff. One value per river.
       INTEGER  ::   ii, jj                 ! Loop indices
       LOGICAL  ::   llaction               ! Has the get worked?
@@ -180 +182 @@
         DO ii = 1, jpi
           DO jj = 1, jpj
-            IF ( rivers%river_number(ii,jj) > 0 .AND. rivers%river_number(ii,jj) <= n_rivers ) THEN
+            IF ( rivers%river_number(ii,jj) > 0 .AND. rivers%river_number(ii,jj) <= nn_cpl_river ) THEN
               rnf(ii,jj) = runoff_1d(rivers%river_number(ii,jj)) / rivers%river_area(rivers%river_number(ii,jj))
             ELSE