Changeset 4756


Ignore:
Timestamp:
2014-09-03T09:47:30+02:00 (6 years ago)
Author:
deazer
Message:

Added two new routines, diatmb and dia25h to handle 25hourly and tmb output.
modified diawri to call these routines when logicals are true
logicals are set by new namelist addition set to true in AMM12 cfg and false in reference
default should be false.
additional call in dynspg_ts for barotropic U and V
Created extra fields in field_def.xml and extrae file groups in iodef.xml

Location:
branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM
Files:
3 added
7 edited

Legend:

Unmodified
Added
Removed
  • branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/CONFIG/AMM12/EXP00/iodef.xml

    r4343 r4756  
    2525      <file_group id="1ts" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files --> 
    2626 
    27       <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files --> 
     27<!--old      <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."/> old --> <!-- 1h files -->  
     28   <!-- TMB files --> 
     29      <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."  >                       
     30 
     31   <file id="file9" name_suffix="_shelftmb_grid_T" description="ocean T grid variables" enabled=".TRUE." > 
     32     <field field_ref="top_temp"           name="votemper_top"  freq_op="3600" operation="instant" enabled=".TRUE." /> 
     33     <field field_ref="mid_temp"           name="votemper_mid"  freq_op="3600" operation="instant" enabled=".TRUE." /> 
     34     <field field_ref="bot_temp"           name="votemper_bot"  freq_op="3600" operation="instant" enabled=".TRUE." /> 
     35     <field field_ref="sshnmasked"         name="sossheig"      freq_op="3600" operation="instant" enabled=".TRUE." />  
     36     <field field_ref="top_sal"            name="vosaline_top"  freq_op="3600" operation="instant" enabled=".TRUE." /> 
     37     <field field_ref="mid_sal"            name="vosaline_mid"  freq_op="3600" operation="instant" enabled=".TRUE." /> 
     38     <field field_ref="bot_sal"            name="vosaline_bot"  freq_op="3600" operation="instant" enabled=".TRUE." /> 
     39   </file> 
     40 
     41   <file id="file10" name_suffix="_shelftmb_grid_U" description="TMB ocean U grid variables" enabled=".TRUE." > 
     42     <field field_ref="top_u"         name="vozocrtx_top"  freq_op="3600" operation="instant" /> 
     43     <field field_ref="mid_u"         name="vozocrtx_mid"  freq_op="3600" operation="instant" /> 
     44     <field field_ref="bot_u"         name="vozocrtx_bot"  freq_op="3600" operation="instant" /> 
     45     <field field_ref="baro_u"        name="vobtcrtx"      freq_op="3600" operation="instant" /> 
     46   </file> 
     47 
     48   <file id="file11" name_suffix="_shelftmb_grid_V" description="TMB ocean V grid variables" enabled=".TRUE." > 
     49     <field field_ref="top_v"         name="vomecrty_top"  freq_op="3600" operation="instant" /> 
     50     <field field_ref="mid_v"         name="vomecrty_mid"  freq_op="3600" operation="instant" /> 
     51     <field field_ref="bot_v"         name="vomecrty_bot"  freq_op="3600" operation="instant" /> 
     52     <field field_ref="baro_v"        name="vobtcrty"      freq_op="3600" operation="instant" /> 
     53   </file> 
     54 
     55      </file_group> 
     56 
    2857      <file_group id="2h" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files --> 
    2958      <file_group id="3h" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->      
    3059      <file_group id="4h" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files --> 
    3160      <file_group id="6h" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files --> 
     61 
     62      <file_group id="25h_mean" output_freq="1d" output_level="10" enabled=".TRUE."> 
     63 
     64 
     65     <file id="file12" name_suffix="_25hourm_grid_T" description="ocean T grid variables, 25h meaned" enabled=".TRUE." > 
     66     <field field_ref="temper25h"   name="votemper" freq_op="86400" operation="instant" enabled=".TRUE."/> 
     67     <field field_ref="tempis25h"   name="votempis" freq_op="86400" operation="instant" enabled=".TRUE."/> 
     68     <field field_ref="salin25h"    name="vosaline" freq_op="86400" operation="instant" enabled=".TRUE."/> 
     69     <field field_ref="ssh25h"      name="sossheig" freq_op="86400" operation="instant" enabled=".TRUE."/> 
     70    </file> 
     71 
     72     <file id="file13" name_suffix="_25hourm_grid_U" description="ocean U grid variables, 25h meaned" enabled=".TRUE." > 
     73     <field field_ref="vozocrtx25h" name="vozocrtx" freq_op="86400" operation="instant" enabled=".TRUE."/> 
     74    </file> 
     75 
     76     <file id="file14" name_suffix="_25hourm_grid_V" description="ocean V grid variables, 25h meaned" enabled=".TRUE." > 
     77     <field field_ref="vomecrty25h" name="vomecrty" freq_op="86400" operation="instant" enabled=".TRUE."/> 
     78    </file> 
     79 
     80     <file id="file15" name_suffix="_25hourm_grid_W" description="ocean W grid variables, 25h meaned" enabled=".TRUE." > 
     81     <field field_ref="vomecrtz25h"          name="vomerctz" freq_op="86400" operation="instant" enabled=".TRUE."/> 
     82     <field field_ref="woce"                 name="vovecrtz" freq_op="86400" operation="instant" enabled=".TRUE."/> 
     83     <field field_ref="avt25h"               name="votkeavt" freq_op="86400" operation="instant" enabled=".TRUE."/> 
     84     <field field_ref="avm25h"               name="votkeavm" freq_op="86400" operation="instant" enabled=".TRUE."/> 
     85     <field field_ref="tke25h"               name="votke" freq_op="86400" operation="instant" enabled=".TRUE."/> 
     86     <field field_ref="mxln25h"              name="mxln"  freq_op="86400" operation="instant" enabled=".TRUE."/> 
     87    </file> 
     88      </file_group> 
    3289      
    3390      <file_group id="1d" output_freq="1d"  output_level="10" enabled=".TRUE."> <!-- 1d files --> 
    3491 
    3592   <file id="file1" name_suffix="_grid_T" description="ocean T grid variables" > 
     93     <field field_ref="sshnmasked"         name="sossheig"      freq_op="3600" operation="instant" enabled=".TRUE." />  
    3694     <field field_ref="sst"          name="tos"      long_name="sea_surface_temperature"                       /> 
    3795     <field field_ref="sss"          name="sos"      long_name="sea_surface_salinity"                          /> 
     
    114172      <file_group id="10y" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files --> 
    115173 
     174 
    116175   </file_definition> 
    117176     
  • branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg

    r4493 r4756  
    427427!----------------------------------------------------------------------- 
    428428/ 
     429!----------------------------------------------------------------------- 
     430&nam_diatmb  !  Top Middle Bottom Output 
     431!----------------------------------------------------------------------- 
     432   ln_diatmb  = .true.    !  Choose Top Middle and Bottom output or not 
     433/ 
     434!----------------------------------------------------------------------- 
     435&nam_dia25h  !  25h Mean Output 
     436!----------------------------------------------------------------------- 
     437   ln_dia25h  = .true.    ! Choose 25h mean output or not 
     438/ 
     439 
  • branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/CONFIG/SHARED/field_def.xml

    r4565 r4756  
    628628      <field field_ref="woce"         name="wo"       long_name="ocean vertical velocity"  /> 
    629629    </field_group> 
    630      
     630 
     631       <!-- TMB diagnostic output --> 
     632    <field_group  id="1h_grid_T_tmb" grid_ref="grid_T_2D" operation="instant"> 
     633     <field id="top_temp"           name="votemper_top"  unit="degC"  /> 
     634     <field id="mid_temp"           name="votemper_mid"  unit="degC"  /> 
     635     <field id="bot_temp"           name="votemper_bot"  unit="degC"  /> 
     636     <field id="top_sal"            name="vosaline_top"  unit="psu"   /> 
     637     <field id="mid_sal"            name="vosaline_mid"  unit="psu"   /> 
     638     <field id="bot_sal"            name="vosaline_bot"  unit="psu"   /> 
     639     <field id="sshnmasked"         name="sossheig"      unit="m"     />  
     640   </field_group> 
     641    <field_group  id="1h_grid_U_tmb" grid_ref="grid_U_2D" operation="instant"> 
     642     <field id="top_u"           name="vozocrtx_top"  unit="m/s"  /> 
     643     <field id="mid_u"           name="vozocrtx_mid"  unit="m/s"  /> 
     644     <field id="bot_u"           name="vozocrtx_bot"  unit="m/s"  /> 
     645     <field id="baro_u"          name="vobtcrtx"      unit="m/s"  /> 
     646   </field_group> 
     647    <field_group  id="1h_grid_V_tmb" grid_ref="grid_V_2D" operation="instant"> 
     648     <field id="top_v"           name="vomecrty_top"  unit="m/s"  /> 
     649     <field id="mid_v"           name="vomecrty_mid"  unit="m/s"  /> 
     650     <field id="bot_v"           name="vomecrty_bot"  unit="m/s"  /> 
     651     <field id="baro_v"          name="vobtcrty"      unit="m/s"  /> 
     652   </field_group> 
     653       <!-- 25h diagnostic output --> 
     654      <field_group id="25h_grid_T" grid_ref="grid_T_3D" operation="instant"> 
     655   <field id="temper25h"         name="potential temperature 25h mean"    unit="degC" /> 
     656   <field id="tempis25h"         name="insitu temperature 25h mean"    unit="degC" /> 
     657   <field id="salin25h"          name="salinity 25h mean"                 unit="psu"  /> 
     658   <field id="ssh25h"            name="sea surface height 25h mean"  grid_ref="grid_T_2D"      unit="m"    /> 
     659      </field_group> 
     660 
     661      <field_group id="25h_grid_U" grid_ref="grid_U_3D" operation="instant" > 
     662   <field id="vozocrtx25h"         name="i current 25h mean"    unit="m/s"   /> 
     663      </field_group> 
     664 
     665      <field_group id="25h_grid_V" grid_ref="grid_V_3D" operation="instant"> 
     666   <field id="vomecrty25h"         name="j current 25h mean"    unit="m/s"    /> 
     667      </field_group> 
     668 
     669      <field_group id="25h_grid_W" grid_ref="grid_W_3D" operation="instant"> 
     670   <field id="vomecrtz25h"         name="k current 25h mean"                 unit="m/s"      /> 
     671   <field id="avt25h"             name="vertical diffusivity25h mean"       unit="m2/s" /> 
     672   <field id="avm25h"              name="vertical viscosity 25h mean"        unit="m2/s" /> 
     673   <field id="tke25h"              name="turbulent kinetic energy 25h mean" /> 
     674   <field id="mxln25h"             name="mixing length 25h mean"             unit="m" /> 
     675      </field_group> 
     676 
     677 
    631678    </field_definition> 
  • branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/CONFIG/SHARED/namelist_ref

    r4384 r4756  
    11781178   rn_htrmax         =  200.0   ! max. depth of transition range 
    11791179/ 
     1180!----------------------------------------------------------------------- 
     1181&nam_diatmb  !  Top Middle Bottom Output 
     1182!----------------------------------------------------------------------- 
     1183   ln_diatmb  = .false.    !  Choose Top Middle and Bottom output or not 
     1184/ 
     1185!----------------------------------------------------------------------- 
     1186&nam_dia25h  !  25h Mean Output 
     1187!----------------------------------------------------------------------- 
     1188   ln_dia25h  = .false.    ! Choose 25h mean output or not 
     1189/ 
  • branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

    r4570 r4756  
    4646   USE diaar5, ONLY :   lk_diaar5 
    4747   USE dynadv, ONLY :   ln_dynadv_vec 
     48   USE diatmb          ! Top,middle,bottom output 
     49   USE dia25h          ! 25h Mean output 
    4850   USE iom 
    4951   USE ioipsl 
     
    229231      CALL wrk_dealloc( jpi , jpj, jpk , z3d ) 
    230232      ! 
     233      ! If we want tmb values  
     234 
     235      IF (ln_diatmb) THEN 
     236         CALL dia_tmb  
     237      ENDIF  
     238      IF (ln_dia25h) THEN 
     239         CALL dia_25h( kt ) 
     240      ENDIF  
     241 
    231242      IF( nn_timing == 1 )   CALL timing_stop('dia_wri') 
    232243      ! 
  • branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

    r4624 r4756  
    4444   USE agrif_opa_interp ! agrif 
    4545#endif 
     46   USE diatmb          ! Top,middle,bottom output 
    4647 
    4748 
     
    141142      INTEGER  ::   ji, jj, jk, jn        ! dummy loop indices 
    142143      INTEGER  ::   ikbu, ikbv, noffset      ! local integers 
     144      REAL(wp) ::   zmdi 
    143145      REAL(wp) ::   zraur, z1_2dt_b, z2dt_bf    ! local scalars 
    144146      REAL(wp) ::   zx1, zy1, zx2, zy2         !   -      - 
     
    166168      CALL wrk_alloc( jpi, jpj, zhf ) 
    167169      ! 
     170      zmdi=1.e+20                               !  missing data indicator for masking 
    168171      !                                         !* Local constant initialization 
    169172      z1_12 = 1._wp / 12._wp  
     
    904907      CALL wrk_dealloc( jpi, jpj, zhf ) 
    905908      ! 
     909      IF ( ln_diatmb ) THEN 
     910         CALL iom_put( "baro_u" , un_b*umask(:,:,1)+zmdi*(1-umask(:,:,1 ) ) )  ! Barotropic  U Velocity 
     911         CALL iom_put( "baro_v" , vn_b*vmask(:,:,1)+zmdi*(1-vmask(:,:,1 ) ) )  ! Barotropic  V Velocity 
     912      ENDIF 
    906913      IF( nn_timing == 1 )  CALL timing_stop('dyn_spg_ts') 
    907914      ! 
  • branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

    r4645 r4756  
    8787   USE crsini          ! initialise grid coarsening utility 
    8888   USE lbcnfd, ONLY: isendto, nsndto ! Setup of north fold exchanges  
     89   USE diatmb          ! Top,middle,bottom output 
     90   USE dia25h          ! 25h mean output 
    8991 
    9092   IMPLICIT NONE 
     
    465467      IF( lk_asminc     )   CALL asm_inc_init   ! Initialize assimilation increments 
    466468      IF(lwp) WRITE(numout,*) 'Euler time step switch is ', neuler 
     469                            CALL dia_tmb_init  ! TMB outputs 
     470                            CALL dia_25h_init  ! 25h mean  outputs 
     471 
    467472      ! 
    468473   END SUBROUTINE nemo_init 
     
    623628      USE ldftra_oce, ONLY: ldftra_oce_alloc 
    624629      USE trc_oce   , ONLY: trc_oce_alloc 
     630      USE insitu_tem, ONLY: insitu_tem_alloc 
    625631#if defined key_diadct  
    626632      USE diadct    , ONLY: diadct_alloc  
     
    639645      ierr = ierr + ldftra_oce_alloc()          ! ocean lateral  physics : tracers 
    640646      ierr = ierr + zdf_oce_alloc   ()          ! ocean vertical physics 
     647      ierr = ierr + insitu_tem_alloc() 
    641648      ! 
    642649      ierr = ierr + trc_oce_alloc   ()          ! shared TRC / TRA arrays 
Note: See TracChangeset for help on using the changeset viewer.