Changeset 12731 for NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/DOM/domain.F90

Timestamp:

2020-04-09T19:30:08+02:00 (4 years ago)

Author:

techene

Message:

replace h. and gde. in case key_qco is activated - quick and dirty

File:

• NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/DOM/domain.F90 (modified) (5 diffs)

NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/DOM/domain.F90

@@ -149 +149 @@
       CALL dom_msk( ik_top, ik_bot )    ! Masks
       !
-      ht_0(:,:) = 0._wp  ! Reference ocean thickness
+!!st      ht_0(:,:) = 0._wp  ! Reference ocean thickness
       hu_0(:,:) = 0._wp
       hv_0(:,:) = 0._wp
@@ -166 +166 @@
 
       !
+#if defined key_qco
+      !           !==  initialisation of time varying coordinate  ==!   Quasi-Euerian coordinate case
+      !
+      IF( .NOT.l_offline )   CALL dom_qe_init( Kbb, Kmm, Kaa )
+      !
+      IF( ln_linssh )        CALL ctl_stop('STOP','domain: key_qco and ln_linssh = T are incompatible')
+      !
+#else
       !           !==  time varying part of coordinate system  ==!
       !
@@ -176 +184 @@
             gde3w(:,:,:)    = gde3w_0(:,:,:)    ! = gdept as the sum of e3t
          !
-#if defined key_qco
-         !  Quasi-Euerian coordinate : no initialisation of e3. scale factors
-#else
          DO jt = 1, jpt                         ! vertical scale factors
             e3t(:,:,:,jt) =  e3t_0(:,:,:)
@@ -189 +194 @@
             e3f(:,:,:)    =  e3f_0(:,:,:)
          !
-#endif
-         !
          DO jt = 1, jpt                         ! water column thickness and its inverse
             hu(:,:,jt)    =    hu_0(:,:)
@@ -201 +204 @@
       ELSE                       != time varying : initialize before/now/after variables
          !
-#if defined key_qco
-         IF( .NOT.l_offline )   CALL dom_qe_init( Kbb, Kmm, Kaa )
-#else
          IF( .NOT.l_offline )   CALL dom_vvl_init( Kbb, Kmm, Kaa )
+         !
+      ENDIF
 #endif
-         !
-      ENDIF
+
       !
       IF( lk_c1d         )   CALL cor_c1d       ! 1D configuration: Coriolis set at T-point