Changeset 2218

Timestamp:

2010-10-12T14:41:25+02:00 (14 years ago)

Author:

rblod

Message:

Fix some 1D issues on DEV_r2191_3partymerge2010

Location:

branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC

Files:

• ASM/asminc.F90 (modified) (2 diffs)
• opa.F90 (modified) (3 diffs)

branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/ASM/asminc.F90

@@ -40 +40 @@
       & umask,  &
       & vmask
+#if defined key_c1d
    USE c1d, ONLY : &    ! 1D initialization
       & lk_c1d
+#endif
    USE oce, ONLY : &      ! Dynamics and active tracers defined in memory
       & ub, un, ua,    &
@@ -775 +777 @@
             CALL eos( tb, sb, rhd, rhop )                ! Before potential and in situ densities
          
-            IF( ln_zps .AND. .NOT. lk_c1d ) &
+#if ! defined key_c1d
+            IF( ln_zps ) &
                &  CALL zps_hde( nit000, tb, sb, rhd,  &  ! Partial steps: before horizontal derivative
                &                gtu, gsu, gru,        &  ! of T, S, rd at the bottom ocean level
                &                gtv, gsv, grv )
+#endif
 
             DEALLOCATE( t_bkginc )

branches/DEV_r2191_3partymerge2010/NEMO/OPA_SRC/opa.F90

@@ -67 +67 @@
    USE dynspg_oce      ! Control choice of surface pressure gradient schemes
    USE prtctl          ! Print control                 (prt_ctl_init routine)
+#if defined key_c1d
    USE c1d             ! 1D configuration
    USE dyncor_c1d      ! Coriolis factor at T-point
    USE step_c1d        ! Time stepping loop for the 1D configuration
+#endif
 #if defined key_top
    USE trcini          ! passive tracer initialisation
@@ -132 +134 @@
       !                            !-----------------------!
       istp = nit000
-      IF( lk_c1d ) THEN                 !==  1D configuration  ==!
+#if defined key_c1d
          DO WHILE ( istp <= nitend .AND. nstop == 0 )
             CALL stp_c1d( istp )
             istp = istp + 1
          END DO
-      ELSE                              !==  3D ocean with  ==!
+#else
           IF( lk_asminc ) THEN
              IF( ln_bkgwri ) CALL asm_bkg_wri( nit000 - 1 )    ! Output background fields
@@ -160 +162 @@
             IF( lk_mpp )   CALL mpp_max( nstop )
          END DO
-      ENDIF
+#endif
 
       IF( lk_diaobs ) CALL dia_obs_wri