Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

User/jpk/cmor named diagnostics #35

Merged
merged 8 commits into from
Jul 18, 2014
Merged

User/jpk/cmor named diagnostics #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
87f6e6c
Draft wrapper of register_diag_field for CMOR arguments
adcroft Jul 3, 2014
3b58fcf
Added keyword arguments for cmor names/attributes
jkrasting Jul 10, 2014
a674159
Multiple registration of fields based on CMOR arguments
adcroft Jul 11, 2014
73352d1
Added logic where CMOR attributes will fall back to MOM attributes if…
jkrasting Jul 15, 2014
9924ef5
Additional framework for CMOR diagnostics
jkrasting Jul 17, 2014
3e9b3af
Added some diagnostics provided to CMIP5
jkrasting Jul 17, 2014
c53612f
Changed intent of diag in coupled_driver/MOM_surface_forcing.F90
adcroft Jul 18, 2014
31f361e
Updated available_diags following commit 3e9b3af
adcroft Jul 18, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions config_src/coupled_driver/MOM_surface_forcing.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,12 +678,12 @@ subroutine forcing_save_restart(CS, G, Time, directory, time_stamped, &
end subroutine forcing_save_restart

subroutine surface_forcing_init(Time, G, param_file, diag, CS, restore_salt)
type(time_type), intent(in) :: Time
type(ocean_grid_type), intent(in) :: G
type(param_file_type), intent(in) :: param_file
type(diag_ctrl), target, intent(in) :: diag
type(surface_forcing_CS), pointer :: CS
logical, optional, intent(in) :: restore_salt
type(time_type), intent(in) :: Time
type(ocean_grid_type), intent(in) :: G
type(param_file_type), intent(in) :: param_file
type(diag_ctrl), target, intent(inout) :: diag
type(surface_forcing_CS), pointer :: CS
logical, optional, intent(in) :: restore_salt
! Arguments: Time - The current model time.
! (in) G - The ocean's grid structure.
! (in) param_file - A structure indicating the open file to parse for
Expand Down
2 changes: 1 addition & 1 deletion config_src/solo_driver/MOM_surface_forcing.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1726,7 +1726,7 @@ subroutine surface_forcing_init(Time, G, param_file, diag, CS, tracer_flow_CSp)
type(time_type), intent(in) :: Time
type(ocean_grid_type), intent(in) :: G
type(param_file_type), intent(in) :: param_file
type(diag_ctrl), target, intent(in) :: diag
type(diag_ctrl), target,intent(inout) :: diag
type(surface_forcing_CS), pointer :: CS
type(tracer_flow_control_CS), pointer :: tracer_flow_CSp
! Arguments: Time - The current model time.
Expand Down
93 changes: 93 additions & 0 deletions examples/ocean_SIS/GOLD_SIS/available_diags.000000
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,10 @@
"ocean_model", "mass_wt" [Unused]
! long_name: The column mass for calculating mass-weighted average properties
! units: kg m-2
"ocean_model", "masscello" [Unused]
! long_name: Sea Water Mass Per Unit Area
! units: kg m-2
! standard_name: sea_water_mass_per_unit_area
"ocean_model", "temp_int" [Unused]
! long_name: The mass weighted column integrated temperature
! units: degC kg m-2
Expand All @@ -409,9 +413,17 @@
"ocean_model", "u_z" [Used]
! long_name: Zonal Velocity in Depth Space
! units: meter second-1
"ocean_model", "uo_z" [Unused]
! long_name: Sea Water X Velocity
! units: m s-1
! standard_name: sea_water_x_velocity
"ocean_model", "v_z" [Used]
! long_name: Meridional Velocity in Depth Space
! units: meter second-1
"ocean_model", "vo_z" [Unused]
! long_name: Sea Water Y Velocity
! units: m s-1
! standard_name: sea_water_y_velocity
"ocean_model", "uh_z" [Unused]
! long_name: Zonal Volume Transport in Depth Space
! units: meter3 second-1
Expand Down Expand Up @@ -616,9 +628,17 @@
"ocean_model", "u" [Used]
! long_name: Zonal velocity
! units: meter second-1
"ocean_model", "uo" [Unused]
! long_name: Sea Water X Velocity
! units: m s-1
! standard_name: sea_water_x_velocity
"ocean_model", "v" [Used]
! long_name: Meridional velocity
! units: meter second-1
"ocean_model", "vo" [Unused]
! long_name: Sea Water Y Velocity
! units: m s-1
! standard_name: sea_water_y_velocity
"ocean_model", "h" [Used]
! long_name: Layer Thickness
! units: meter
Expand All @@ -643,12 +663,20 @@
"ocean_model", "salt" [Used]
! long_name: Salinity
! units: PSU
"ocean_model", "so" [Unused]
! long_name: Sea Water Salinity
! units: psu
! standard_name: sea_water_salinity
"ocean_model", "SST" [Used]
! long_name: Sea Surface Temperature
! units: Celsius
"ocean_model", "SST_global" [Unused]
! long_name: Global Average Sea Surface Temperature
! units: Celsius
"ocean_model", "tosga" [Unused]
! long_name: Global Average Sea Surface Temperature
! units: deg C
! standard_name: global_average_sea_surface_temperature
"ocean_model", "SST_sq" [Unused]
! long_name: Sea Surface Temperature Squared
! units: Celsius**2
Expand All @@ -661,6 +689,10 @@
"ocean_model", "frazil" [Unused]
! long_name: Heat sink from frazil formation
! units: Watt meter-2
"ocean_model", "hfsifrazil" [Unused]
! long_name: Heat Flux into Sea Water due to Frazil Ice Formation"
! units: W m-2
! standard_name: heat_flux_into_sea_water_due_to_freezing_of_frazil_ice
"ocean_model", "salt_deficit" [Unused]
! long_name: Salt sink in ocean due to ice flux
! units: g Salt meter-2 s-1
Expand Down Expand Up @@ -739,9 +771,15 @@
"ocean_model", "temp_z" [Used]
! long_name: Potential Temperature
! units: degC
! standard_name: not provided
"ocean_model", "salt_z" [Used]
! long_name: Salinity
! units: PSU
! standard_name: not provided
"ocean_model", "so_z" [Unused]
! long_name: Sea Water Salinity
! units: psu
! standard_name: sea_water_salinity
"ocean_model", "age" [Unused]
! long_name: Ideal Age Tracer
! units: years
Expand All @@ -760,18 +798,21 @@
"ocean_model", "age_z" [Used]
! long_name: Ideal Age Tracer
! units: years
! standard_name: not provided
"ocean_model", "CFC11" [Unused]
! long_name: CFC-11 Concentration
! units: mol m-3
"ocean_model", "CFC11_z" [Unused]
! long_name: CFC-11 Concentration
! units: mol m-3
! standard_name: not provided
"ocean_model", "CFC12" [Unused]
! long_name: CFC-12 Concentration
! units: mol m-3
"ocean_model", "CFC12_z" [Unused]
! long_name: CFC-12 Concentration
! units: mol m-3
! standard_name: not provided
"ocean_model", "CFC11_adx" [Unused]
! long_name: CFC-11 Concentration advective zonal flux
! units: mol s-1
Expand Down Expand Up @@ -800,21 +841,37 @@
! long_name: Zonal surface stress from ocean interactions with atmos and ice
! units: Pascal
! standard_name: surface_downward_x_stress
"ocean_model", "tauuo" [Unused]
! long_name: Surface Downward X Stress
! units: N m-2
! standard_name: surface_downward_x_stress
"ocean_model", "tauy" [Used]
! long_name: Meridional surface stress ocean interactions with atmos and ice
! units: Pascal
! standard_name: surface_downward_y_stress
"ocean_model", "tauvo" [Unused]
! long_name: Surface Downward Y Stress
! units: N m-2
! standard_name: surface_downward_y_stress
"ocean_model", "ustar" [Used]
! long_name: Surface friction velocity = [(gustiness + tau_magnitude)/rho0]^(1/2)
! units: meter second-1
"ocean_model", "PRCmE" [Unused]
! long_name: Net surface water flux (precip+liq runoff+ice calving-evap)
! units: kilogram meter-2 second-1
! standard_name: water_flux_into_sea_water
"ocean_model", "wfo" [Unused]
! long_name: Water Flux Into Sea Water
! units: kg m-2 s-1
! standard_name: water_flux_into_sea_water
"ocean_model", "evap" [Unused]
! long_name: Evaporation/condensation at ocean surface (evaporation is negative)
! units: kilogram meter-2 second-1
! standard_name: water_evaporation_flux
"ocean_model", "evs" [Unused]
! long_name: Water Evaporation Flux Where Ice Free Ocean over Sea
! units: kg m-2 s-1
! standard_name: water_evaporation_flux
"ocean_model", "seaice_melt" [Unused]
! long_name: water flux to ocean from sea ice melt(> 0) or form(< 0)
! units: kilogram meter-2 second-1
Expand All @@ -826,6 +883,10 @@
! long_name: Frozen precipitation into ocean
! units: kilogram meter-2 second-1
! standard_name: snowfall_flux
"ocean_model", "prsn" [Unused]
! long_name: Snowfall Flux where Ice Free Ocean over Sea
! units: kg m-2 s-1
! standard_name: snowfall_flux
"ocean_model", "liq_precip" [Unused]
! long_name: Liquid precipitation into ocean
! units: kilogram meter-2 second-1
Expand All @@ -841,14 +902,26 @@
! long_name: Liquid runoff (rivers) into ocean
! units: kilogram meter-2 second-1
! standard_name: water_flux_into_sea_water_from_rivers
"ocean_model", "friver" [Unused]
! long_name: Water Flux into Sea Water From Rivers
! units: kg m-2 s-1
! standard_name: water_flux_into_sea_water_from_rivers
"ocean_model", "calving_heat_content" [Unused]
! long_name: Heat content of frozen runoff (calving) into ocean
! units: Watt meter-2
! standard_name: temperature_flux_due_to_icebergs_expressed_as_heat_flux_into_sea_water
"ocean_model", "hfibthermds" [Unused]
! long_name: Heat Flux into Sea Water due to Iceberg Thermodynamics
! units: W m-2
! standard_name: heat_flux_into_sea_water_due_to_iceberg_thermodynamics
"ocean_model", "runoff_heat_content" [Unused]
! long_name: Heat content of liquid river runoff into ocean
! units: Watt meter-2
! standard_name: temperature_flux_due_to_runoff_expressed_as_heat_flux_into_sea_water
"ocean_model", "hfrunoffds" [Unused]
! long_name: Temperature Flux due to Runoff Expressed as Heat Flux into Sea Water
! units: W m-2
! standard_name: temperature_flux_due_to_runoff_expressed_as_heat_flux_into_sea_water
"ocean_model", "precip_heat_content" [Unused]
! long_name: Heat content (relative to oC) of precipitation entering ocean
! units: Watt meter-2
Expand All @@ -867,16 +940,28 @@
! long_name: Shortwave radiation flux into ocean
! units: Watt meter-2
! standard_name: surface_net_downward_shortwave_flux
"ocean_model", "rsntds" [Unused]
! long_name: Net Downward Shortwave Radiation at Sea Water Surface
! units: W m-2
! standard_name: net_downward_shortwave_flux_at_sea_water_surface
"ocean_model", "LwLatSens" [Used]
! long_name: Combined longwave, latent, and sensible heating
! units: Watt meter-2
"ocean_model", "LW" [Unused]
! long_name: Longwave radiation flux into ocean
! units: Watt meter-2
! standard_name: surface_net_downward_longwave_flux
"ocean_model", "rlds" [Unused]
! long_name: Surface Net Downward Longwave Radiation
! units: W m-2
! standard_name: surface_net_downward_longwave_flux
"ocean_model", "latent" [Unused]
! long_name: Latent heat flux into ocean due to fusion and evaporation (negative means ocean losses heat)
! units: Watt meter-2
"ocean_model", "hfls" [Unused]
! long_name: Surface Downward Latent Heat Flux
! units: W m-2
! standard_name: surface_downward_latent_heat_flux
"ocean_model", "latent_evap" [Unused]
! long_name: Latent heat flux into ocean due to evaporation/condensation
! units: Watt meter-2
Expand All @@ -890,6 +975,10 @@
! long_name: Sensible heat flux into ocean
! units: Watt meter-2
! standard_name: surface_downward_sensible_heat_flux
"ocean_model", "hfss" [Unused]
! long_name: Surface Downward Sensible Heat Flux
! units: W m-2
! standard_name: surface_downward_sensible_heat_flux
"ocean_model", "heat_rest" [Unused]
! long_name: Restoring surface heat flux into ocean
! units: Watt meter-2
Expand All @@ -899,6 +988,10 @@
"ocean_model", "salt_flux" [Used]
! long_name: Salt flux into ocean at surface
! units: kilogram meter-2 second-1
"ocean_model", "sfdsi" [Unused]
! long_name: Downward Sea Ice Basal Salt Flux
! units: kg m-2 s-1
! standard_name: downward_sea_ice_basal_salt_flux
"ocean_model", "salt_flux_in" [Unused]
! long_name: Salt flux into ocean at surface from coupler
! units: kilogram meter-2 second-1
Expand Down
Loading