Changeset 5862 for branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

Timestamp:

2015-11-05T15:03:28+01:00 (8 years ago)

Author:

gm

Message:

#1613: vvl by default: non-vvl: initialize _b,n,a scale factors with _0 arrays

File:

• branches/2015/dev_r5836_NOC3_vvl_by_default/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) (2 diffs)

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

@@ -83 +83 @@
       ENDIF
       !
-      !              !==  Reference coordinate system  ==!
+      !                       !==  Reference coordinate system  ==!
       !
                      CALL dom_nam               ! read namelist ( namrun, namdom )
@@ -101 +101 @@
       END DO
       !
-      !              !==  time varying part of coordinate system  ==!
-      !
-      IF( lk_vvl ) THEN                         ! time varying : initialize before/now/after variables
-         CALL dom_vvl_init 
-         !
-      ELSE                                      ! 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
-         gdepw_b = gdepw_0   ;   gdepw_n = gdepw_0   !        ---          !
-                                 gde3w_n = gde3w_0   !        ---          !
+      IF( lk_vvl ) THEN       !==  time varying coordinate system  ==!
+         !
+         CALL dom_vvl_init                      ! set before/now/after variables
+         !
+      ELSE                    !==  Fix in time  ==!   set everything to the reference one for all
+         !
+         !       before        !          now          !       after         !
+         ;  gdept_b = gdept_0  ;   gdept_n = gdept_0   !        ---          ! depth of grid-points
+         ;  gdepw_b = gdepw_0  ;   gdepw_n = gdepw_0   !        ---          !
+         ;                     ;   gde3w_n = gde3w_0   !        ---          !
          !                                                                  
-           e3t_b =   e3t_0   ;     e3t_n =   e3t_0   ;   e3t_a =  e3t_0    ! scale factors
-           e3u_b =   e3u_0   ;     e3u_n =   e3u_0   ;   e3u_a =  e3u_0    !
-           e3v_b =   e3v_0   ;     e3v_n =   e3u_0   ;   e3v_a =  e3v_0    !
-                             ;     e3f_n =   e3f_0   !        ---          !
-           e3w_b =   e3w_0   ;     e3w_n =   e3w_0   !        ---          !
-          e3uw_b =  e3uw_0   ;    e3uw_n =  e3uw_0   !        ---          !
-          e3vw_b =  e3vw_0   ;    e3vw_n =  e3vw_0   !        ---          !
-         !
-         !                                            ! 
+         ;    e3t_b =   e3t_0  ;     e3t_n =   e3t_0   ;   e3t_a =  e3t_0    ! scale factors
+         ;    e3u_b =   e3u_0  ;     e3u_n =   e3u_0   ;   e3u_a =  e3u_0    !
+         ;    e3v_b =   e3v_0  ;     e3v_n =   e3v_0   ;   e3v_a =  e3v_0    !
+         ;                     ;     e3f_n =   e3f_0   !        ---          !
+         ;    e3w_b =   e3w_0  ;     e3w_n =   e3w_0   !        ---          !
+         ;   e3uw_b =  e3uw_0  ;    e3uw_n =  e3uw_0   !        ---          !
+         ;   e3vw_b =  e3vw_0  ;    e3vw_n =  e3vw_0   !        ---          !
+         !
          CALL wrk_alloc( jpi,jpj,   z1_hu_0, z1_hv_0 )
          !
-         z1_hu_0(:,:) = 1._wp / ( hu_0(:,:) + 1._wp - umask_i(:,:) ) * umask_i(:,:)    ! _i mask due to ISF
-         z1_hv_0(:,:) = 1._wp / ( hv_0(:,:) + 1._wp - vmask_i(:,:) ) * vmask_i(:,:)
-         !
-         !        before       !         now         !       after         !
-         ;                     ;     ht_n =    hu_0  ;    ht_a =    hu_0   ! water column thickness
-         ;     hu_b =    hu_0  ;     hu_n =    hu_0  ;    hu_a =    hu_0   ! 
-         ;     hv_b =    hv_0  ;     hv_n =    hv_0  ;    hv_a =    hv_0   !
-         ;  r1_hu_b = z1_hu_0  ;  r1_hu_n = z1_hu_0  ; r1_hu_a = z1_hu_0   ! inverse of water column thickness
-         ;  r1_hv_b = z1_hv_0  ;  r1_hv_n = z1_hv_0  ; r1_hv_a = z1_hv_0   !
+         z1_hu_0(:,:) = umask_i(:,:) / ( hu_0(:,:) + 1._wp - umask_i(:,:) )     ! _i mask due to ISF
+         z1_hv_0(:,:) = vmask_i(:,:) / ( hv_0(:,:) + 1._wp - vmask_i(:,:) )
+         !
+         !        before       !          now          !       after         !
+         ;                     ;      ht_n =    ht_0   !                     ! water column thickness
+         ;     hu_b =    hu_0  ;      hu_n =    hu_0   ;    hu_a =    hu_0   ! 
+         ;     hv_b =    hv_0  ;      hv_n =    hv_0   ;    hv_a =    hv_0   !
+         ;  r1_hu_b = z1_hu_0  ;   r1_hu_n = z1_hu_0   ; r1_hu_a = z1_hu_0   ! inverse of water column thickness
+         ;  r1_hv_b = z1_hv_0  ;   r1_hv_n = z1_hv_0   ; r1_hv_a = z1_hv_0   !
          !
          CALL wrk_dealloc( jpi,jpj,   z1_hu_0, z1_hv_0 )