Changeset 3528


Ignore:
Timestamp:
2012-11-06T11:31:34+01:00 (8 years ago)
Author:
rfurner
Message:

changed heat calculation to use C in place of Kelvin, and initialised some previously unitialised arrays

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2012/dev_r3452_UKMO2_DIADCT/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90

    r3522 r3528  
    223223     ENDIF     
    224224  
     225     ! Initialise arrays 
     226     zwork(:) = 0.0  
     227     zsum(:,:,:) = 0.0 
     228 
    225229     IF( lwp .AND. kt==nit000+nn_dct-1 ) THEN 
    226230         WRITE(numout,*) " " 
     
    740744   
    741745              IF ( sec%llstrpond ) THEN  
    742                  transports_3d(2,jsec,jseg,jk) = transports_3d(2,jsec,jseg,jk)  + zTnorm * (ztn + 273.15) * zrhop * rcp 
     746                 transports_3d(2,jsec,jseg,jk) = transports_3d(2,jsec,jseg,jk)  + zTnorm * ztn * zrhop * rcp 
    743747                 transports_3d(3,jsec,jseg,jk) = transports_3d(3,jsec,jseg,jk)  + zTnorm * zsn * zrhop * 0.001 
    744748              ENDIF 
     
    10671071           WRITE(numdct_heat,119) ndastp,kt,ksec,sec%name,zslope,  & 
    10681072                              jclass,classe,zbnd1,zbnd2,& 
    1069                               sec%transport(3,jclass)*1000._wp*rcp/1.e15,sec%transport(4,jclass)*1000._wp*rcp/1.e15, & 
    1070                               ( sec%transport(3,jclass)+sec%transport(4,jclass) )*1000._wp*rcp/1.e15 
     1073                              sec%transport(3,jclass)*1.e-15,sec%transport(4,jclass)*1.e-15, & 
     1074                              ( sec%transport(3,jclass)+sec%transport(4,jclass) )*1.e-15 
    10711075           !write salt transport per class 
    10721076           WRITE(numdct_salt,119) ndastp,kt,ksec,sec%name,zslope,  & 
    10731077                              jclass,classe,zbnd1,zbnd2,& 
    1074                               sec%transport(5,jclass)*1000._wp/1.e9,sec%transport(6,jclass)*1000._wp/1.e9,& 
    1075                               (sec%transport(5,jclass)+sec%transport(6,jclass))*1000._wp/1.e9 
     1078                              sec%transport(5,jclass)*1.e-9,sec%transport(6,jclass)*1.e-9,& 
     1079                              (sec%transport(5,jclass)+sec%transport(6,jclass))*1.e-9 
    10761080        ENDIF 
    10771081 
     
    10921096        WRITE(numdct_heat,119) ndastp,kt,ksec,sec%name,zslope, & 
    10931097                           jclass,"total",zbnd1,zbnd2,& 
    1094                            zsumclasses(3)* 1000._wp*rcp/1.e15,zsumclasses(4)* 1000._wp*rcp/1.e15,& 
    1095                            (zsumclasses(3)+zsumclasses(4) )* 1000._wp*rcp/1.e15 
     1098                           zsumclasses(3)*1.e-15,zsumclasses(4)*1.e-15,& 
     1099                           (zsumclasses(3)+zsumclasses(4) )*1.e-15 
    10961100        !write total salt transport 
    10971101        WRITE(numdct_salt,119) ndastp,kt,ksec,sec%name,zslope, & 
    10981102                           jclass,"total",zbnd1,zbnd2,& 
    1099                            zsumclasses(5)*1000._wp/1.e9,zsumclasses(6)*1000._wp/1.e9,& 
    1100                            (zsumclasses(5)+zsumclasses(6))*1000._wp/1.e9 
     1103                           zsumclasses(5)*1.e-9,zsumclasses(6)*1.e-9,& 
     1104                           (zsumclasses(5)+zsumclasses(6))*1.e-9 
    11011105     ENDIF 
    11021106 
Note: See TracChangeset for help on using the changeset viewer.