Changeset 2857


Ignore:
Timestamp:
2011-09-23T18:43:41+02:00 (9 years ago)
Author:
cbricaud
Message:

modify formula of heat and salt transport

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2011/dev_r2802_MERCATOR10_diadct/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90

    r2854 r2857  
    786786              sec%transport(3,jclass)=sec%transport(3,jclass)+zsum(3,jclass)/zsum(1,jclass) 
    787787              sec%transport(5,jclass)=sec%transport(5,jclass)+zsum(5,jclass)/zsum(1,jclass) 
    788 !              sec%transport(7,jclass)=sec%transport(7,jclass)+zsum(7,jclass)/zsum(1,jclass) 
    789 !              sec%transport(9,jclass)=sec%transport(9,jclass)+zsum(9,jclass)/zsum(1,jclass) 
    790788              sec%transport(7,jclass)=sec%transport(7,jclass)+zsum(7,jclass) 
    791789              sec%transport(9,jclass)=sec%transport(9,jclass)+zsum(9,jclass) 
     
    799797              sec%transport( 4,jclass)=sec%transport( 4,jclass)+zsum( 4,jclass)/zsum(2,jclass) 
    800798              sec%transport( 6,jclass)=sec%transport( 6,jclass)+zsum( 6,jclass)/zsum(2,jclass) 
    801 !              sec%transport( 8,jclass)=sec%transport( 8,jclass)+zsum( 8,jclass)/zsum(2,jclass) 
    802 !              sec%transport(10,jclass)=sec%transport(10,jclass)+zsum(10,jclass)/zsum(2,jclass) 
    803799              sec%transport( 8,jclass)=sec%transport( 8,jclass)+zsum( 8,jclass) 
    804800              sec%transport(10,jclass)=sec%transport(10,jclass)+zsum(10,jclass) 
     
    864860        ! Mean computation 
    865861        sec%transport(:,jcl)=sec%transport(:,jcl)/(nn_dctwri/nn_dct) 
    866 !        zcritere = 'no_classe' 
    867862        classe   = 'N       ' 
    868863        zbnd1   = 0._wp 
     
    918913           WRITE(numdct_heat,119) ndastp,kt,jsec,sec%name,sec%slopeSection,  & 
    919914                              jcl,classe,zbnd1,zbnd2,& 
    920                               !sec%transport(7,jcl)*rau0*rcp,sec%transport(8,jcl)* rau0*rcp, & 
    921                               !( sec%transport(7,jcl)+sec%transport(8,jcl) )*rau0*rcp 
    922915                              sec%transport(7,jcl)*1000._wp*rcp/1.e15,sec%transport(8,jcl)*1000._wp*rcp/1.e15, & 
    923916                              ( sec%transport(7,jcl)+sec%transport(8,jcl) )*1000._wp*rcp/1.e15 
     
    925918           WRITE(numdct_salt,119) ndastp,kt,jsec,sec%name,sec%slopeSection,  & 
    926919                              jcl,classe,zbnd1,zbnd2,& 
    927                               !sec%transport(9,jcl)*rau0,sec%transport(10,jcl)*rau0,& 
    928                               !(sec%transport(9,jcl)+sec%transport(10,jcl))*rau0 
    929                               sec%transport(9,jcl)/1.e6,sec%transport(10,jcl)/1.e6,& 
    930                               (sec%transport(9,jcl)+sec%transport(10,jcl))/1.e6 
     920                              sec%transport(9,jcl)*1000._wp/1.e9,sec%transport(10,jcl)*1000._wp/1.e9,& 
     921                              (sec%transport(9,jcl)+sec%transport(10,jcl))*1000._wp/1.e9 
    931922        ENDIF 
    932923 
     
    947938        WRITE(numdct_heat,119) ndastp,kt,jsec,sec%name,sec%slopeSection, & 
    948939                           jcl,"total",zbnd1,zbnd2,& 
    949                            !zsumclass(7)* rau0*rcp,zsumclass(8)* rau0*rcp,(zsumclass(7)+zsumclass(8) )* rau0*rcp 
    950940                           zsumclass(7)* 1000._wp*rcp/1.e15,zsumclass(8)* 1000._wp*rcp/1.e15,(zsumclass(7)+zsumclass(8) )* 1000._wp*rcp/1.e15 
    951941        !write total salt transport 
    952942        WRITE(numdct_salt,119) ndastp,kt,jsec,sec%name,sec%slopeSection, & 
    953943                           jcl,"total",zbnd1,zbnd2,& 
    954                            !zsumclass(9)*rau0,zsumclass(10)*rau0,(zsumclass(9)+zsumclass(10))*rau0 
    955                            zsumclass(9)/1.e6,zsumclass(10)/1.e6,(zsumclass(9)+zsumclass(10))/1.e6 
     944                           zsumclass(9)*1000._wp/1.e9,zsumclass(10)*1000._wp/1.e9,(zsumclass(9)+zsumclass(10))*1000._wp/1.e9 
    956945     ENDIF 
    957946 
Note: See TracChangeset for help on using the changeset viewer.