Changeset 9156

Timestamp:

2017-12-21T16:25:13+01:00 (5 years ago)

Author:

dancopsey

Message:

Load river numbers from netcdf file in new cpl_rnf_init routine.

Location:

branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC

Files:

• SBC/cpl_oasis3.F90 (modified) (1 diff)
• SBC/cpl_rnf.F90 (added)
• nemogcm.F90 (modified) (2 diffs)

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

@@ -69 +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=10  ! Total number of rivers whose runoff is passed from the atmosphere
+   INTEGER, PUBLIC, PARAMETER ::   n_rivers=2000  ! Total number of rivers whose runoff is passed from the atmosphere
    
    INTEGER :: runoff_id

branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -53 +53 @@
    USE bdydta          ! open boundary cond. setting   (bdy_dta_init routine)
    USE bdytides        ! open boundary cond. setting   (bdytide_init routine)
+   USE cpl_rnf         ! Runoff in coupled models      (cpl_rnf_init routine)
    USE istate          ! initial state setting          (istate_init routine)
    USE ldfdyn          ! lateral viscosity setting      (ldfdyn_init routine)
@@ -397 +398 @@
       IF( lk_bdy .AND. lk_tide )   &
          &                  CALL bdytide_init   ! Open boundaries initialisation of tidal harmonic forcing
+                            CALL cpl_rnf_init   ! Runoff in coupled model
 
                             CALL dyn_nept_init  ! simplified form of Neptune effect