Changeset 9017 for branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/NEMO/OPA_SRC/SBC

Timestamp:

2017-12-13T15:37:41+01:00 (7 years ago)

Author:

davestorkey

Message:

UKMO/dev_r8600_closea_rewrite branch : commit code

Location:

branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

• sbcmod.F90 (modified) (3 diffs)
• sbcrnf.F90 (modified) (2 diffs)

branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -49 +49 @@
    USE bdy_oce   , ONLY: ln_bdy
    USE usrdef_sbc     ! user defined: surface boundary condition
-   USE usrdef_closea  ! user defined: closed sea
+   USE closea         ! closed sea
    !
    USE prtctl         ! Print control                    (prt_ctl routine)
@@ -153 +153 @@
          WRITE(numout,*) '         runoff / runoff mouths                     ln_rnf        = ', ln_rnf
          WRITE(numout,*) '         iceshelf formulation                       ln_isf        = ', ln_isf
-         WRITE(numout,*) '         closed sea (=0/1) (set in namdom)          nn_closea     = ', nn_closea
+         WRITE(numout,*) '         special treatment of closed seas (set in namdom)  ln_closea     = ', ln_closea
+         IF(ln_closea) WRITE(numout,*) '         closed sea treatment (=0/1) (set in namdom) nn_closea     = ', nn_closea
          WRITE(numout,*) '         nb of iterations if land-sea-mask applied  nn_lsm        = ', nn_lsm
          WRITE(numout,*) '         surface wave                               ln_wave       = ', ln_wave
@@ -446 +447 @@
       ! treatment of closed sea in the model domain   (update freshwater fluxes)
       ! Should not be ran if ln_diurnal_only
-      IF( .NOT.ln_diurnal_only .AND. nn_closea == 1 )   CALL sbc_clo( kt, cn_cfg, nn_cfg )   
+      IF( .NOT.ln_diurnal_only .AND. ln_closea .AND. nn_closea == 1 )   CALL sbc_clo( kt )   
 
 !RBbug do not understand why see ticket 667

branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -21 +21 @@
    USE sbcisf         ! PM we could remove it I think
    USE eosbn2         ! Equation Of State
-   USE usrdef_closea  ! closed seas
+   USE closea         ! closed seas
    !
    USE in_out_manager ! I/O manager
@@ -513 +513 @@
       CALL iom_close( inum )                                      ! close file
       !
-      IF( nn_closea == 1 )   CALL clo_rnf( rnfmsk )               ! closed sea inflow set as ruver mouth
+      IF( ln_closea .and. nn_closea == 1 )   CALL clo_rnf( rnfmsk )   ! closed sea inflow set as river mouth
       !
       rnfmsk_z(:)   = 0._wp                                       ! vertical structure