Changeset 2435 for branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.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/OPA_SRC/ASM/asminc.F90 (modified) (2 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

@@ -30 +30 @@
    USE iom              ! Library to read input files
    USE asmpar           ! Parameters for the assmilation interface
-#if defined key_c1d
-   USE c1d, ONLY :   lk_c1d    ! 1D initialization
-#endif
+   USE c1d              ! 1D initialization
 
    IMPLICIT NONE
@@ -674 +672 @@
             CALL eos( tsb, rhd, rhop )                ! Before potential and in situ densities
          
-#if ! defined key_c1d
-            IF( ln_zps ) &
+            IF( ln_zps .AND. .NOT. lk_c1d ) &
                &  CALL zps_hde( nit000, jpts, tsb,   &  ! Partial steps: before horizontal derivative
                &                gtsu, gtsv, rhd,        &  ! of T, S, rd at the bottom ocean level
                &                gru , grv )
-#endif
 
             DEALLOCATE( t_bkginc )