Changeset 359 for trunk/NEMO/OPA_SRC/SOL

Timestamp:

2005-12-21T11:46:45+01:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_033 : RB + CT : Add new surface pressure gradient algorithms

Location:

trunk/NEMO/OPA_SRC/SOL

Files:

• solfet.F90 (modified) (1 diff)
• solmat.F90 (modified) (6 diffs)
• solpcg.F90 (modified) (1 diff)
• solsor.F90 (modified) (1 diff)
• solsor_e.F90 (modified) (1 diff)
• solver.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/SOL/solfet.F90

@@ -37 +37 @@
       !!     Solve the ellipic equation for the barotropic stream function
       !!     system (default option) or the transport divergence system
-      !!     (lk_dynspg_fsc=T) using a Finite Elements Tearing and 
+      !!     (lk_dynspg_flt=T) using a Finite Elements Tearing and 
       !!      Interconnecting (FETI) approach.
       !!     In the former case, the barotropic stream function trend has a

trunk/NEMO/OPA_SRC/SOL/solmat.F90

@@ -19 +19 @@
    USE lbclnk          ! lateral boudary conditions
    USE lib_mpp         ! distributed memory computing
-   USE dynspg_rl
-   USE dynspg_fsc
 
    IMPLICIT NONE
@@ -46 +44 @@
       !!      The matrix is built for the barotropic stream function system.
       !!      a diagonal preconditioning matrix is also defined.
-      !!       * lk_dynspg_fsc=T: free surface formulation
+      !!       * lk_dynspg_flt=T: free surface formulation
       !!      The matrix is built for the divergence of the transport system
       !!      a diagonal preconditioning matrix is also defined.
@@ -67 +65 @@
       !!   8.5  !  02-08  (G. Madec)  F90: Free form
       !!        !  02-11  (C. Talandier, A-M. Treguier) Free surface & Open boundaries
+      !!   9.0  !  05-11  (V. Garnier) Surface pressure gradient organization
       !!----------------------------------------------------------------------
       !! * Local declarations
@@ -96 +95 @@
       z2dt = 2. * rdt
 
-#if defined key_dynspg_fsc && ! defined key_obc
-!!cr      IF( lk_dynspg_fsc .AND. .NOT.lk_obc ) THEN   !bug missing lk_dynspg_fsc_atsk
+#if defined key_dynspg_flt && ! defined key_obc
+!!cr      IF( lk_dynspg_flt .AND. .NOT.lk_obc ) THEN   !bug missing lk_dynspg_flt_atsk
 
       ! defined the coefficients for free surface elliptic system
@@ -117 +116 @@
       END DO
       
-#  elif defined key_dynspg_fsc && defined key_obc
-!!cr      ELSEIF( lk_dynspg_fsc .AND. lk_obc ) THEN     !bug missing lk_dynspg_fsc_atsk 
+#  elif defined key_dynspg_flt && defined key_obc
+!!cr      ELSEIF( lk_dynspg_flt .AND. lk_obc ) THEN     !bug missing lk_dynspg_flt_atsk 
 
       !   defined gcdmat in the case of open boundaries
@@ -200 +199 @@
       ! account for the existence of the south symmetric bassin.
       
-!!cr      IF( .NOT.lk_dynspg_fsc ) THEN   !bug missing lk_dynspg_fsc_atsk
-#if ! defined key_dynspg_fsc
+!!cr      IF( .NOT.lk_dynspg_flt ) THEN   !bug missing lk_dynspg_flt_atsk
+#if ! defined key_dynspg_flt
       IF( nperio == 2 ) THEN
          DO ji = 1, jpi

trunk/NEMO/OPA_SRC/SOL/solpcg.F90

@@ -38 +38 @@
       !! ** Purpose :   Solve the ellipic equation for the barotropic stream 
       !!      function system (lk_dynspg_rl=T) or the transport divergence 
-      !!      system (lk_dynspg_fsc=T) using a diagonal preconditionned
+      !!      system (lk_dynspg_flt=T) using a diagonal preconditionned
       !!      conjugate gradient method.
       !!      In the former case, the barotropic stream function trend has a

trunk/NEMO/OPA_SRC/SOL/solsor.F90

@@ -37 +37 @@
       !! ** Purpose :   Solve the ellipic equation for the barotropic stream 
       !!      function system (lk_dynspg_rl=T) or the transport divergence 
-      !!      system (lk_dynspg_fsc=T) using a red-black successive-over-
+      !!      system (lk_dynspg_flt=T) using a red-black successive-over-
       !!      relaxation method.
       !!       In the former case, the barotropic stream function trend has a

trunk/NEMO/OPA_SRC/SOL/solsor_e.F90

@@ -37 +37 @@
       !! ** Purpose :   Solve the ellipic equation for the barotropic stream 
       !!      function system (lk_dynspg_rl=T) or the transport divergence 
-      !!      system (lk_dynspg_fsc=T) using a red-black successive-over-
+      !!      system (lk_dynspg_flt=T) using a red-black successive-over-
       !!      relaxation method.
       !!       In the former case, the barotropic stream function trend has a

trunk/NEMO/OPA_SRC/SOL/solver.F90

@@ -19 +19 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE lib_mpp
-   USE dynspg_rl       
-   USE dynspg_fsc      
-   USE dynspg_fsc_atsk      
+   USE dynspg          ! choice/control of key cpp for surface pressure gradient
 
    IMPLICIT NONE
@@ -40 +38 @@
       !!       * default option: barotropic stream function system
       !!         and islands initialization (if lk_isl=T)
-      !!       * lk_dynspg_fsc = T : transport divergence system. No specific
+      !!       * lk_dynspg_flt = T : transport divergence system. No specific
       !!         treatment of islands.
       !!      
       !! ** Method :
       !!       - Compute the local depth of the water column at u- and v-point
-      !!      (lk_dynspg_fsc = T) or its inverse (lk_dynspg_rl = T).
+      !!      (lk_dynspg_flt = 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
@@ -64 +62 @@
       !!                                u- and v-point. (lk_dynspg_rl = T)
       !!             - hu, hv   : masked local depth at u- and v- points
-      !!                                (lk_dynspg_fsc = T)
+      !!                                (lk_dynspg_flt = T)
       !!             - c_solver_pt : nature of the gridpoint at which the
       !!                                solver is applied
@@ -77 +75 @@
       !!        !  98-10  (G. Roullet, G. Madec)  free surface 
       !!   9.0  !  03-07  (G. Madec)  free form, F90
+      !!    "   !  05-11  (V. Garnier) Surface pressure gradient organization
       !!----------------------------------------------------------------------
       !! * Local declarations
@@ -126 +125 @@
       ENDIF
 
-      IF( lk_dynspg_fsc .OR. lk_dynspg_fsc_tsk ) THEN
+      IF( lk_dynspg_flt ) THEN
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) '          free surface formulation'
          IF( lk_isl ) THEN
             IF(lwp) WRITE(numout,cform_err)
-            IF(lwp) WRITE(numout,*) ' key_islands inconsistent with key_dynspg_fsc'
+            IF(lwp) WRITE(numout,*) ' key_islands inconsistent with key_dynspg_flt'
             nstop = nstop + 1
          ENDIF
@@ -139 +138 @@
       ELSE
          IF(lwp) WRITE(numout,cform_err)
-         IF(lwp) WRITE(numout,*) '          Chose at least one surface pressure gradient calculation: free surface or rigid-lid'
+         IF(lwp) WRITE(numout,*) '          Choose only one surface pressure gradient calculation: filtered or rigid-lid'
+         IF(lwp) WRITE(numout,*) '          Should not call this routine if dynspg_exp or dynspg_ts has been chosen'
          nstop = nstop + 1
       ENDIF
-      IF( ( lk_dynspg_fsc .OR. lk_dynspg_fsc_tsk ) .AND. lk_dynspg_rl ) THEN
+      IF( lk_dynspg_flt .AND. lk_dynspg_rl ) THEN
          IF(lwp) WRITE(numout,cform_err)
          IF(lwp) WRITE(numout,*) '          Chose between free surface or rigid-lid, not both'