Changeset 2442

Timestamp:

2010-11-27T19:05:38+01:00 (13 years ago)

Author:

gm

Message:

v3.3beta: #765 Creation of LBC directory, move of istate.F90 in DOM

Location:

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC

Files:

• DOM/istate.F90 (moved) (moved from branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/istate.F90)
• LBC (added)
• LBC/cla.F90 (moved) (moved from branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/cla.F90)
• LBC/lbclnk.F90 (moved) (moved from branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/lbclnk.F90)
• LBC/lbcnfd.F90 (moved) (moved from branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/lbcnfd.F90)
• LBC/lib_mpp.F90 (moved) (moved from branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/lib_mpp.F90)
• LBC/mppini.F90 (moved) (moved from branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/mppini.F90)
• LBC/mppini_2.h90 (moved) (moved from branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/mppini_2.h90)
• opa.F90 (modified) (10 diffs)

branches/nemo_v3_3_beta/NEMOGCM/NEMO/OPA_SRC/opa.F90

@@ -1 +1 @@
 MODULE opa
-   !!==============================================================================
+   !!======================================================================
    !!                       ***  MODULE opa   ***
    !! Ocean system   : OPA ocean dynamics (including on-line tracers and sea-ice)
-   !!==============================================================================
+   !!======================================================================
    !! History :  OPA  ! 1990-10  (C. Levy, G. Madec)  Original code
    !!            7.0  ! 1991-11  (M. Imbard, C. Levy, G. Madec)
@@ -179 +179 @@
       !!
       !!----------------------------------------------------------------------
-      INTEGER :: ilocal_comm
-      CHARACTER(len=80),dimension(10) ::   cltxt = ''
-      INTEGER                         ::   ji   ! local loop indices
+      INTEGER ::   ji            ! dummy loop indices
+      INTEGER :: ilocal_comm   ! local integer
+      CHARACTER(len=80), DIMENSION(10) ::   cltxt = ''
       !!
       NAMELIST/namctl/ ln_ctl  , nn_print, nn_ictls, nn_ictle,   &
@@ -198 +198 @@
       IF( Agrif_Root() ) THEN
 # if defined key_oasis3 || defined key_oasis4
-         CALL cpl_prism_init( ilocal_comm )      ! nemo local communicator given by oasis
+         CALL cpl_prism_init( ilocal_comm )   ! nemo local communicator given by oasis
 # endif
-         CALL  init_ioclient( ilocal_comm )      ! exchange io_server nemo local communicator with the io_server
+         CALL  init_ioclient( ilocal_comm )   ! exchange io_server nemo local communicator with the io_server
       ENDIF
       narea = mynode( cltxt, ilocal_comm )    ! Nodes selection
@@ -206 +206 @@
 # if defined key_oasis3 || defined key_oasis4
       IF( Agrif_Root() ) THEN
-         CALL cpl_prism_init( ilocal_comm )      ! nemo local communicator given by oasis
+         CALL cpl_prism_init( ilocal_comm )   ! nemo local communicator given by oasis
       ENDIF
       narea = mynode( cltxt, ilocal_comm )    ! Nodes selection (control print return in cltxt)
@@ -321 +321 @@
    SUBROUTINE opa_ctl
       !!----------------------------------------------------------------------
-      !!                     ***  ROUTINE opa  ***
-      !!
-      !! ** Purpose :   Initialise logical flags that control the choice of
-      !!              some algorithm or control print
-      !!
-      !! ** Method  : - print namctl information
-      !!              - Read in namilist namflg logical flags
-      !!----------------------------------------------------------------------
-      NAMELIST/namdyn_hpg/ ln_hpg_zco   , ln_hpg_zps   , ln_hpg_sco, ln_hpg_hel,   &
-         &                 ln_hpg_wdj   , ln_hpg_djc   , ln_hpg_rot, rn_gamma  ,   &
-         &                 ln_dynhpg_imp, nn_dynhpg_rst
-      !!----------------------------------------------------------------------
-
-      IF(lwp) THEN                 ! Parameter print
+      !!                     ***  ROUTINE opa_ctl  ***
+      !!
+      !! ** Purpose :   control print setting 
+      !!
+      !! ** Method  : - print namctl information and check some consistencies
+      !!----------------------------------------------------------------------
+      !
+      IF(lwp) THEN                  ! Parameter print
          WRITE(numout,*)
          WRITE(numout,*) 'opa_ctl: Control prints & Benchmark'
@@ -349 +343 @@
          WRITE(numout,*) '      benchmark parameter (0/1)       nn_bench   = ', nn_bench
       ENDIF
-
+      !
       nprint    = nn_print          ! convert DOCTOR namelist names into OLD names
       nictls    = nn_ictls
@@ -358 +352 @@
       jsplt     = nn_jsplt
       nbench    = nn_bench
-
-      !                           ! Parameter control
+      !                             ! Parameter control
       !
       IF( ln_ctl ) THEN                 ! sub-domain area indices for the control prints
@@ -397 +390 @@
          ENDIF
       ENDIF
-
-      IF( nbench == 1 )   THEN            ! Benchmark 
+      !
+      IF( nbench == 1 ) THEN              ! Benchmark 
          SELECT CASE ( cp_cfg )
          CASE ( 'gyre' )   ;   CALL ctl_warn( ' The Benchmark is activated ' )
@@ -406 +399 @@
       ENDIF
       !
-      IF( lk_c1d .AND. .NOT. lk_iomput )  &
-        CALL ctl_stop( ' The 1D vertical configuration must be used in conjunction',   &
-            &          ' with the IOM Input/Output manager. Compile with key_iomput enabled' )
+      IF( lk_c1d .AND. .NOT.lk_iomput )   CALL ctl_stop( 'opa_ctl: The 1D configuration must be used ',   &
+         &                                               'with the IOM Input/Output manager. '        ,   &
+         &                                               'Compile with key_iomput enabled' )
       !
    END SUBROUTINE opa_ctl
@@ -430 +423 @@
       IF( numevo_ice /= -1 )   CLOSE( numevo_ice )   ! ice variables (temp. evolution)
       IF( numout     /=  6 )   CLOSE( numout     )   ! standard model output file
-      numout = 6   ! redefine numout in case it is used after this point...
+      !
+      numout = 6                                     ! redefine numout in case it is used after this point...
       !
    END SUBROUTINE opa_closefile