Changeset 15410 for NEMO/branches/2020/ticket2487/src/OCE/SBC/sbcmod.F90

Timestamp:

2021-10-20T11:10:59+02:00 (3 years ago)

Author:

smueller

Message:

Synchronizing with ^{/NEMO/releases/r4.0/r4.0-HEAD@15405 (ticket #2487)}

Location:

NEMO/branches/2020/ticket2487

Files:

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

NEMO/branches/2020/ticket2487

@@ -4 +4 @@
 ^/utils/tools_r4.0-HEAD@14974   tools
 ^/vendors/AGRIF/stable@14105    ext/AGRIF
-^/vendors/FCM@10134             ext/FCM
+^/vendors/FCM@15268             ext/FCM
 ^/vendors/IOIPSL@9655           ext/IOIPSL
 

@@ -4 +4 @@
 ^/utils/tools_r4.0-HEAD@14974   tools
 ^/vendors/AGRIF/stable@14105    ext/AGRIF
-^/vendors/FCM@10134             ext/FCM
+^/vendors/FCM@15268             ext/FCM
 ^/vendors/IOIPSL@9655           ext/IOIPSL
 

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

@@ -449 +449 @@
       IF( ln_mixcpl )          CALL sbc_cpl_rcv   ( kt, nn_fsbc, nn_ice )   ! forced-coupled mixed formulation after forcing
       !
-      IF ( ln_wave .AND. (ln_tauwoc .OR. ln_tauw) ) CALL sbc_wstress( )      ! Wind stress provided by waves 
+      IF ( ln_wave .AND. (ln_tauwoc .OR. ln_tauw) ) CALL sbc_wstress( )       ! Wind stress provided by waves 
+      !
+      IF( ln_icebergs ) THEN  ! save pure wind stresses (with no ice-ocean stress) to be used by icebergs
+         utau_icb(:,:) = utau(:,:) ; vtau_icb(:,:) = vtau(:,:)
+      ENDIF 
       !
       !                                            !==  Misc. Options  ==!

@@ -4 +4 @@
 ^/utils/tools_r4.0-HEAD@14974   tools
 ^/vendors/AGRIF/stable@14105    ext/AGRIF
-^/vendors/FCM@10134             ext/FCM
+^/vendors/FCM@15268             ext/FCM
 ^/vendors/IOIPSL@9655           ext/IOIPSL