Changeset 16 for trunk/NEMO/OPA_SRC/SOL/solver.F90

Timestamp:

2004-02-17T09:06:15+01:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE001 : First major NEMO update

File:

• trunk/NEMO/OPA_SRC/SOL/solver.F90 (modified) (7 diffs)

trunk/NEMO/OPA_SRC/SOL/solver.F90

@@ -18 +18 @@
    USE in_out_manager  ! I/O manager
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
+   USE lib_mpp
+   USE dynspg_rl       
+   USE dynspg_fsc      
 
    IMPLICIT NONE
@@ -34 +37 @@
       !!       * default option: barotropic stream function system
       !!         and islands initialization (if l_isl=T)
-      !!       * key_dynspg_fsc = T : transport divergence system. No specific
+      !!       * lk_dynspg_fsc = T : transport divergence system. No specific
       !!         treatment of islands.
       !!      
       !! ** Method :
       !!       - Compute the local depth of the water column at u- and v-point
-      !!      (key_dynspg_fsc = T) or its inverse (key_dynspg_rl = T).
+      !!      (lk_dynspg_fsc = T) or its inverse (lk_dynspg_rl = T).
       !!      The local depth of the water column is computed by summing 
       !!      the vertical scale factors. For its inverse, the thickness of
@@ -56 +59 @@
       !!
       !! ** Action : - hur, hvr : masked inverse of the local depth at
-      !!                                u- and v-point. (key_dynspg_rl = T)
+      !!                                u- and v-point. (lk_dynspg_rl = T)
       !!             - hu, hv   : masked local depth at u- and v- points
-      !!                                (key_dynspg_fsc = T)
+      !!                                (lk_dynspg_fsc = T)
+      !!             - c_solver_pt : nature of the gridpoint at which the
+      !!                                solver is applied
       !! References :
       !!      Jensen, 1986: adv. phys. oceanogr. num. mod.,ed. o brien,87-110.
@@ -115 +120 @@
       ENDIF
 
-#if defined key_dynspg_fsc 
+      IF( lk_dynspg_fsc ) THEN
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) '          *** free surface formulation'
@@ -123 +128 @@
             nstop = nstop + 1
          ENDIF
-#endif
-#if defined key_dynspg_rl
+      ELSEIF( lk_dynspg_rl ) THEN
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) '          *** Rigid lid formulation'
-#endif
-#if defined key_dynspg_fsc && defined key_dynspg_rl
+      ELSE
+         IF(lwp) WRITE(numout,cform_err)
+         IF(lwp) WRITE(numout,*) '          Chose at least one surface pressure gradient calculation: free surface or rigid-lid'
+         nstop = nstop + 1
+      ENDIF
+      IF( lk_dynspg_fsc .AND. lk_dynspg_rl ) THEN
          IF(lwp) WRITE(numout,cform_err)
          IF(lwp) WRITE(numout,*) '          Chose between free surface or rigid-lid, not both'
          nstop = nstop + 1
-#endif
+      ENDIF
 
       SELECT CASE ( nsolv )
@@ -144 +152 @@
       CASE ( 3 )                ! FETI solver
          IF(lwp) WRITE(numout,*) '          use the FETI solver'
-#if ! defined key_mpp
-         IF(lwp) WRITE(numout,*) ' The FETI algorithm is used only with the key_mpp option'
-         nstop = nstop + 1
-#else
-         IF( jpnij == 1 ) THEN
-            IF(lwp) WRITE(numout,*) ' The FETI algorithm needs more than one processor'
+         IF( .NOT.lk_mpp ) THEN
+            IF(lwp) WRITE(numout,*) ' The FETI algorithm is used only with the key_mpp_... option'
             nstop = nstop + 1
-         ENDIF
-#endif
+         ELSE
+            IF( jpnij == 1 ) THEN
+               IF(lwp) WRITE(numout,*) ' The FETI algorithm needs more than one processor'
+               nstop = nstop + 1
+            ENDIF
+         ENDIF
          
       CASE DEFAULT
@@ -161 +169 @@
       END SELECT
 
+      ! Grid-point at which the solver is applied
+      ! -----------------------------------------
+
+      IF( lk_dynspg_rl ) THEN       ! rigid-lid
+         IF( lk_mpp ) THEN
+            c_solver_pt = 'G'   ! G= F with special staff ??? which one?
+         ELSE
+            c_solver_pt = 'F'
+         ENDIF
+      ELSE                          ! free surface T-point
+         IF( lk_mpp ) THEN
+            c_solver_pt = 'S'   ! S=T with special staff ??? which one?
+         ELSE
+            c_solver_pt = 'T'
+         ENDIF
+      ENDIF
+
 
       ! Construction of the elliptic system matrix