Changeset 4962

Timestamp:

2014-12-02T16:56:42+01:00 (9 years ago)

Author:

rblod

Message:

dev_r4822_INGV_WAVE: stokes-coriolis

Location:

branches/2014/dev_r4822_INGV_WAVE/NEMOGCM/NEMO/OPA_SRC

Files:

• DYN/dynspg_ts.F90 (modified) (1 diff)
• DYN/dynstcor.F90 (added)
• SBC/sbcwave.F90 (modified) (4 diffs)
• step.F90 (modified) (2 diffs)
• step_oce.F90 (modified) (2 diffs)

branches/2014/dev_r4822_INGV_WAVE/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -405 +405 @@
          zv_frc(:,:) =  zv_frc(:,:) + zraur * z1_2 * ( vtau_b(:,:) + vtau(:,:) ) * hvr(:,:)
       ENDIF  
+
+      ! Add Stokes Coriolis if defined
+      IF ( ln_stcor ) THEN
+         DO jj = 1, jpjm1
+            DO ji = 1, fs_jpim1   ! vector opt.
+
+               zy1 = ff(ji  ,jj-1) * ( vsd2d(ji  ,jj-1) + vsd2d(ji+1,jj-1) )
+               zy2 = ff(ji  ,jj  ) * ( vsd2d(ji  ,jj  ) + vsd2d(ji+1,jj  ) )
+               zx1 = ff(ji-1,jj  ) * ( usd2d(ji-1,jj  ) + usd2d(ji-1,jj+1) )
+               zx2 = ff(ji  ,jj  ) * ( usd2d(ji  ,jj  ) + usd2d(ji  ,jj+1) )
+
+               zu_frc(ji,jj) = zu_frc(ji,jj) + 0.25 * ( zy1 + zy2 ) * hur(ji,jj)
+               zv_frc(ji,jj) = zv_frc(ji,jj) - 0.25 * ( zx1 + zx2 ) * hvr(ji,jj)
+           END DO
+         END DO
+      ENDIF
+
       !
       IF ( ln_apr_dyn ) THEN                    ! Add atm pressure forcing

branches/2014/dev_r4822_INGV_WAVE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90

@@ -40 +40 @@
    REAL(wp),PUBLIC,ALLOCATABLE,DIMENSION (:,:)       :: usd2dt,vsd2dt,tsd2d
    REAL(wp),PUBLIC,ALLOCATABLE,DIMENSION (:,:,:)     :: usd3d,vsd3d,wsd3d 
+   LOGICAL, PUBLIC :: ln_stcor = .FALSE.
 
    !! * Substitutions
@@ -85 +86 @@
                              &   sn_swh, sn_wmp, sn_wnum         ! informations about the fields to be read
       !!---------------------------------------------------------------------
-      NAMELIST/namsbc_wave/  sn_cdg, cn_dir, sn_usd, sn_vsd, sn_swh, sn_wmp, sn_wnum
+      NAMELIST/namsbc_wave/  sn_cdg, cn_dir, sn_usd, sn_vsd, sn_swh, sn_wmp, sn_wnum, ln_stcor
       !!---------------------------------------------------------------------
 
@@ -169 +170 @@
             END DO
          END DO
+         !
+         CALL lbc_lnk( usd2d(:,:), 'U', -1. )
+         CALL lbc_lnk( vsd2d(:,:), 'V', -1. )
+
           !Computation of the 3d Stokes Drift according to Breivik et al.,2014
           !(DOI: 10.1175/JPO-D-14-0020.1)
@@ -204 +209 @@
                 END DO
              END DO
-
           END DO
+         !
+         CALL lbc_lnk( usd3d(:,:,:), 'U', -1. )
+         CALL lbc_lnk( vsd3d(:,:,:), 'V', -1. )
+
 
           CALL wrk_alloc( jpi,jpj,jpk,udummy,vdummy,hdivdummy,rotdummy)

branches/2014/dev_r4822_INGV_WAVE/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -199 +199 @@
                                   CALL dyn_ldf      ( kstp )   ! lateral mixing
           IF( ln_neptsimp )       CALL dyn_nept_cor ( kstp )   ! add Neptune velocities (simplified)
+          IF( ln_stcor    )       CALL dyn_stcor    ( kstp )   ! Stokes-Coriolis forcing
+
 #if defined key_agrif
           IF(.NOT. Agrif_Root())  CALL Agrif_Sponge_dyn        ! momentum sponge
@@ -301 +303 @@
                                CALL dyn_ldf( kstp )         ! lateral mixing
         IF( ln_neptsimp )      CALL dyn_nept_cor( kstp )    ! add Neptune velocities (simplified)
+        IF( ln_stcor    )       CALL dyn_stcor    ( kstp )   ! Stokes-Coriolis forcing (ln_stcor set in SBC/sbc_oce.F90)
+
 #if defined key_agrif
         IF(.NOT. Agrif_Root()) CALL Agrif_Sponge_dyn        ! momemtum sponge

branches/2014/dev_r4822_INGV_WAVE/NEMOGCM/NEMO/OPA_SRC/step_oce.F90

@@ -27 +27 @@
    USE cpl_oasis3, ONLY : lk_cpl
    USE sbctide          ! Tide initialisation
+   USE sbcwave          ! Wave intialisation
 
    USE traqsr           ! solar radiation penetration      (tra_qsr routine)
@@ -51 +52 @@
    USE dynspg           ! surface pressure gradient        (dyn_spg routine)
    USE dynnept          ! simp. form of Neptune effect(dyn_nept_cor routine)
+   USE dynstcor         ! simp. form of Stokes-Coriolis
 
    USE dynnxt           ! time-stepping                    (dyn_nxt routine)