Changeset 2435 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90

Timestamp:

2010-11-25T17:33:31+01:00 (13 years ago)

Author:

cetlod

Message:

Improve the 1D vertical configuration in v3.3beta

File:

• branches/nemo_v3_3_beta/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) (8 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90

@@ -26 +26 @@
    USE zpshde
    USE lib_mpp         ! distributed memory computing library
+   USE c1d
 
    IMPLICIT NONE
@@ -183 +184 @@
          ENDIF
          
-         IF( lk_ldfslp ) THEN
+         IF( lk_ldfslp .AND. .NOT. lk_c1d ) THEN
             ! Computes slopes. Caution : here tsn and avt are used as workspace
             tsn (:,:,:,jp_tem) = tdta  (:,:,:,2)
@@ -210 +211 @@
          CALL dynrea( kt, iper )    ! data read for the iper period
          
-         IF( lk_ldfslp ) THEN
+         IF( lk_ldfslp .AND. .NOT. lk_c1d ) THEN
             ! Computes slopes. Caution : here tsn and avt are used as workspace
             tsn (:,:,:,jp_tem) = tdta  (:,:,:,2)
@@ -256 +257 @@
          CALL dynrea( kt, iper )    ! data read for the iper period
 
-         IF( lk_ldfslp ) THEN
+         IF( lk_ldfslp .AND. .NOT. lk_c1d ) THEN
             ! Computes slopes. Caution : here tsn and avt are used as workspace
             tsn (:,:,:,jp_tem) = tdta  (:,:,:,2)
@@ -313 +314 @@
 
       ! Compute bbl coefficients if needed
-      IF( lk_trabbl ) THEN
+      IF( lk_trabbl .AND. .NOT. lk_c1d ) THEN
          tsb(:,:,:,:) = tsn(:,:,:,:)
          CALL bbl( kt, 'TRC')
@@ -682 +683 @@
       wdta   (:,:,:,1) = wdta   (:,:,:,2)
 
-#if defined key_ldfslp
+#if defined key_ldfslp && ! defined key_c1d
       uslpdta (:,:,:,1) = uslpdta (:,:,:,2)
       vslpdta (:,:,:,1) = vslpdta (:,:,:,2)
@@ -733 +734 @@
 
       
-#if defined key_ldfslp
+#if defined key_ldfslp && ! defined key_c1d
       uslp (:,:,:) = uslpdta (:,:,:,2) 
       vslp (:,:,:) = vslpdta (:,:,:,2) 
@@ -794 +795 @@
 
       
-#if defined key_ldfslp
+#if defined key_ldfslp && ! defined key_c1d
       uslp (:,:,:) = zweighm1 * uslpdta (:,:,:,1) + pweigh * uslpdta (:,:,:,2) 
       vslp (:,:,:) = zweighm1 * vslpdta (:,:,:,1) + pweigh * vslpdta (:,:,:,2)