Changeset 7155

Timestamp:

2016-10-28T12:56:46+02:00 (7 years ago)

Author:

jcastill

Message:

Fix small bug (forgot to declare one variable) and some cosmetic changes

File:

• branches/UKMO/r5518_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) (3 diffs)

branches/UKMO/r5518_INGV1_WAVE-coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -242 +242 @@
          &                  sn_rcv_w10m, sn_rcv_taumod, sn_rcv_tau   , sn_rcv_dqnsdt, sn_rcv_qsr,      & 
          &                  sn_snd_ifrac, sn_snd_crtw , sn_snd_wlev  , sn_rcv_hsig  , sn_rcv_phioc ,   & 
-         &                  sn_rcv_sdrfx, sn_rcv_sdrfy, sn_rcv_wper  , sn_rcv_wstrf , sn_rcv_wdrag ,   &
-         &                  sn_rcv_qns , sn_rcv_emp   , sn_rcv_rnf   , sn_rcv_cal   , sn_rcv_iceflx,   & 
-         &                  sn_rcv_co2 , nn_cplmodel  , ln_usecplmask, sn_rcv_mslp 
+         &                  sn_rcv_sdrfx, sn_rcv_sdrfy, sn_rcv_wper  , sn_rcv_wnum  , sn_rcv_wstrf ,   &
+         &                  sn_rcv_wdrag, sn_rcv_qns  , sn_rcv_emp   , sn_rcv_rnf   , sn_rcv_cal   ,   &
+         &                  sn_rcv_iceflx,sn_rcv_co2  , nn_cplmodel  , ln_usecplmask, sn_rcv_mslp 
       !!---------------------------------------------------------------------
       !
@@ -287 +287 @@
          WRITE(numout,*)'      significant wave heigth         = ', TRIM(sn_rcv_hsig%cldes  ), ' (', TRIM(sn_rcv_hsig%clcat  ), ')' 
          WRITE(numout,*)'      wave to oce energy flux         = ', TRIM(sn_rcv_phioc%cldes ), ' (', TRIM(sn_rcv_phioc%clcat ), ')' 
+         WRITE(numout,*)'      Surface Stokes drift grid u     = ', TRIM(sn_rcv_sdrfx%cldes ), ' (', TRIM(sn_rcv_sdrfx%clcat ), ')' 
+         WRITE(numout,*)'      Surface Stokes drift grid v     = ', TRIM(sn_rcv_sdrfy%cldes ), ' (', TRIM(sn_rcv_sdrfy%clcat ), ')' 
+         WRITE(numout,*)'      Mean wave period                = ', TRIM(sn_rcv_wper%cldes  ), ' (', TRIM(sn_rcv_wper%clcat  ), ')' 
+         WRITE(numout,*)'      Mean wave number                = ', TRIM(sn_rcv_wnum%cldes  ), ' (', TRIM(sn_rcv_wnum%clcat  ), ')' 
+         WRITE(numout,*)'      Stress frac adsorbed by waves   = ', TRIM(sn_rcv_wstrf%cldes ), ' (', TRIM(sn_rcv_wstrf%clcat ), ')' 
+         WRITE(numout,*)'      Neutral surf drag coefficient   = ', TRIM(sn_rcv_wdrag%cldes ), ' (', TRIM(sn_rcv_wdrag%clcat ), ')' 
          WRITE(numout,*)'  sent fields (multiple ice categories)'
          WRITE(numout,*)'      surface temperature             = ', TRIM(sn_snd_temp%cldes  ), ' (', TRIM(sn_snd_temp%clcat  ), ')'
@@ -1121 +1127 @@
       END IF 
       !
+      IF( ln_sdw ) THEN  ! Stokes Drift correction activated
       !                                                      ! ========================= ! 
       !                                                      !       Stokes drift u      !
       !                                                      ! ========================= ! 
-      IF( srcv(jpr_sdrftx)%laction .AND. ln_sdw ) zusd2dt(:,:) = frcv(jpr_sdrftx)%z3(:,:,1)
+         IF( srcv(jpr_sdrftx)%laction ) zusd2dt(:,:) = frcv(jpr_sdrftx)%z3(:,:,1)
       !
       !                                                      ! ========================= ! 
       !                                                      !       Stokes drift v      !
       !                                                      ! ========================= ! 
-      IF( srcv(jpr_sdrfty)%laction .AND. ln_sdw ) zvsd2dt(:,:) = frcv(jpr_sdrfty)%z3(:,:,1)
+         IF( srcv(jpr_sdrfty)%laction ) zvsd2dt(:,:) = frcv(jpr_sdrfty)%z3(:,:,1)
       !
       !                                                      ! ========================= ! 
       !                                                      !      Wave mean period     !
       !                                                      ! ========================= ! 
-      IF( srcv(jpr_wper)%laction .AND. ln_sdw ) wmp(:,:) = frcv(jpr_wper)%z3(:,:,1)
+         IF( srcv(jpr_wper)%laction ) wmp(:,:) = frcv(jpr_wper)%z3(:,:,1)
       !
       !                                                      ! ========================= ! 
       !                                                      !  Significant wave height  !
       !                                                      ! ========================= ! 
-      IF( srcv(jpr_hsig)%laction .AND. ln_sdw ) swh(:,:) = frcv(jpr_hsig)%z3(:,:,1)
+         IF( srcv(jpr_hsig)%laction ) swh(:,:) = frcv(jpr_hsig)%z3(:,:,1)
       !
       !                                                      ! ========================= ! 
       !                                                      !    Vertical mixing Qiao   !
       !                                                      ! ========================= ! 
-      IF( srcv(jpr_wnum)%laction .AND. ln_sdw .AND. ln_zdfqiao ) THEN
-         wnum(:,:) = frcv(jpr_wnum)%z3(:,:,1)
-      ENDIF
-
-      ! Calculate the 3D Stokes drift
-      IF( ln_sdw ) THEN
+         IF( srcv(jpr_wnum)%laction .AND. ln_zdfqiao ) wnum(:,:) = frcv(jpr_wnum)%z3(:,:,1)
+
+         ! Calculate the 3D Stokes drift both in coupled and not fully uncoupled mode
          IF( srcv(jpr_sdrftx)%laction .OR. srcv(jpr_sdrfty)%laction .OR. srcv(jpr_wper)%laction &
                                                                     .OR. srcv(jpr_hsig)%laction ) THEN