Changeset 13694 for NEMO/branches/2020/r12377_ticket2386/src/OCE/SBC/sbcmod.F90

Timestamp:

2020-10-28T18:03:31+01:00 (3 years ago)

Author:

andmirek

Message:

Ticket #2386: merge with trunk rev 13688

Location:

NEMO/branches/2020/r12377_ticket2386

Files:

• . (modified) (1 prop)
• src/OCE/SBC/sbcmod.F90 (modified) (2 diffs)

NEMO/branches/2020/r12377_ticket2386

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@13507        sette
+^/utils/CI/sette@13559        sette

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@13507        sette
+^/utils/CI/sette@13559        sette

NEMO/branches/2020/r12377_ticket2386/src/OCE/SBC/sbcmod.F90

@@ -252 +252 @@
       sfx   (:,:) = 0._wp           !* salt flux due to freezing/melting
       fmmflx(:,:) = 0._wp           !* freezing minus melting flux
+      cloud_fra(:,:) = pp_cldf      !* cloud fraction over sea ice (used in si3)
 
       taum(:,:) = 0._wp             !* wind stress module (needed in GLS in case of reduced restart)
@@ -336 +337 @@
       IF( l_sbc_clo   )   CALL sbc_clo_init              ! closed sea surface initialisation
       !
-      IF( ln_blk      )   CALL sbc_blk_init            ! bulk formulae initialization
-
-      IF( ln_abl      )   CALL sbc_abl_init            ! Atmospheric Boundary Layer (ABL)
-
-      IF( ln_ssr      )   CALL sbc_ssr_init            ! Sea-Surface Restoring initialization
+      IF( ln_blk      )   CALL sbc_blk_init              ! bulk formulae initialization
+
+      IF( ln_abl      )   CALL sbc_abl_init              ! Atmospheric Boundary Layer (ABL)
+
+      IF( ln_ssr      )   CALL sbc_ssr_init              ! Sea-Surface Restoring initialization
       !
       !

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@13507        sette
+^/utils/CI/sette@13559        sette