Changeset 14072 for NEMO/trunk/src/OCE/DYN/dynspg.F90

Timestamp:

2020-12-04T08:48:38+01:00 (3 years ago)

Author:

laurent

Message:

Merging branch "2020/dev_r13648_ASINTER-04_laurent_bulk_ice", ticket #2369

File:

• NEMO/trunk/src/OCE/DYN/dynspg.F90 (modified) (10 diffs)

NEMO/trunk/src/OCE/DYN/dynspg.F90

@@ -11 +11 @@
 
    !!----------------------------------------------------------------------
-   !!   dyn_spg     : update the dynamics trend with surface pressure gradient 
+   !!   dyn_spg     : update the dynamics trend with surface pressure gradient
    !!   dyn_spg_init: initialization, namelist read, and parameters control
    !!----------------------------------------------------------------------
@@ -39 +39 @@
    PUBLIC   dyn_spg_init   ! routine called by opa module
 
-   INTEGER ::   nspg = 0   ! type of surface pressure gradient scheme defined from lk_dynspg_... 
+   INTEGER ::   nspg = 0   ! type of surface pressure gradient scheme defined from lk_dynspg_...
 
    !                       ! Parameter to control the surface pressure gradient scheme
@@ -52 +52 @@
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
-   !! $Id$ 
+   !! $Id$
    !! Software governed by the CeCILL license (see ./LICENSE)
    !!----------------------------------------------------------------------
@@ -61 +61 @@
       !!                  ***  ROUTINE dyn_spg  ***
       !!
-      !! ** Purpose :   compute surface pressure gradient including the 
+      !! ** Purpose :   compute surface pressure gradient including the
       !!              atmospheric pressure forcing (ln_apr_dyn=T).
       !!
@@ -68 +68 @@
       !!              - split-explicit : a time splitting technique is used
       !!
-      !!              ln_apr_dyn=T : the atmospheric pressure forcing is applied 
+      !!              ln_apr_dyn=T : the atmospheric pressure forcing is applied
       !!             as the gradient of the inverse barometer ssh:
       !!                apgu = - 1/rho0 di[apr] = 0.5*grav di[ssh_ib+ssh_ibb]
@@ -90 +90 @@
       !
       IF( l_trddyn )   THEN                      ! temporary save of ta and sa trends
-         ALLOCATE( ztrdu(jpi,jpj,jpk) , ztrdv(jpi,jpj,jpk) ) 
+         ALLOCATE( ztrdu(jpi,jpj,jpk) , ztrdv(jpi,jpj,jpk) )
          ztrdu(:,:,:) = puu(:,:,:,Krhs)
          ztrdv(:,:,:) = pvv(:,:,:,Krhs)
@@ -144 +144 @@
                zpgv(ji,jj) = zpgv(ji,jj) + ( zpice(ji,jj+1) - zpice(ji,jj) ) * r1_e2v(ji,jj)
             END_2D
-            DEALLOCATE( zpice )         
+            DEALLOCATE( zpice )
          ENDIF
          !
@@ -160 +160 @@
          !
 !!gm add here a call to dyn_trd for ice pressure gradient, the surf pressure trends ????
-         !    
+         !
       ENDIF
       !
@@ -167 +167 @@
       CASE ( np_TS  )   ;   CALL dyn_spg_ts ( kt, Kbb, Kmm, Krhs, puu, pvv, pssh, puu_b, pvv_b, Kaa ) ! time-splitting
       END SELECT
-      !                    
+      !
       IF( l_trddyn )   THEN                  ! save the surface pressure gradient trends for further diagnostics
          ztrdu(:,:,:) = puu(:,:,:,Krhs) - ztrdu(:,:,:)
          ztrdv(:,:,:) = pvv(:,:,:,Krhs) - ztrdv(:,:,:)
          CALL trd_dyn( ztrdu, ztrdv, jpdyn_spg, kt, Kmm )
-         DEALLOCATE( ztrdu , ztrdv ) 
+         DEALLOCATE( ztrdu , ztrdv )
       ENDIF
       !                                      ! print mean trends (used for debugging)
@@ -186 +186 @@
       !!---------------------------------------------------------------------
       !!                  ***  ROUTINE dyn_spg_init  ***
-      !!                
-      !! ** Purpose :   Control the consistency between namelist options for 
+      !!
+      !! ** Purpose :   Control the consistency between namelist options for
       !!              surface pressure gradient schemes
       !!----------------------------------------------------------------------