Changeset 15010 for NEMO/branches/2021/ticket2680_C1D_PAPA/src/OFF/dtadyn.F90

Timestamp:

2021-06-17T14:14:52+02:00 (3 years ago)

Author:

gsamson

Message:

remove cpp key 'key_c1d' and replace 'lk_c1d' by 'ln_c1d' in &namdom (#2680)

File:

• NEMO/branches/2021/ticket2680_C1D_PAPA/src/OFF/dtadyn.F90 (modified) (7 diffs)

NEMO/branches/2021/ticket2680_C1D_PAPA/src/OFF/dtadyn.F90

@@ -21 +21 @@
    !!----------------------------------------------------------------------
    USE oce             ! ocean dynamics and tracers variables
-   USE c1d             ! 1D configuration: lk_c1d
+   USE c1d             ! 1D configuration: ln_c1d
    USE dom_oce         ! ocean domain: variables
 #if defined key_qco 
@@ -135 +135 @@
       CALL fld_read( kt, 1, sf_dyn )      !=  read data at kt time step   ==!
       !
-      IF( l_ldfslp .AND. .NOT.lk_c1d )   CALL  dta_dyn_slp( kt, Kbb, Kmm )    ! Computation of slopes
+      IF( l_ldfslp .AND. .NOT.ln_c1d )   CALL  dta_dyn_slp( kt, Kbb, Kmm )    ! Computation of slopes
       !
       ts(:,:,:,jp_tem,Kmm) = sf_dyn(jf_tem)%fnow(:,:,:)  * tmask(:,:,:)    ! temperature
@@ -187 +187 @@
       avs(:,:,:)      = avt(:,:,:)
       !
-      IF( ln_trabbl .AND. .NOT.lk_c1d ) THEN       ! diffusive Bottom boundary layer param 
+      IF( ln_trabbl .AND. .NOT.ln_c1d ) THEN       ! diffusive Bottom boundary layer param 
          ahu_bbl(:,:) = sf_dyn(jf_ubl)%fnow(:,:,1) * umask(:,:,1)    ! bbl diffusive coef
          ahv_bbl(:,:) = sf_dyn(jf_vbl)%fnow(:,:,1) * vmask(:,:,1)
@@ -321 +321 @@
       END DO
       !
-      IF( l_ldfslp .AND. .NOT.lk_c1d ) THEN                  ! slopes 
+      IF( l_ldfslp .AND. .NOT.ln_c1d ) THEN                  ! slopes 
          IF( sf_dyn(jf_tem)%ln_tint ) THEN      ! time interpolation
             ALLOCATE( uslpdta (jpi,jpj,jpk,2), vslpdta (jpi,jpj,jpk,2),    &
@@ -628 +628 @@
             &    / REAL( sf_dyn(jf_tem)%nrec(2,sf_dyn(jf_tem)%naa) - sf_dyn(jf_tem)%nrec(2,sf_dyn(jf_tem)%nbb), wp )
          ztintb =  1. - ztinta
-         IF( l_ldfslp .AND. .NOT.lk_c1d ) THEN    ! Computes slopes (here avt is used as workspace)
+         IF( l_ldfslp .AND. .NOT.ln_c1d ) THEN    ! Computes slopes (here avt is used as workspace)
             uslp (:,:,:) = ztintb * uslpdta (:,:,:,1)  + ztinta * uslpdta (:,:,:,2)  
             vslp (:,:,:) = ztintb * vslpdta (:,:,:,1)  + ztinta * vslpdta (:,:,:,2)  
@@ -640 +640 @@
          CALL compute_slopes( kt, zts, zuslp, zvslp, zwslpi, zwslpj, Kbb, Kmm )
          !
-         IF( l_ldfslp .AND. .NOT.lk_c1d ) THEN    ! Computes slopes (here avt is used as workspace)
+         IF( l_ldfslp .AND. .NOT.ln_c1d ) THEN    ! Computes slopes (here avt is used as workspace)
             uslp (:,:,:) = zuslp (:,:,:)
             vslp (:,:,:) = zvslp (:,:,:)
@@ -665 +665 @@
       !!---------------------------------------------------------------------
       !
-      IF( l_ldfslp .AND. .NOT.lk_c1d ) THEN    ! Computes slopes (here avt is used as workspace)
+      IF( l_ldfslp .AND. .NOT.ln_c1d ) THEN    ! Computes slopes (here avt is used as workspace)
          CALL eos    ( pts, rhd, rhop, gdept_0(:,:,:) )
          CALL eos_rab( pts, rab_n, Kmm )       ! now local thermal/haline expension ratio at T-points