Changeset 7209


Ignore:
Timestamp:
2016-11-08T16:30:34+01:00 (4 years ago)
Author:
timgraham
Message:

1) Added in tnpeo changes in diaar5
2) vertical mean temperature fields in field_def.xml

Location:
branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/CONFIG/SHARED/field_def.xml

    r7063 r7209  
    2929         <field id="soce"         long_name="Sea Water Salinity"            standard_name="sea_water_salinity"      unit="0.001"     grid_ref="grid_T_3D"/> 
    3030         <field id="soce_e3t"     long_name="salinity * e3t"                                                        unit="0.001*m"   grid_ref="grid_T_3D" > soce * e3t </field > 
     31         <field id="toce_e3t_vsum" field_ref="toce_e3t" grid_ref="vert_sum" /> 
     32         <field id="e3t_vsum" field_ref="e3t" grid_ref="vert_sum" /> 
     33         <field id="toce_vmean" field_ref="toce_e3t_vsum" grid_ref="vert_sum"> toce_e3t_vsum/e3t_vsum </field> 
     34         <field id="toce_e3t_300" field_ref="toce_e3t"  unit="degree_C*m"   grid_ref="zoom_300" /> 
     35         <field id="e3t_300" field_ref="e3t"  unit="degree_C*m"   grid_ref="zoom_300" /> 
     36         <field id="toce_e3t_vsum300" field_ref="toce_e3t_300" grid_ref="zoom_300_sum" /> 
     37         <field id="e3t_vsum300" field_ref="e3t_300" grid_ref="zoom_300_sum" /> 
     38         <field id="toce_vmean300" field_ref="toce_e3t_vsum300" grid_ref="zoom_300_sum"> toce_e3t_vsum300/e3t_vsum300 </field> 
    3139 
    3240         <field id="sst"          long_name="Sea Surface Temperature"             standard_name="sea_surface_temperature"             unit="degree_C"     /> 
  • branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90

    r7063 r7209  
    196196      CALL iom_put( 'temptot', ztemp ) 
    197197      CALL iom_put( 'saltot' , zsal  ) 
    198       ! 
    199       CALL wrk_dealloc( jpi , jpj              , zarea_ssh , zbotpres ) 
     198 
     199      IF( iom_use( 'tnpeo' )) THEN     
     200      ! Work done against stratification by vertical mixing 
     201      ! Exclude points where rn2 is negative as convection kicks in here and 
     202      ! work is not being done against stratification 
     203          pe(:,:) = 0._wp 
     204          IF( lk_zdfddm ) THEN 
     205             DO ji=1,jpi 
     206                DO jj=1,jpj 
     207                   DO jk=1,jpk 
     208                      zrw =   ( fsdepw(ji,jj,jk  ) - fsdept(ji,jj,jk) )   & 
     209                         &  / ( fsdept(ji,jj,jk-1) - fsdept(ji,jj,jk) ) 
     210                      ! 
     211                      zaw = rab_n(ji,jj,jk,jp_tem) * (1. - zrw) + rab_n(ji,jj,jk-1,jp_tem)* zrw 
     212                      zbw = rab_n(ji,jj,jk,jp_sal) * (1. - zrw) + rab_n(ji,jj,jk-1,jp_sal)* zrw 
     213                      ! 
     214                      pe(ji, jj) = pe(ji, jj) - MIN(0._wp, rn2(ji,jj,jk)) * & 
     215                           &       grav * (avt(ji,jj,jk) * zaw * (tsn(ji,jj,jk-1,jp_tem) - tsn(ji,jj,jk,jp_tem) )  & 
     216                           &       - fsavs(ji,jj,jk) * zbw * (tsn(ji,jj,jk-1,jp_sal) - tsn(ji,jj,jk,jp_sal) ) ) 
     217 
     218                   ENDDO 
     219                ENDDO 
     220             ENDDO 
     221          ELSE 
     222             DO ji=1,jpi 
     223                DO jj=1,jpj 
     224                   DO jk=1,jpk 
     225                       pe(ji,jj) = pe(ji,jj) + avt(ji, jj, jk) * MIN(0._wp,rn2(ji, jj, jk)) * rau0 * fse3w(ji, jj, jk) 
     226                   ENDDO 
     227                ENDDO 
     228             ENDDO 
     229          ENDIF 
     230          CALL lbc_lnk(pe, 'T', 1._wp)          
     231          CALL iom_put( 'tnpeo', pe ) 
     232      ENDIF 
     233      ! 
     234      CALL wrk_dealloc( jpi , jpj              , zarea_ssh , zbotpres, pe ) 
    200235      CALL wrk_dealloc( jpi , jpj , jpk        , zrhd      , zrhop    ) 
    201236      CALL wrk_dealloc( jpi , jpj , jpk , jpts , ztsn                 ) 
Note: See TracChangeset for help on using the changeset viewer.