Changeset 54 for trunk/NEMO/OPA_SRC/SOL

Timestamp:

2004-04-22T11:49:42+02:00 (20 years ago)

Author:

opalod

Message:

CT : BUGFIX028 : # Add USE modules and correct calling sequences CALL mmp_sum() and CALL sol_pcg() CALL sol_fet()

# Use logical key "lk_isl" instead of "l_isl"

File:

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

trunk/NEMO/OPA_SRC/SOL/solisl.F90

@@ -36 +36 @@
 
    !! * Shared module variables
-   LOGICAL, PUBLIC, PARAMETER ::   l_isl = .TRUE.    !: 'key_islands' flag
+   LOGICAL, PUBLIC, PARAMETER ::   lk_isl = .TRUE.    !: 'key_islands' flag
 
    !! * module variable
@@ -669 +669 @@
          END DO
          CALL mpp_sum( ztab, jpisl*jpisl )   ! sum over the global domain
-!!       CALL mpp_sum( aisl, jpisl*jpisl )
       ENDIF
 
@@ -750 +749 @@
       !! * Modules used
       USE ioipsl
+      USE solpcg
+      USE solfet
+      USE solsor
 
       !! * Local declarations
@@ -981 +983 @@
             END DO
             
-            CALL mpp_sum( rnorme )
+            IF( lk_mpp )   CALL mpp_sum( rnorme )
 
             IF(lwp) WRITE(numout,*) 'rnorme ', rnorme
@@ -1009 +1011 @@
          IF( nsolv == 3 ) THEN 
             epsilo = epsisl       ! precision to compute Islands matrix A
-            CALL solfet( indic )  ! FETI method
+            CALL sol_fet( indic )  ! FETI method
             epsilo = eps          ! precision to compute grad PS
          ELSE 
-            CALL solpcg( indic )  ! pcg method
+            CALL sol_pcg( indic )  ! pcg method
          ENDIF
 
@@ -1272 +1274 @@
    !!   Default option                                         Empty module
    !!----------------------------------------------------------------------
-   LOGICAL, PUBLIC, PARAMETER ::   l_isl = .FALSE.    !: 'key_islands' flag
+   LOGICAL, PUBLIC, PARAMETER ::   lk_isl = .FALSE.    !: 'key_islands' flag
 CONTAINS
    SUBROUTINE isl_dom                        ! Empty routine