Changeset 6535
- Timestamp:
- 2016-05-13T16:40:54+02:00 (8 years ago)
- Location:
- branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM
- Files:
-
- 6 edited
-
CONFIG/SHARED/field_def.xml (modified) (19 diffs)
-
NEMO/OPA_SRC/DIA/diawri.F90 (modified) (1 diff)
-
NEMO/OPA_SRC/IOM/iom.F90 (modified) (2 diffs)
-
NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) (3 diffs)
-
NEMO/OPA_SRC/TRA/traadv_tvd.F90 (modified) (1 diff)
-
NEMO/OPA_SRC/ZDF/zdftmx.F90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/CONFIG/SHARED/field_def.xml
r6437 r6535 25 25 <field id="e3t_0" long_name="Initial T-cell thickness" standard_name="ref_cell_thickness" unit="m" grid_ref="grid_T_3D"/> 26 26 27 <field id="toce" long_name="temperature" standard_name="sea_water_potential_temperature" unit="deg C" grid_ref="grid_T_3D"/>28 <field id="toce_e3t" long_name="temperature * e3t" unit="deg C*m" grid_ref="grid_T_3D" > toce * e3t </field >27 <field id="toce" long_name="temperature" standard_name="sea_water_potential_temperature" unit="degree_C" grid_ref="grid_T_3D"/> 28 <field id="toce_e3t" long_name="temperature * e3t" unit="degree_C*m" grid_ref="grid_T_3D" > toce * e3t </field > 29 29 <field id="soce" long_name="salinity" standard_name="sea_water_practical_salinity" unit="1e-3" grid_ref="grid_T_3D"/> 30 30 <field id="soce_e3t" long_name="salinity * e3t" unit="1e-3*m" grid_ref="grid_T_3D" > soce * e3t </field > 31 31 32 <field id="sst" long_name="sea surface temperature" standard_name="sea_surface_temperature" unit="deg C" />33 <field id="sst2" long_name="square of sea surface temperature" standard_name="square_of_sea_surface_temperature" unit="deg C2" > sst * sst </field >32 <field id="sst" long_name="sea surface temperature" standard_name="sea_surface_temperature" unit="degree_C" /> 33 <field id="sst2" long_name="square of sea surface temperature" standard_name="square_of_sea_surface_temperature" unit="degree_C2" > sst * sst </field > 34 34 <field id="sstmax" long_name="max of sea surface temperature" field_ref="sst" operation="maximum" /> 35 35 <field id="sstmin" long_name="min of sea surface temperature" field_ref="sst" operation="minimum" /> 36 <field id="sstgrad" long_name="module of sst gradient" unit="deg C/m" />37 <field id="sstgrad2" long_name="square of module of sst gradient" unit="deg C2/m2" />38 <field id="sbt" long_name="sea bottom temperature" unit="deg C" />36 <field id="sstgrad" long_name="module of sst gradient" unit="degree_C/m" /> 37 <field id="sstgrad2" long_name="square of module of sst gradient" unit="degree_C2/m2" /> 38 <field id="sbt" long_name="sea bottom temperature" unit="degree_C" /> 39 39 40 40 <field id="sss" long_name="sea surface salinity" standard_name="sea_surface_salinity" unit="1e-3" /> … … 58 58 59 59 <!-- EOS --> 60 <field id="alpha" long_name="thermal expansion" unit="deg C-1" grid_ref="grid_T_3D" />60 <field id="alpha" long_name="thermal expansion" unit="degree_C-1" grid_ref="grid_T_3D" /> 61 61 <field id="beta" long_name="haline contraction" unit="1e3" grid_ref="grid_T_3D" /> 62 62 <field id="rhop" long_name="potential density (sigma0)" standard_name="sea_water_sigma_theta" unit="kg/m3" grid_ref="grid_T_3D" /> … … 78 78 <field id="pycndep" long_name="Pycnocline Depth (dsigma[dT=-0.2] wrt 10m)" standard_name="ocean_mixed_layer_thickness_defined_by_sigma_theta" unit="m" /> 79 79 <field id="BLT" long_name="Barrier Layer Thickness" unit="m" > topthdep - pycndep </field> 80 <field id="tinv" long_name="Max of vertical invertion of temperature" unit="deg C" />80 <field id="tinv" long_name="Max of vertical invertion of temperature" unit="degree_C" /> 81 81 <field id="depti" long_name="Depth of max. vert. inv. of temperature" unit="m" /> 82 82 <field id="20d" long_name="Depth of 20C isotherm" standard_name="depth_of_isosurface_of_sea_water_potential_temperature" unit="m" axis_ref="iax_20C" /> … … 203 203 <field id="isfgammas" long_name="transfert coefficient for isf (salinity)" unit="m/s" /> 204 204 <field id="stbl" long_name="salinity in the Losh tbl" unit="1e-3" /> 205 <field id="ttbl" long_name="temperature in the Losh tbl" unit="deg C" />205 <field id="ttbl" long_name="temperature in the Losh tbl" unit="degree_C" /> 206 206 207 207 <!-- *_oce variables available with ln_blk_clio or ln_blk_core --> … … 221 221 <!-- available if key_oasis3 + conservative method --> 222 222 <field id="rain" long_name="Liquid precipitation" standard_name="rainfall_flux" unit="kg/m2/s" /> 223 <field id="rain_ao_cea" long_name="Liquid precipitation over ice-free ocean (cell average)" standard_name="rainfall_flux" unit="kg/m2/s" /> 223 224 <field id="evap_ao_cea" long_name="Evaporation over ice-free ocean (cell average)" standard_name="water_evaporation_flux" unit="kg/m2/s" /> 224 225 <field id="isnwmlt_cea" long_name="Snow over Ice melting (cell average)" standard_name="surface_snow_melt_flux" unit="kg/m2/s" /> … … 253 254 254 255 <field id="ice_pres" long_name="Ice presence" unit="" /> 255 <field id="ist_cea" long_name="Ice surface temperature (cell average)" standard_name="surface_temperature" unit="deg C" />256 <field id="ist_ipa" long_name="Ice surface temperature (ice presence average)" standard_name="surface_temperature" unit="deg C" />256 <field id="ist_cea" long_name="Ice surface temperature (cell average)" standard_name="surface_temperature" unit="degree_C" /> 257 <field id="ist_ipa" long_name="Ice surface temperature (ice presence average)" standard_name="surface_temperature" unit="degree_C" /> 257 258 <field id="uice_ipa" long_name="Ice velocity along i-axis at I-point (ice presence average)" standard_name="sea_ice_x_velocity" unit="m/s" /> 258 259 <field id="vice_ipa" long_name="Ice velocity along j-axis at I-point (ice presence average)" standard_name="sea_ice_y_velocity" unit="m/s" /> … … 263 264 <field id="u_imasstr" long_name="Sea-ice mass transport along i-axis" standard_name="sea_ice_x_transport" unit="kg/s" /> 264 265 <field id="v_imasstr" long_name="Sea-ice mass transport along j-axis" standard_name="sea_ice_y_transport" unit="kg/s" /> 265 <field id="emp_x_sst" long_name="Concentration/Dilution term on SST" unit="kg*deg C/m2/s" />266 <field id="emp_x_sst" long_name="Concentration/Dilution term on SST" unit="kg*degree_C/m2/s" /> 266 267 <field id="emp_x_sss" long_name="Concentration/Dilution term on SSS" unit="kg*1e-3/m2/s" /> 267 268 268 269 <field id="iceconc" long_name="ice concentration" standard_name="sea_ice_area_fraction" unit="%" /> 269 <field id="isst" long_name="sea surface temperature" standard_name="sea_surface_temperature" unit="deg C" />270 <field id="isst" long_name="sea surface temperature" standard_name="sea_surface_temperature" unit="degree_C" /> 270 271 <field id="isss" long_name="sea surface salinity" standard_name="sea_surface_salinity" unit="1e-3" /> 271 272 <field id="qt_oce" long_name="total flux at ocean surface" standard_name="surface_downward_heat_flux_in_sea_water" unit="W/m2" /> … … 288 289 <field id="salinity_cat" long_name="Sea-Ice Bulk salinity for categories" unit="g/kg" axis_ref="ncatice" /> 289 290 <field id="brinevol_cat" long_name="Brine volume for categories" unit="%" axis_ref="ncatice" /> 290 <field id="icetemp_cat" long_name="Ice temperature for categories" unit="deg C" axis_ref="ncatice" />291 <field id="snwtemp_cat" long_name="Snow temperature for categories" unit="deg C" axis_ref="ncatice" />292 293 <field id="micet" long_name="Mean ice temperature" unit="deg C" />291 <field id="icetemp_cat" long_name="Ice temperature for categories" unit="degree_C" axis_ref="ncatice" /> 292 <field id="snwtemp_cat" long_name="Snow temperature for categories" unit="degree_C" axis_ref="ncatice" /> 293 294 <field id="micet" long_name="Mean ice temperature" unit="degree_C" /> 294 295 <field id="icehc" long_name="ice total heat content" unit="10^9J" /> 295 296 <field id="isnowhc" long_name="snow total heat content" unit="10^9J" /> 296 <field id="icest" long_name="ice surface temperature" unit="deg C" />297 <field id="icest" long_name="ice surface temperature" unit="degree_C" /> 297 298 <field id="ibrinv" long_name="brine volume" unit="%" /> 298 299 <field id="icecolf" long_name="frazil ice collection thickness" unit="m" /> … … 360 361 <field id="hfxtur" long_name="turbulent heat flux at the ice base" unit="W/m2" /> 361 362 <!-- sbcssm variables --> 362 <field id="sst_m" unit="deg C" />363 <field id="sst_m" unit="degree_C" /> 363 364 <field id="sss_m" unit="psu" /> 364 365 <field id="ssu_m" unit="m/s" /> … … 382 383 <field id="ubar" long_name="ocean barotropic current along i-axis" unit="m/s" /> 383 384 <field id="uocetr_eff" long_name="Effective ocean transport along i-axis" standard_name="ocean_volume_x_transport" unit="m3/s" grid_ref="grid_U_3D" /> 384 <field id="uocet" long_name="ocean transport along i-axis times temperature (CRS)" unit="deg C*m/s" grid_ref="grid_U_3D" />385 <field id="uocet" long_name="ocean transport along i-axis times temperature (CRS)" unit="degree_C*m/s" grid_ref="grid_U_3D" /> 385 386 <field id="uoces" long_name="ocean transport along i-axis times salinity (CRS)" unit="1e-3*m/s" grid_ref="grid_U_3D" /> 386 387 … … 400 401 <!-- variables available with key_diaar5 --> 401 402 <field id="u_masstr" long_name="ocean eulerian mass transport along i-axis" standard_name="ocean_mass_x_transport" unit="kg/s" grid_ref="grid_U_3D" /> 403 <field id="u_masstr_vint" long_name="vertical integral of ocean eulerian mass transport along i-axis" standard_name="vertical_integral_of_ocean_mass_x_transport" unit="kg/s" /> 402 404 <field id="u_heattr" long_name="ocean eulerian heat transport along i-axis" standard_name="ocean_heat_x_transport" unit="W" /> 403 405 <field id="u_salttr" long_name="ocean eulerian salt transport along i-axis" standard_name="ocean_salt_x_transport" unit="1e-3*kg/s" /> … … 418 420 <field id="vbar" long_name="ocean barotropic current along j-axis" unit="m/s" /> 419 421 <field id="vocetr_eff" long_name="Effective ocean transport along j-axis" standard_name="ocean_volume_y_transport" unit="m3/s" grid_ref="grid_V_3D" /> 420 <field id="vocet" long_name="ocean transport along j-axis times temperature (CRS)" unit="deg C*m/s" grid_ref="grid_V_3D" />422 <field id="vocet" long_name="ocean transport along j-axis times temperature (CRS)" unit="degree_C*m/s" grid_ref="grid_V_3D" /> 421 423 <field id="voces" long_name="ocean transport along j-axis times salinity (CRS)" unit="1e-3*m/s" grid_ref="grid_V_3D" /> 422 424 … … 495 497 <field id="sshthster" long_name="global mean ssh thermosteric" standard_name="global_average_thermosteric_sea_level_change" unit="m" /> 496 498 <field id="masstot" long_name="global total mass" standard_name="sea_water_mass" unit="kg" /> 497 <field id="temptot" long_name="global mean temperature" standard_name="sea_water_potential_temperature" unit="deg C" />499 <field id="temptot" long_name="global mean temperature" standard_name="sea_water_potential_temperature" unit="degree_C" /> 498 500 <field id="saltot" long_name="global mean salinity" standard_name="sea_water_salinity" unit="1e-3" /> 499 501 <field id="fram_trans" long_name="Sea Ice Mass Transport Through Fram Strait" standard_name="sea_ice_transport_across_line" unit="kg/s" /> 500 502 501 503 <!-- available with ln_diahsb --> 502 <field id="bgtemper" long_name="drift in global mean temperature wrt timestep 1" standard_name="change_over_time_in_sea_water_potential_temperature" unit="deg C" />504 <field id="bgtemper" long_name="drift in global mean temperature wrt timestep 1" standard_name="change_over_time_in_sea_water_potential_temperature" unit="degree_C" /> 503 505 <field id="bgsaline" long_name="drift in global mean salinity wrt timestep 1" standard_name="change_over_time_in_sea_water_practical_salinity" unit="1e-3" /> 504 506 <field id="bgheatco" long_name="drift in global mean heat content wrt timestep 1" unit="10^9J" /> … … 512 514 <field id="bgfrctem" long_name="drift in global mean heat content from forcing wrt timestep 1" unit="10^9J" /> 513 515 <field id="bgfrcsal" long_name="drift in global mean salt content from forcing wrt timestep 1" unit="1e-3*km3" /> 514 <field id="bgmistem" long_name="global mean temperature error due to free surface" unit="deg C" />516 <field id="bgmistem" long_name="global mean temperature error due to free surface" unit="degree_C" /> 515 517 <field id="bgmissal" long_name="global mean salinity error due to free surface" unit="1e-3" /> 516 518 </field_group> … … 524 526 <field id="ibgarea" long_name="global mean ice area" unit="km2" /> 525 527 <field id="ibgsaline" long_name="global mean ice salinity" unit="1e-3" /> 526 <field id="ibgtemper" long_name="global mean ice temperature" unit="deg C" />528 <field id="ibgtemper" long_name="global mean ice temperature" unit="degree_C" /> 527 529 <field id="ibgheatco" long_name="global mean ice heat content" unit="10^20J" /> 528 530 <field id="sbgheatco" long_name="global mean snow heat content" unit="10^20J" /> … … 579 581 <field id="traj_lat" long_name="floats latitude" unit="degrees_north" /> 580 582 <field id="traj_dep" long_name="floats depth" unit="m" /> 581 <field id="traj_temp" long_name="floats temperature" standard_name="sea_water_potential_temperature" unit="deg C" />583 <field id="traj_temp" long_name="floats temperature" standard_name="sea_water_potential_temperature" unit="degree_C" /> 582 584 <field id="traj_salt" long_name="floats salinity" standard_name="sea_water_practical_salinity" unit="1e-3" /> 583 585 <field id="traj_dens" long_name="floats in-situ density" standard_name="sea_water_density" unit="kg/m3" /> … … 610 612 <field id="zomsfind" long_name="Meridional Stream-Function: Indian" unit="Sv" grid_ref="gznl_W_3D" /> 611 613 <field id="zomsfipc" long_name="Meridional Stream-Function: Pacific+Indian" unit="Sv" grid_ref="gznl_W_3D" /> 612 <field id="zotemglo" long_name="Zonal Mean Temperature : Global" unit="deg C" grid_ref="gznl_T_3D" />613 <field id="zotematl" long_name="Zonal Mean Temperature : Atlantic" unit="deg C" grid_ref="gznl_T_3D" />614 <field id="zotempac" long_name="Zonal Mean Temperature : Pacific" unit="deg C" grid_ref="gznl_T_3D" />615 <field id="zotemind" long_name="Zonal Mean Temperature : Indian" unit="deg C" grid_ref="gznl_T_3D" />616 <field id="zotemipc" long_name="Zonal Mean Temperature : Pacific+Indian" unit="deg C" grid_ref="gznl_T_3D" />614 <field id="zotemglo" long_name="Zonal Mean Temperature : Global" unit="degree_C" grid_ref="gznl_T_3D" /> 615 <field id="zotematl" long_name="Zonal Mean Temperature : Atlantic" unit="degree_C" grid_ref="gznl_T_3D" /> 616 <field id="zotempac" long_name="Zonal Mean Temperature : Pacific" unit="degree_C" grid_ref="gznl_T_3D" /> 617 <field id="zotemind" long_name="Zonal Mean Temperature : Indian" unit="degree_C" grid_ref="gznl_T_3D" /> 618 <field id="zotemipc" long_name="Zonal Mean Temperature : Pacific+Indian" unit="degree_C" grid_ref="gznl_T_3D" /> 617 619 <field id="zosalglo" long_name="Zonal Mean Salinity : Global" unit="1e-3" grid_ref="gznl_T_3D" /> 618 620 <field id="zosalatl" long_name="Zonal Mean Salinity : Atlantic" unit="1e-3" grid_ref="gznl_T_3D" /> … … 655 657 <field_group id="trendT" grid_ref="grid_T_3D"> 656 658 <!-- variables available with ln_tra_trd --> 657 <field id="ttrd_xad" long_name="temperature-trend: i-advection" unit="deg C/s" />659 <field id="ttrd_xad" long_name="temperature-trend: i-advection" unit="degree_C/s" /> 658 660 <field id="strd_xad" long_name="salinity -trend: i-advection" unit="1e-3/s" /> 659 <field id="ttrd_yad" long_name="temperature-trend: j-advection" unit="deg C/s" />661 <field id="ttrd_yad" long_name="temperature-trend: j-advection" unit="degree_C/s" /> 660 662 <field id="strd_yad" long_name="salinity -trend: j-advection" unit="1e-3/s" /> 661 <field id="ttrd_zad" long_name="temperature-trend: k-advection" unit="deg C/s" />663 <field id="ttrd_zad" long_name="temperature-trend: k-advection" unit="degree_C/s" /> 662 664 <field id="strd_zad" long_name="salinity -trend: k-advection" unit="1e-3/s" /> 663 <field id="ttrd_ad" long_name="temperature-trend: advection" standard_name="tendency_of_sea_water_temperature_due_to_advection" unit="deg C/s" > sqrt( ttrd_xad^2 + ttrd_yad^2 + ttrd_zad^2 ) </field>665 <field id="ttrd_ad" long_name="temperature-trend: advection" standard_name="tendency_of_sea_water_temperature_due_to_advection" unit="degree_C/s" > sqrt( ttrd_xad^2 + ttrd_yad^2 + ttrd_zad^2 ) </field> 664 666 <field id="strd_ad" long_name="salinity -trend: advection" standard_name="tendency_of_sea_water_salinity_due_to_advection" unit="1e-3/s" > sqrt( strd_xad^2 + strd_yad^2 + strd_zad^2 ) </field> 665 <field id="ttrd_sad" long_name="temperature-trend: surface adv. (no-vvl)" unit="deg C/s" grid_ref="grid_T_2D" />667 <field id="ttrd_sad" long_name="temperature-trend: surface adv. (no-vvl)" unit="degree_C/s" grid_ref="grid_T_2D" /> 666 668 <field id="strd_sad" long_name="salinity -trend: surface adv. (no-vvl)" unit="1e-3/s" grid_ref="grid_T_2D" /> 667 <field id="ttrd_ldf" long_name="temperature-trend: lateral diffusion" standard_name="tendency_of_sea_water_temperature_due_to_horizontal_mixing" unit="deg C/s" />669 <field id="ttrd_ldf" long_name="temperature-trend: lateral diffusion" standard_name="tendency_of_sea_water_temperature_due_to_horizontal_mixing" unit="degree_C/s" /> 668 670 <field id="strd_ldf" long_name="salinity -trend: lateral diffusion" standard_name="tendency_of_sea_water_salinity_due_to_horizontal_mixing" unit="1e-3/s" /> 669 <field id="ttrd_zdf" long_name="temperature-trend: vertical diffusion" standard_name="tendency_of_sea_water_temperature_due_to_vertical_mixing" unit="deg C/s" />671 <field id="ttrd_zdf" long_name="temperature-trend: vertical diffusion" standard_name="tendency_of_sea_water_temperature_due_to_vertical_mixing" unit="degree_C/s" /> 670 672 <field id="strd_zdf" long_name="salinity -trend: vertical diffusion" standard_name="tendency_of_sea_water_salinity_due_to_vertical_mixing" unit="1e-3/s" /> 671 673 672 674 <!-- ln_traldf_iso=T only (iso-neutral diffusion) --> 673 <field id="ttrd_zdfp" long_name="temperature-trend: pure vert. diffusion" unit="deg C/s" />675 <field id="ttrd_zdfp" long_name="temperature-trend: pure vert. diffusion" unit="degree_C/s" /> 674 676 <field id="strd_zdfp" long_name="salinity -trend: pure vert. diffusion" unit="1e-3/s" /> 675 677 676 678 <!-- --> 677 <field id="ttrd_dmp" long_name="temperature-trend: interior restoring" unit="deg C/s" />679 <field id="ttrd_dmp" long_name="temperature-trend: interior restoring" unit="degree_C/s" /> 678 680 <field id="strd_dmp" long_name="salinity -trend: interior restoring" unit="1e-3/s" /> 679 <field id="ttrd_bbl" long_name="temperature-trend: bottom boundary layer" unit="deg C/s" />681 <field id="ttrd_bbl" long_name="temperature-trend: bottom boundary layer" unit="degree_C/s" /> 680 682 <field id="strd_bbl" long_name="salinity -trend: bottom boundary layer" unit="1e-3/s" /> 681 <field id="ttrd_npc" long_name="temperature-trend: non-penetrative conv." unit="deg C/s" />683 <field id="ttrd_npc" long_name="temperature-trend: non-penetrative conv." unit="degree_C/s" /> 682 684 <field id="strd_npc" long_name="salinity -trend: non-penetrative conv." unit="1e-3/s" /> 683 <field id="ttrd_qns" long_name="temperature-trend: non-solar flux + runoff" unit="deg C/s" />684 <field id="strd_cdt" long_name="salinity -trend: C/D term + runoff" unit="deg C/s" />685 <field id="ttrd_qsr" long_name="temperature-trend: solar penetr. heating" unit="deg C/s" />686 <field id="ttrd_bbc" long_name="temperature-trend: geothermal heating" unit="deg C/s" />687 <field id="ttrd_atf" long_name="temperature-trend: asselin time filter" unit="deg C/s" />685 <field id="ttrd_qns" long_name="temperature-trend: non-solar flux + runoff" unit="degree_C/s" /> 686 <field id="strd_cdt" long_name="salinity -trend: C/D term + runoff" unit="degree_C/s" /> 687 <field id="ttrd_qsr" long_name="temperature-trend: solar penetr. heating" unit="degree_C/s" /> 688 <field id="ttrd_bbc" long_name="temperature-trend: geothermal heating" unit="degree_C/s" /> 689 <field id="ttrd_atf" long_name="temperature-trend: asselin time filter" unit="degree_C/s" /> 688 690 <field id="strd_atf" long_name="salinity -trend: asselin time filter" unit="1e-3/s" /> 689 691 … … 727 729 <field id="petrd_atf" long_name="pe-trend: asselin time filter" unit="W/m^3" /> 728 730 <field id="PEanom" long_name="potential energy anomaly" unit="1" /> 729 <field id="alphaPE" long_name="partial deriv. of PEanom wrt T" unit="deg C-1" />731 <field id="alphaPE" long_name="partial deriv. of PEanom wrt T" unit="degree_C-1" /> 730 732 <field id="betaPE" long_name="partial deriv. of PEanom wrt S" unit="1e3" /> 731 733 </field_group> -
branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90
r6435 r6535 318 318 CALL iom_put( "hdiv", hdivn ) ! Horizontal divergence 319 319 ! 320 IF( iom_use("u_masstr") .OR. iom_use("u_ heattr") .OR. iom_use("u_salttr") ) THEN320 IF( iom_use("u_masstr") .OR. iom_use("u_masstr_vint") .OR. iom_use("u_heattr") .OR. iom_use("u_salttr") ) THEN 321 321 z3d(:,:,jpk) = 0.e0 322 z2d(:,:) = 0.e0 322 323 DO jk = 1, jpkm1 323 324 z3d(:,:,jk) = rau0 * un(:,:,jk) * e2u(:,:) * fse3u(:,:,jk) * umask(:,:,jk) 325 z2d(:,:) = z2d(:,:) + z3d(:,:,jk) 324 326 END DO 325 327 CALL iom_put( "u_masstr", z3d ) ! mass transport in i-direction 328 CALL iom_put( "u_masstr_vint", z2d ) ! mass transport in i-direction vertical sum 326 329 ENDIF 327 330 -
branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90
r6427 r6535 228 228 ! automatic definitions of some of the xml attributs 229 229 CALL set_xmlatt 230 231 CALL set_1point 230 232 231 233 ! end file definition … … 1567 1569 zz=REAL(narea,wp) 1568 1570 CALL iom_set_domain_attr('scalarpoint', lonvalue=zz, latvalue=zz) 1569 1571 1570 1572 END SUBROUTINE set_scalar 1573 1574 SUBROUTINE set_1point 1575 !!---------------------------------------------------------------------- 1576 !! *** ROUTINE set_1point *** 1577 !! 1578 !! ** Purpose : define zoom grid for scalar fields 1579 !! 1580 !!---------------------------------------------------------------------- 1581 REAL(wp), DIMENSION(1) :: zz = 1. 1582 INTEGER :: ix, iy 1583 !!---------------------------------------------------------------------- 1584 CALL dom_ngb( 180., 90., ix, iy, 'T' ) ! Nearest point to north pole should be ocean 1585 CALL iom_set_domain_attr('1point', zoom_ibegin=ix, zoom_jbegin=iy) 1586 1587 END SUBROUTINE set_1point 1571 1588 1572 1589 -
branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90
r6427 r6535 1409 1409 zemp_tot(:,:) = frcv(jpr_tevp)%z3(:,:,1) - ztprecip(:,:) 1410 1410 zemp_ice(:,:) = frcv(jpr_ievp)%z3(:,:,1) - frcv(jpr_snow)%z3(:,:,1) 1411 CALL iom_put( 'rain' , frcv(jpr_rain)%z3(:,:,1) ) ! liquid precipitation 1411 CALL iom_put( 'rain' , frcv(jpr_rain)%z3(:,:,1) * tmask(:,:,1) ) ! liquid precipitation 1412 CALL iom_put( 'rain_ao_cea' , frcv(jpr_rain)%z3(:,:,1)* p_frld(:,:) * tmask(:,:,1) ) ! liquid precipitation 1412 1413 IF( iom_use('hflx_rain_cea') ) & 1413 CALL iom_put( 'hflx_rain_cea', frcv(jpr_rain)%z3(:,:,1) * zcptn(:,:) ) ! heat flux from liq. precip.1414 CALL iom_put( 'hflx_rain_cea', frcv(jpr_rain)%z3(:,:,1) * zcptn(:,:) * tmask(:,:,1)) ! heat flux from liq. precip. 1414 1415 IF( iom_use('evap_ao_cea') .OR. iom_use('hflx_evap_cea') ) & 1415 1416 ztmp(:,:) = frcv(jpr_tevp)%z3(:,:,1) - frcv(jpr_ievp)%z3(:,:,1) * zicefr(:,:) 1416 1417 IF( iom_use('evap_ao_cea' ) ) & 1417 CALL iom_put( 'evap_ao_cea' , ztmp ) ! ice-free oce evap (cell average)1418 CALL iom_put( 'evap_ao_cea' , ztmp * tmask(:,:,1) ) ! ice-free oce evap (cell average) 1418 1419 IF( iom_use('hflx_evap_cea') ) & 1419 CALL iom_put( 'hflx_evap_cea', ztmp(:,:) * zcptn(:,:) ) ! heat flux from from evap (cell average)1420 CALL iom_put( 'hflx_evap_cea', ztmp(:,:) * zcptn(:,:) * tmask(:,:,1) ) ! heat flux from from evap (cell average) 1420 1421 CASE( 'oce and ice' ) ! received fields: jpr_sbpr, jpr_semp, jpr_oemp, jpr_ievp 1421 1422 zemp_tot(:,:) = p_frld(:,:) * frcv(jpr_oemp)%z3(:,:,1) + zicefr(:,:) * frcv(jpr_sbpr)%z3(:,:,1) … … 1479 1480 ! runoffs and calving (put in emp_tot) 1480 1481 IF( srcv(jpr_rnf)%laction ) rnf(:,:) = frcv(jpr_rnf)%z3(:,:,1) 1482 IF( iom_use('hflx_rnf_cea') ) & 1483 CALL iom_put( 'hflx_rnf_cea' , rnf(:,:) * zcptn(:,:) ) 1481 1484 IF( srcv(jpr_cal)%laction ) THEN 1482 1485 zemp_tot(:,:) = zemp_tot(:,:) - frcv(jpr_cal)%z3(:,:,1) … … 1496 1499 ENDIF 1497 1500 1498 CALL iom_put( 'snowpre' , sprecip 1501 CALL iom_put( 'snowpre' , sprecip * tmask(:,:,1) ) ! Snow 1499 1502 IF( iom_use('snow_ao_cea') ) & 1500 CALL iom_put( 'snow_ao_cea', sprecip(:,:) * p_frld(:,:) 1503 CALL iom_put( 'snow_ao_cea', sprecip(:,:) * p_frld(:,:) * tmask(:,:,1) ) ! Snow over ice-free ocean (cell average) 1501 1504 IF( iom_use('snow_ai_cea') ) & 1502 CALL iom_put( 'snow_ai_cea', sprecip(:,:) * zicefr(:,:) 1505 CALL iom_put( 'snow_ai_cea', sprecip(:,:) * zicefr(:,:) * tmask(:,:,1) ) ! Snow over sea-ice (cell average) 1503 1506 #endif 1504 1507 -
branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/NEMO/OPA_SRC/TRA/traadv_tvd.F90
r6433 r6535 262 262 ztrdz(:,:,:) = ztrdz(:,:,:) + zwz(:,:,:) ! <<< Add to previously computed 263 263 264 CALL trd_tra( kt, cdtype, jn, jptra_xad, ztrdx, pun, ptn(:,:,:,jn) ) 265 CALL trd_tra( kt, cdtype, jn, jptra_yad, ztrdy, pvn, ptn(:,:,:,jn) ) 266 CALL trd_tra( kt, cdtype, jn, jptra_zad, ztrdz, pwn, ptn(:,:,:,jn) ) 264 CALL trd_tra( kt, cdtype, jn, jptra_xad, ztrdx, pun, ptn(:,:,:,jn) ) 265 CALL trd_tra( kt, cdtype, jn, jptra_yad, ztrdy, pvn, ptn(:,:,:,jn) ) 266 CALL trd_tra( kt, cdtype, jn, jptra_zad, ztrdz, pwn, ptn(:,:,:,jn) ) 267 267 END IF 268 268 ! ! "Poleward" heat and salt transports (contribution of upstream fluxes) -
branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/NEMO/OPA_SRC/ZDF/zdftmx.F90
r6437 r6535 918 918 CALL iom_put( "pcmap_tmx", pcmap_tmx ) 919 919 ENDIF 920 CALL iom_put( "bn2", rn2 ) 920 921 CALL iom_put( "emix_tmx", emix_tmx ) 921 922
Note: See TracChangeset
for help on using the changeset viewer.
