Changeset 12172 for NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC

Timestamp:

2019-12-11T10:55:06+01:00 (5 years ago)

Author:

cetlod

Message:

dev_merge_option2 : merge in ENHANCE-03_closea branch

Location:

NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC

Files:

• sbcclo.F90 (copied) (copied from NEMO/branches/2019/ENHANCE-03_closea/src/OCE/SBC/sbcclo.F90)
• sbcmod.F90 (modified) (4 diffs)
• sbcrnf.F90 (modified) (1 diff)

NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcmod.F90

@@ -25 +25 @@
    USE oce            ! ocean dynamics and tracers
    USE dom_oce        ! ocean space and time domain
+   USE closea         ! closed seas
    USE phycst         ! physical constants
    USE sbc_oce        ! Surface boundary condition: ocean fields
@@ -41 +42 @@
    USE sbccpl         ! surface boundary condition: coupled formulation
    USE cpl_oasis3     ! OASIS routines for coupling
+   USE sbcclo         ! surface boundary condition: closed sea correction
    USE sbcssr         ! surface boundary condition: sea surface restoring
    USE sbcrnf         ! surface boundary condition: runoffs
@@ -336 +338 @@
       !                       !**  associated modules : initialization
       !
+      IF( l_sbc_clo   )   CALL sbc_clo_init            ! closed sea surface initialisation
+      !
                           CALL sbc_ssm_init            ! Sea-surface mean fields initialization
       !
@@ -472 +476 @@
       ! Special treatment of freshwater fluxes over closed seas in the model domain
       ! Should not be run if ln_diurnal_only
-      IF( l_sbc_clo .AND. (.NOT. ln_diurnal_only) )   CALL sbc_clo( kt )   
+      IF( l_sbc_clo      )   CALL sbc_clo( kt )   
 
 !!$!RBbug do not understand why see ticket 667

NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcrnf.F90

@@ -20 +20 @@
    USE sbc_oce        ! surface boundary condition variables
    USE eosbn2         ! Equation Of State
-   USE closea         ! closed seas
+   USE closea, ONLY: l_clo_rnf, clo_rnf ! closed seas
    !
    USE in_out_manager ! I/O manager