Changeset 359 for trunk/NEMO/OPA_SRC/SOL/solmat.F90

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

File:

• trunk/NEMO/OPA_SRC/SOL/solmat.F90 (modified) (6 diffs)

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