Changeset 8756 for branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

Timestamp:

2017-11-20T17:28:07+01:00 (6 years ago)

Author:

jcastill

Message:

Changes for receiving the ocean wind stress components from a wave model, both in forced and coupled mode
WARNING: this might not work properly without merging the branch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/UKMO/AMM15_v3_6_STABLE_package_UKEP

File:

• branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) (1 diff)

branches/UKMO/r6232_HZG_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -376 +376 @@
       IF( ln_mixcpl .OR. ln_wavcpl )  CALL sbc_cpl_rcv ( kt, nn_fsbc, nn_ice )   ! forced-coupled mixed formulation after forcing
 
-      IF ( ln_wave .AND. ln_tauoc) THEN                 ! Wave stress subctracted 
-            utau(:,:) = utau(:,:)*tauoc_wave(:,:) 
-            vtau(:,:) = vtau(:,:)*tauoc_wave(:,:) 
-            taum(:,:) = taum(:,:)*tauoc_wave(:,:) 
-      ! 
-            SELECT CASE( nsbc ) 
-            CASE(  0,1,2,3,5,-1 )  ; 
-                IF(lwp .AND. kt == nit000 ) THEN
-                   write(numout,*)
-                   WRITE(numout,*) 'WARNING: You are subtracting the wave stress to the ocean. & 
-                                                      & If not requested select ln_tauoc=.false' 
-                   write(numout,*)
-                END IF
-            END SELECT 
-      ! 
-      END IF
+      IF ( ln_wave .AND. (ln_tauoc .OR. ln_tauw) ) CALL sbc_stress( )   ! Wave stress update 
 
       !                                            !==  Misc. Options  ==!