Changeset 80 for trunk/NEMO/OPA_SRC/LDF/ldfeiv.F90

Timestamp:

2004-04-22T14:58:49+02:00 (20 years ago)

Author:

opalod

Message:

CT : UPDATE054 : # Use of an additional MAX function to compute ahtu(), ahtv() and ahtw() arrays

# Addition of new diagnostics controled with logical l_ctl

File:

• trunk/NEMO/OPA_SRC/LDF/ldfeiv.F90 (modified) (8 diffs)

trunk/NEMO/OPA_SRC/LDF/ldfeiv.F90

@@ -36 +36 @@
 CONTAINS
 
-#if defined key_autotasking
+# if defined key_autotasking
    !!----------------------------------------------------------------------
    !!   'key_autotasking' :                            autotasking (j-slab)
@@ -158 +158 @@
       CALL lbc_lnk( aeiv, 'V', 1. )
 
+      IF(l_ctl)   WRITE(numout,*) ' eiv  - u: ', SUM( aeiu(:,:) ), ' v: ', SUM( aeiv(:,:) )
+
+
       ! ORCA R05: add a space variation on aht (=aeiv except at the equator and river mouth)
       IF( cp_cfg == "orca" .AND. jp_cfg == 05 ) THEN
@@ -171 +174 @@
             END DO
          END DO
+         IF(l_ctl)   WRITE(numout,*) ' aht  - u: ', SUM( ahtu(:,:) ), ' v: ', SUM( ahtv(:,:) ), ' w: ', SUM( ahtw(:,:) )
       ENDIF
 
    END SUBROUTINE ldf_eiv
 
-#else
+# else
    !!----------------------------------------------------------------------
    !!   Default key                                             k-j-i loops
    !!----------------------------------------------------------------------
 
-   SUBROUTINE ldf_eiv ( kt )
+   SUBROUTINE ldf_eiv( kt )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE ldf_eiv  ***
@@ -228 +232 @@
 
       DO jk = 1, jpk
-#   if defined key_vectopt_loop  &&  ! defined key_autotasking
+#  if defined key_vectopt_loop  &&  ! defined key_autotasking
 !CDIR NOVERRCHK 
          DO ji = 1, jpij   ! vector opt.
@@ -246 +250 @@
             zhw(ji,1) = zhw(ji,1) + ze3w
          END DO
-#   else
+#  else
          DO jj = 2, jpjm1
 !CDIR NOVERRCHK 
@@ -266 +270 @@
             END DO 
          END DO 
-#   endif
+#  endif
       END DO 
 
@@ -315 +319 @@
       CALL lbc_lnk( aeiv, 'V', 1. )
 
+      IF(l_ctl)   WRITE(numout,*) ' eiv  - u: ', SUM( aeiu(:,:) ), ' v: ', SUM( aeiv(:,:) )
+
       ! ORCA R05: add a space variation on aht (=aeiv except at the equator and river mouth)
       IF( cp_cfg == "orca" .AND. jp_cfg == 05 ) THEN
@@ -323 +329 @@
                zaht      = ( 1. -  MIN( 1., ABS( ff(ji,jj) / zf20 ) ) ) * ( aht0 - zaht_min )  &
                   &      + aht0 * upsrnfh(ji,jj)                          ! enhanced near river mouths
-               ahtu(ji,jj) = MAX( zaht_min, aeiu(ji,jj) ) + zaht
-               ahtv(ji,jj) = MAX( zaht_min, aeiv(ji,jj) ) + zaht
-               ahtw(ji,jj) = MAX( zaht_min, aeiw(ji,jj) ) + zaht
+               ahtu(ji,jj) = MAX( MAX( zaht_min, aeiu(ji,jj) ) + zaht, aht0 )
+               ahtv(ji,jj) = MAX( MAX( zaht_min, aeiv(ji,jj) ) + zaht, aht0 )
+               ahtw(ji,jj) = MAX( MAX( zaht_min, aeiw(ji,jj) ) + zaht, aht0 )
             END DO
          END DO
+         IF(l_ctl)   WRITE(numout,*) ' aht  - u: ', SUM( ahtu(:,:) ), ' v: ', SUM( ahtv(:,:) ), ' w: ', SUM( ahtw(:,:) )
       ENDIF
 
    END SUBROUTINE ldf_eiv
 
-#endif
+# endif
 
 #else