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

Timestamp:

2008-04-22T20:13:41+02:00 (16 years ago)

Author:

rblod

Message:

Update 1D configuration according to SBC and LIM3, see ticket #117

File:

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

trunk/NEMO/OPA_SRC/opa.F90

@@ -73 +73 @@
    USE dynspg_oce      ! Control choice of surface pressure gradient schemes
    USE prtctl          ! Print control                 (prt_ctl_init 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
+   USE c1d             ! 1D configuration
+   USE dyncor_c1d      ! Coriolis factor at T-point
+   USE step_c1d        ! Time stepping loop for the 1D configuration
 
    USE initrc          ! Initialization of the passive tracers
@@ -122 +122 @@
       ! check that all process are still there... If some process have an error,
       ! they will never enter in step and other processes will wait until the end of the cpu time!
-      IF( lk_mpp )   CALL mpp_max(nstop)
-
-      IF( lk_c1d ) THEN 
-         istp = nit000
+      IF( lk_mpp )   CALL mpp_max( nstop )
+
+      istp = nit000
+      IF( lk_c1d ) THEN                 ! 1D configuration (no AGRIF zoom)
+         !
+         DO WHILE ( istp <= nitend .AND. nstop == 0 )
+            CALL stp_c1d( istp )
+            istp = istp + 1
+         END DO
+      ELSE                              ! 3D ocean with or without AGRIF zoom
+         !
          DO WHILE ( istp <= nitend .AND. nstop == 0 )
 #if defined key_agrif
-            CALL Agrif_Step(stp_1d)
-#else
-            CALL stp_1d( istp )
-#endif
-            istp = istp + 1
-
-            IF( lk_mpp )   CALL mpp_max(nstop)
- 
-         END DO
-      ELSE
-         istp = nit000
-         DO WHILE ( istp <= nitend .AND. nstop == 0 )
-#if defined key_agrif
-            CALL Agrif_Step(stp)
+            CALL Agrif_Step( stp )
 #else
             CALL stp( istp )
 #endif
             istp = istp + 1
-
-            IF( lk_mpp )   CALL mpp_max(nstop)
-            
+            IF( lk_mpp )   CALL mpp_max( nstop )
          END DO
       ENDIF
@@ -168 +160 @@
       IF( lk_mpp )   CALL mppstop                          ! Close all files (mpp)
 #endif
-
+      !
    END SUBROUTINE opa_model
 
@@ -267 +259 @@
       CALL dom_init                         ! Domain
 
-      IF( ln_ctl )      CALL prt_ctl_init   ! Print control
-
-      IF( lk_c1d )      CALL fcorio_1d      ! redefine Coriolis at T-point
+      IF( lk_c1d    ) THEN                      ! adaptation for 1D configuration 
+         CALL cor_c1d                                ! redefine Coriolis at T-point
+         umask(:,:,:) = tmask(:,:,:)                 ! U, V and T-points are the same
+         vmask(:,:,:) = tmask(:,:,:)                 ! 
+      ENDIF
+
+      IF( ln_ctl    )   CALL prt_ctl_init   ! Print control
 
       IF( lk_obc    )   CALL obc_init       ! Open boundaries 
@@ -309 +305 @@
 
       IF(lwp) WRITE(numout,cform_aaa)       ! Flag AAAAAAA
-
-      IF( lk_c1d  )  THEN 
-         CALL init_1d
-      ENDIF
 
    END SUBROUTINE opa_init