Changeset 991 for branches/dev_003_CPL/NEMO/OPA_SRC/opa.F90

Timestamp:

2008-05-23T17:55:55+02:00 (16 years ago)

Author:

smasson

Message:

dev_003_CPL: preliminary draft (not working), see ticket #155

File:

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

branches/dev_003_CPL/NEMO/OPA_SRC/opa.F90

@@ -38 +38 @@
    !! * Modules used
    USE oce             ! dynamics and tracers variables
-   USE cpl_oce         ! ocean-atmosphere-sea ice coupled exchanges
    USE dom_oce         ! ocean space domain variables
    USE sbc_oce         ! surface boundary condition: ocean
@@ -70 +69 @@
 
    USE step            ! OPA time-stepping                  (stp     routine)
-#if defined key_oasis3
-   USE cpl_oasis3      ! OASIS3 coupling (to ECHAM5)
-#elif defined key_oasis4
-   USE cpl_oasis4      ! OASIS4 coupling (to ECHAM5)
-#endif
+   USE cpl_oasis3      ! OASIS3 coupling
    USE dynspg_oce      ! Control choice of surface pressure gradient schemes
    USE prtctl          ! Print control                 (prt_ctl_init routine)
@@ -159 +154 @@
 
       CALL opa_closefile
-#if defined key_oasis3 || defined key_oasis4
-      call cpl_prism_finalize
-#else
-      IF( lk_mpp )   CALL mppstop                          ! Close all files (mpp)
-#endif
-      !
+      IF      ( lk_cpl ) THEN   ;   CALL cpl_prism_finalize
+      ELSE IF ( lk_mpp ) THEN   ;   CALL mppstop                ! Close all files (mpp)
+      ENDIF
+                          
    END SUBROUTINE opa_model
 
@@ -175 +168 @@
       !!
       !!----------------------------------------------------------------------
-#if defined key_coupled
-      INTEGER ::   itro, istp0        ! ???
-#endif
-#if defined key_oasis3 || defined key_oasis4
       INTEGER :: localComm
-#endif
       CHARACTER (len=20) ::   namelistname
       CHARACTER (len=28) ::   file_out
@@ -212 +200 @@
       READ  ( numnam, namctl )
 
-#if defined key_oasis3 || defined key_oasis4
-      call cpl_prism_init(localComm)
-      ! Nodes selection
-      narea = mynode(localComm)
-#else
-      ! Nodes selection
-      narea = mynode()
-#endif
+      IF ( lk_cpl ) THEN
+         CALL cpl_prism_init()
+         narea = mynode(nlocalComm)
+      ELSE 
+         narea = mynode()
+      ENDIF
+          
       narea = narea + 1    ! mynode return the rank of proc (0 --> jpnij -1 )
       lwp   = narea == 1
@@ -290 +277 @@
       CALL trd_mod_init                         ! Mixed-layer/Vorticity/Integral constraints trends
 
-
 #if defined key_top
       CALL ini_trc                           ! Passive tracers
-#endif
-
-#if defined key_coupled && ! defined key_oasis3 && ! defined key_oasis4
-      itro  = nitend - nit000 + 1           ! Coupled
-      istp0 = NINT( rdt )
-      CALL cpl_init( itro, nexco, istp0 )   ! Signal processing and process id exchange
-#endif
-
-#if defined key_oasis3 || defined key_oasis4
-      CALL cpl_prism_define
 #endif