Changeset 49

Timestamp:

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

Author:

opalod

Message:

CT : UPDATE023 : Addition of new diagnostics controled with logical key l_ctl

Location:

trunk/NEMO/OPA_SRC

Files:

• LDF/ldfslp.F90 (modified) (2 diffs)
• ZDF/zdfbfr.F90 (modified) (1 diff)
• ZDF/zdfddm.F90 (modified) (2 diffs)
• ZDF/zdfmxl.F90 (modified) (2 diffs)
• ZDF/zdftke.F90 (modified) (2 diffs)
• eosbn2.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/LDF/ldfslp.F90

@@ -471 +471 @@
 
       
-      ! III Lateral boundary conditions on all slopes (uslp, vslp,
-      ! -------------------------------             wslpi,wslpj )
+      ! III Lateral boundary conditions on all slopes (uslp , vslp, 
+      ! -------------------------------                wslpi, wslpj )
       CALL lbc_lnk( uslp , 'U', -1. )
       CALL lbc_lnk( vslp , 'V', -1. )
       CALL lbc_lnk( wslpi, 'W', -1. )
       CALL lbc_lnk( wslpj, 'W', -1. )
+
+      IF(l_ctl) THEN
+         WRITE(numout,*) ' slp  - u : ', SUM( uslp (:,:,:) ), ' v : ', SUM( vslp (:,:,:) )
+         WRITE(numout,*) '      - wi: ', SUM( wslpi(:,:,:) ), ' wj: ', SUM( wslpj(:,:,:) )
+      ENDIF
 
    END SUBROUTINE ldf_slp
@@ -625 +630 @@
       ! Local vertical density gradient evaluated from N^2
       !     zwy = d/dz(prd)= - ( prd ) / grav * mk(pn2) -- at t point
-      zwy ( :, jpj) = 0.0e0
-      zwy ( jpi, :) = 0.0e0
+      zwy ( :, jpj) = 0.e0
+      zwy ( jpi, :) = 0.e0
 # if defined key_vectopt_loop   &&   ! defined key_autotasking
       jj = 1

trunk/NEMO/OPA_SRC/ZDF/zdfbfr.F90

@@ -168 +168 @@
       CALL lbc_lnk( avmv, 'V', 1. )
 
+      IF( l_ctl )   WRITE(numout,*) ' bfr  u : ', SUM( avmu(:,:,:) ), ' v : ', SUM( avmv(:,:,:) )
+
    END SUBROUTINE zdf_bfr
 

trunk/NEMO/OPA_SRC/ZDF/zdfddm.F90

@@ -198 +198 @@
       CALL lbc_lnk( avmu, 'U', 1. ) 
       CALL lbc_lnk( avmv, 'V', 1. )
+
+      IF( l_ctl ) THEN
+         WRITE(numout,*) ' ddm  t : ', SUM( avt (:,:,:) ), ' s : ', SUM( avs (:,:,:) )
+         WRITE(numout,*) '      u : ', SUM( avmu(:,:,:) ), ' v : ', SUM( avmv(:,:,:) )
+      ENDIF
       
    END SUBROUTINE zdf_ddm
@@ -230 +235 @@
          WRITE(numout,*) '~~~~~~~'
          WRITE(numout,*) '          Namelist namddm : set dd mixing parameter'
-         WRITE(numout,*)
          WRITE(numout,*) '             maximum avs for dd mixing      avts   = ', avts
          WRITE(numout,*) '             heat/salt buoyancy flux ratio  hsbfr  = ', hsbfr

trunk/NEMO/OPA_SRC/ZDF/zdfmxl.F90

@@ -131 +131 @@
       END DO                                           !   End of slab
       !                                                ! ===============
+
+      IF( l_ctl )   WRITE(numout,*) ' nmln : ', SUM( nmln(:,:) ), ' hmld: ', SUM( hmld(:,:) )
 
    END SUBROUTINE zdf_mxl
@@ -232 +234 @@
       END DO
 
+      IF( l_ctl )   WRITE(numout,*) ' nmln : ', SUM( nmln(:,:) ), ' hmld: ', SUM( hmld(:,:) )
+
    END SUBROUTINE zdf_mxl
 #endif

trunk/NEMO/OPA_SRC/ZDF/zdftke.F90

@@ -578 +578 @@
       CALL lbc_lnk( avt, 'W', 1. )
 
+      IF( l_ctl ) THEN
+         WRITE(numout,*) ' tke  e : ', SUM( en  (:,:,:) ), ' t : ', SUM( avt (:,:,:) )
+         WRITE(numout,*) '      u : ', SUM( avmu(:,:,:) ), ' v : ', SUM( avmv(:,:,:) )
+      ENDIF
+
    END SUBROUTINE zdf_tke
 
@@ -634 +639 @@
          WRITE(numout,*) '~~~~~~~~~~~~'
          WRITE(numout,*) '          Namelist namtke : set tke mixing parameters'
-         WRITE(numout,*)
          WRITE(numout,*) '             restart with tke from no tke ln_rstke = ', ln_rstke
          WRITE(numout,*) '             coef. to compute avt           ediff  = ', ediff

trunk/NEMO/OPA_SRC/eosbn2.F90

@@ -222 +222 @@
       END SELECT
 
+      IF(l_ctl)   WRITE(numout,*) ' eos  : ', SUM( prd(:,:,:) )
+
    END SUBROUTINE eos_insitu
 
@@ -371 +373 @@
                   zs = psal(ji,jj,jk)
                   !   ... density and potential volumic mass
-                  prd(ji,jj,jk) = ( 0.0285 - ralpha * zt ) * tmask(ji,jj,jk)
+                  prd  (ji,jj,jk) = ( 0.0285 - ralpha * zt )        * tmask(ji,jj,jk)
                   prhop(ji,jj,jk) = ( rau0 * prd(ji,jj,jk) + rau0 ) * tmask(ji,jj,jk)
                END DO
@@ -390 +392 @@
                   zs = psal(ji,jj,jk)
                   !   ... density and potential volumic mass
-                  prd(ji,jj,jk) = (   rbeta  * zs - ralpha * zt - 1. ) * tmask(ji,jj,jk)
-                  prhop(ji,jj,jk) = ( rau0 * prd(ji,jj,jk) + rau0 ) * tmask(ji,jj,jk)
+                  prd  (ji,jj,jk) = ( rbeta  * zs - ralpha * zt - 1. ) * tmask(ji,jj,jk)
+                  prhop(ji,jj,jk) = ( rau0 * prd(ji,jj,jk) + rau0 )    * tmask(ji,jj,jk)
                END DO
             END DO
@@ -405 +407 @@
 
       END SELECT
+
+      IF(l_ctl)   WRITE(numout,*) ' eos-p: ', SUM( prd(:,:,:) ), ' pot : ', SUM( prhop(:,:,:) )
 
    END SUBROUTINE eos_insitu_pot
@@ -580 +584 @@
       END SELECT
 
+      IF(l_ctl)   WRITE(numout,*) ' eos2d: ', SUM( prd(1:jpim1,1:jpjm1) )
+
    END SUBROUTINE eos_insitu_2d
 
@@ -753 +759 @@
       END SELECT
 
+      IF(l_ctl)   WRITE(numout,*) ' bn2  : ', SUM( pn2 (:,:,:) )
+#if defined key_zdfddm
+      IF(l_ctl)   WRITE(numout,*) ' rrau : ', SUM( rrau(:,:,:) )
+#endif
+
    END SUBROUTINE eos_bn2