[cdftools] 22/228: cdfhflx : netcdf output in PW cdfmhst : missing parenthesis when writing INP heat and salt fluxes

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository cdftools.

commit 9604810f9d0dd83694df0e7a771592635afd4bb7
Author: dussin9r <dussin9r at 1055176f-818a-41d9-83e1-73fbe5b947c5>
Date:   Wed Apr 14 16:09:06 2010 +0000

    cdfhflx : netcdf output in PW
    cdfmhst : missing parenthesis when writing INP heat and salt fluxes
    
    
    git-svn-id: http://servforge.legi.grenoble-inp.fr/svn/CDFTOOLS/trunk@298 1055176f-818a-41d9-83e1-73fbe5b947c5
---
 cdfhflx.f90 | 3 ++-
 cdfmhst.f90 | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/cdfhflx.f90 b/cdfhflx.f90
index 753eb0f..daef8a7 100644
--- a/cdfhflx.f90
+++ b/cdfhflx.f90
@@ -130,6 +130,7 @@ PROGRAM cdfhflx
      typvar%scale_factor= 1.
      typvar%add_offset= 0.
      typvar%savelog10= 0.
+     typvar%units='PW' 
      typvar(1)%long_name='Heat_Fluxes_Global'
      typvar(1)%short_name='hflx_glo'
      typvar%online_operation='N/A'
@@ -239,7 +240,7 @@ PROGRAM cdfhflx
 
      ! netcdf output 
      DO jj=1, jpbasins
-        ierr = putvar(ncout, id_varout(jj), htrp(jj,:), ipk(jj), kx, npjglo )
+        ierr = putvar(ncout, id_varout(jj), htrp(jj,:)/1e15, ipk(jj), kx, npjglo )
      END DO
 
      ierr = closeout(ncout)
diff --git a/cdfmhst.f90 b/cdfmhst.f90
index 6241575..c328d3e 100644
--- a/cdfmhst.f90
+++ b/cdfmhst.f90
@@ -269,7 +269,7 @@ PROGRAM cdfmhst
          WHERE ( zmtrp == 0 ) zmtrp=rpspval         
          ierr=putvar(ncout,id_varout(js),REAL(zmtrp), 1,1,npjglo)
          js=js+1
-         zmtrp(:)=zonal_heat_ind(:) + zonal_heat_pac(:)/1.e15  ! INP
+         zmtrp(:)=(zonal_heat_ind(:) + zonal_heat_pac(:))/1.e15  ! INP
          WHERE ( zmtrp == 0 ) zmtrp=rpspval
          ierr=putvar(ncout,id_varout(js),REAL(zmtrp), 1,1,npjglo)
          js=js+1
@@ -293,7 +293,7 @@ PROGRAM cdfmhst
          WHERE ( zmtrp == 0 ) zmtrp=rpspval
          ierr=putvar(ncout,id_varout(js),REAL(zmtrp), 1,1,npjglo)
          js = js + 1
-         zmtrp(:)=zonal_salt_ind(:) + zonal_salt_pac(:)/1.e6  ! INP
+         zmtrp(:)=(zonal_salt_ind(:) + zonal_salt_pac(:))/1.e6  ! INP
          WHERE ( zmtrp == 0 ) zmtrp=rpspval
          ierr=putvar(ncout,id_varout(js),REAL(zmtrp), 1,1,npjglo)
          js = js + 1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdftools.git