Changeset 5883 for branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/DOM

Timestamp:

2015-11-13T08:01:08+01:00 (9 years ago)

Author:

gm

Message:

#1613: vvl by default: TRA/TRC remove optimization associated with linear free surface

Location:

branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/DOM

Files:

• domain.F90 (modified) (2 diffs)
• domvvl.F90 (modified) (3 diffs)
• istate.F90 (modified) (2 diffs)

branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

@@ -103 +103 @@
       !              !==  time varying part of coordinate system  ==!
       !
-      IF( .NOT.ln_linssh ) THEN                 ! time varying : initialize before/now/after variables
-         !
-         CALL dom_vvl_init 
-         !
-      ELSE                                      ! Fix in time : set to the reference one for all
+      IF( ln_linssh ) THEN          ! Fix in time : set to the reference one for all
          !       before        !          now          !       after         !
          ;  gdept_b = gdept_0  ;   gdept_n = gdept_0   !        ---          ! depth of grid-points
@@ -134 +130 @@
          !
          CALL wrk_dealloc( jpi,jpj,   z1_hu_0, z1_hv_0 )
+         !
+      ELSE                         ! time varying : initialize before/now/after variables
+         !
+         CALL dom_vvl_init 
+         !
       ENDIF
       !

branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

@@ -267 +267 @@
       !! Reference  : Leclair, M., and Madec, G. 2011, Ocean Modelling.
       !!----------------------------------------------------------------------
-      REAL(wp), POINTER, DIMENSION(:,:,:) :: ze3t
-      REAL(wp), POINTER, DIMENSION(:,:  ) :: zht, z_scale, zwu, zwv, zhdiv
-      !! * Arguments
-      INTEGER, INTENT( in )                  :: kt                    ! time step
-      INTEGER, INTENT( in ), OPTIONAL        :: kcall                 ! optional argument indicating call sequence
-      !! * Local declarations
+      INTEGER, INTENT( in )           ::   kt      ! time step
+      INTEGER, INTENT( in ), OPTIONAL ::   kcall   ! optional argument indicating call sequence
+      !
       INTEGER                                :: ji, jj, jk            ! dummy loop indices
       INTEGER , DIMENSION(3)                 :: ijk_max, ijk_min      ! temporary integers
@@ -278 +275 @@
       REAL(wp)                               :: z_tmin, z_tmax        ! temporary scalars
       LOGICAL                                :: ll_do_bclinic         ! temporary logical
-      !!----------------------------------------------------------------------
+      REAL(wp), POINTER, DIMENSION(:,:,:) :: ze3t
+      REAL(wp), POINTER, DIMENSION(:,:  ) :: zht, z_scale, zwu, zwv, zhdiv
+      !!----------------------------------------------------------------------
+      !
+      IF( ln_linssh )   RETURN      ! No calculation in linear free surface
       !
       IF( nn_timing == 1 )  CALL timing_start('dom_vvl_sf_nxt')
@@ -579 +580 @@
       REAL(wp) ::   zcoef        ! local scalar
       !!----------------------------------------------------------------------
-
+      !
+      IF( ln_linssh )   RETURN      ! No calculation in linear free surface
+      !
       IF( nn_timing == 1 )  CALL timing_start('dom_vvl_sf_swp')
       !

branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90

@@ -122 +122 @@
             ENDIF
          ENDIF
-         !   
+         !
+!!gm This is to be changed !!!!
          ! - ML - sshn could be modified by istate_eel, so that initialization of e3t_b is done here
          IF( .NOT.ln_linssh ) THEN
@@ -129 +130 @@
             END DO
          ENDIF
+!!gm 
          ! 
       ENDIF