Changeset 253 for trunk/NEMO/OPA_SRC/opa.F90

Timestamp:

2005-08-30T15:26:11+02:00 (19 years ago)

Author:

opalod

Message:

nemo_v1_update_001 : Add the 1D configuration possibility

File:

• trunk/NEMO/OPA_SRC/opa.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/opa.F90

@@ -33 +33 @@
    USE ldftra          ! lateral diffusivity setting    (ldftra_init routine)
    USE zdfini
-!!!USE zdf_oce         ! ocean vertical physics            (zdf_init routine)
 
    USE phycst          ! physical constant                  (par_cst routine)
@@ -47 +46 @@
 
    USE step            ! OPA time-stepping                  (stp     routine)
+   USE ini1d           ! re-initialization of u-v mask for the 1D configuration
+   USE dyncor1d        ! Coriolis factor at T-point
+   USE step1d          ! Time stepping loop for the 1D configuration
 
    IMPLICIT NONE
@@ -93 +95 @@
       !!   9.0  !  02-08  (G. Madec)  F90: Free form and modules
       !!    "   !  04-08  (C. Talandier) New trends organization
+      !!    "   !  05-06  (C. Ethe) Add the 1D configuration possibility
       !!----------------------------------------------------------------------
       !! * Local declarations
@@ -166 +169 @@
       CALL dom_init                         ! Domain
 
-      IF( lk_obc    )   CALL obc_init        ! Open boundaries 
+      IF( lk_cfg_1d )   CALL fcorio_1d      ! redefine Coriolis at T-point
+
+      IF( lk_obc    )   CALL obc_init       ! Open boundaries 
 
       CALL solver_init                      ! Elliptic solver
@@ -178 +183 @@
                        CALL bn2( tb, sb, rn2 )              ! before Brunt-Vaisala frequency
 
-      IF( lk_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 )
+      IF( lk_zps .AND. .NOT. lk_cfg_1d )   &
+         &             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 )
 
 !!add
@@ -236 +242 @@
       IF(lwp) WRITE(numout,cform_aaa)       ! Flag AAAAAAA
 
-      istp = nit000
-      DO WHILE ( istp <= nitend .AND. nstop == 0 )
-         CALL stp( istp )
-         istp = istp + 1
-      END DO
+      IF( lk_cfg_1d  )  THEN 
+         CALL init_1d
+         istp = nit000
+         DO WHILE ( istp <= nitend .AND. nstop == 0 )
+            CALL stp_1d( istp )
+            istp = istp + 1
+         END DO
+      ELSE
+         istp = nit000
+         DO WHILE ( istp <= nitend .AND. nstop == 0 )
+            CALL stp( istp )
+            istp = istp + 1
+         END DO
+      ENDIF
       !                                     ! ========= !
       !                                     !  Job end  !