Changeset 31 for trunk/NEMO/OPA_SRC/DYN/dynspg_fsc_atsk.F90

Timestamp:

2004-02-17T10:19:59+01:00 (20 years ago)

Author:

opalod

Message:

CT : BUGFIX012 : Running problem for EEL5 configuration is solved

File:

• trunk/NEMO/OPA_SRC/DYN/dynspg_fsc_atsk.F90 (modified) (8 diffs)

trunk/NEMO/OPA_SRC/DYN/dynspg_fsc_atsk.F90

@@ -43 +43 @@
 
    !! * Shares module variables
-   LOGICAL, PUBLIC, PARAMETER ::   lk_dynspg_fsc_tsk = .TRUE.    ! free surf. cst vol. flag
+   LOGICAL, PUBLIC, PARAMETER ::   lk_dynspg_fsc_tsk = .TRUE.    !: free surf. cst vol. flag
 
    !! * Substitutions
@@ -81 +81 @@
       !!         where (spgu,spgv) are given by:
       !!            spgu = vertical sum[ e3u (ub+ 2 rdt ua ) ]
-      !!                 - g 2 rdt hu /e1u di[sshn + emp]
+      !!                 - grav 2 rdt hu /e1u di[sshn + emp]
       !!            spgv = vertical sum[ e3v (vb+ 2 rdt va) ]
-      !!                 - g 2 rdt hv /e2v dj[sshn + emp]
+      !!                 - grav 2 rdt hv /e2v dj[sshn + emp]
       !!         and define the first guess from previous computation :
       !!            zbtd = btda
@@ -128 +128 @@
          spgu(:,:) = 0.e0      ! surface pressure gradient (i-direction)
          spgv(:,:) = 0.e0      ! surface pressure gradient (j-direction)
-         IF( .NOT.ln_rstart ) THEN 
-            sshb(:,:) = 0.e0      ! before sea-surface height 
-            sshn(:,:) = 0.e0      ! now    sea-surface height 
-         ENDIF
       ENDIF
 
@@ -141 +137 @@
       IF( neuler == 0 .AND. kt == nit000 ) z2dt = rdt
       ! coefficients
-      z2dtg  = g * z2dt
+      z2dtg  = grav * z2dt
       zraur  = 1. / rauw
-      znugdt =  rnu * g * z2dt
+      znugdt =  rnu * grav * z2dt
       znurau =  znugdt * zraur
-#if defined key_mpp
-      ! Mpp : export boundary values of to neighboring processors
-      !!bug ???  why only in mpp?  is it really needed???
-      CALL lbc_lnk( ua, 'U' , -1. )
-      CALL lbc_lnk( va, 'V' , -1. )
-#endif
+      IF( lk_mpp ) THEN
+         ! Mpp : export boundary values of to neighboring processors
+         !!bug ???  why only in mpp?  is it really needed???
+         CALL lbc_lnk( ua, 'U' , -1. )
+         CALL lbc_lnk( va, 'V' , -1. )
+      ENDIF
+
       !                                                ! ===============
       DO jj = 2, jpjm1                                 !  Vertical slab
@@ -157 +154 @@
          ! ----------------------------
          DO ji = 2, jpim1
-            zspgu =      - g * ( sshn(ji+1,jj) - sshn(ji,jj) ) / e1u(ji,jj)
-            zspgv =      - g * ( sshn(ji,jj+1) - sshn(ji,jj) ) / e2v(ji,jj)
+            zspgu =   - grav * ( sshn(ji+1,jj) - sshn(ji,jj) ) / e1u(ji,jj)
+            zspgv =   - grav * ( sshn(ji,jj+1) - sshn(ji,jj) ) / e2v(ji,jj)
             zegu  = + znurau * ( emp (ji+1,jj) - emp (ji,jj) ) / e1u(ji,jj)
             zegv  = + znurau * ( emp (ji,jj+1) - emp (ji,jj) ) / e2v(ji,jj)
@@ -286 +283 @@
          END DO
       END DO
-#if defined key_mpp
-      CALL mpp_sum( rnorme )
-#endif
+      IF( lk_mpp )   CALL mpp_sum( rnorme )   ! sum over the global domain
+
       epsr = eps * eps * rnorme
       ncut = 0
@@ -310 +306 @@
             CALL sol_pcg( kindic )
          ELSEIF( nsolv == 2 ) THEN     ! successive-over-relaxation
-            CALL sol_sor( kt, kindic )
+            CALL sol_sor( kindic )
          ELSEIF( nsolv == 3 ) THEN     ! FETI solver
             CALL sol_fet( kindic )
@@ -400 +396 @@
    !!   Default case :                                         Empty module
    !!----------------------------------------------------------------------
-   LOGICAL, PUBLIC, PARAMETER ::   lk_dynspg_fsc_tsk = .FALSE.   ! free surf. cst vol. flag
+   LOGICAL, PUBLIC, PARAMETER ::   lk_dynspg_fsc_tsk = .FALSE.   !: free surf. cst vol. flag
 CONTAINS
    SUBROUTINE dyn_spg_fsc_atsk( kt, kindic )      ! Empty module
-      WRITE(*,*) kt, kindic
+      WRITE(*,*) 'dyn_spg_fsc_atsk: You should not have seen this print! error?', kt, kindic
    END SUBROUTINE dyn_spg_fsc_atsk
 #endif