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

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

@@ -43 +43 @@
    USE eosbn2
    USE sbcrnf   , ONLY : l_rnfcpl
-   USE cpl_rnf_1d, ONLY : cpl_rnf_1D_rcv      ! Coupled runoff using 1D array
+   USE cpl_rnf_1d      ! Coupled runoff using 1D array
 #if defined key_cpl_carbon_cycle
    USE p4zflx, ONLY : oce_co2
@@ -762 +762 @@
          ENDIF
       ENDIF
+      
+      ! Initialise 1D river outflow scheme
+      nn_cpl_river = 1
+      IF ( TRIM( sn_rcv_rnf%cldes ) == 'coupled1d' ) CALL cpl_rnf_1d_init   ! Coupled runoff using 1D array
 
       !
@@ -1072 +1076 @@
          !                                                        ! runoffs and calving (added in emp)
          IF( srcv(jpr_rnf)%laction )     rnf(:,:) = frcv(jpr_rnf)%z3(:,:,1)               
-         CALL cpl_rnf_1d_rcv( isec)
+         IF ( TRIM( sn_rcv_rnf%cldes ) == 'coupled1d' )         CALL cpl_rnf_1d_rcv( isec)
          IF( srcv(jpr_cal)%laction )     zemp(:,:) = zemp(:,:) - frcv(jpr_cal)%z3(:,:,1)