Skip to content

Commit

Permalink
MOM6: Merge branch 'nicjhan-186-preale-register-not-post
Browse files Browse the repository at this point in the history
- NOAA-GFDL/MOM6@a8ce340 Merge branch 'nicjhan-186-preale-register-not-post' into dev/master
- NOAA-GFDL/MOM6@d54242d Merge branch '186-preale-register-not-post' of https://github.com/nicjhan/MOM6 into nicjhan-186-preale-register-not-post
- NOAA-GFDL/MOM6@240c27c Set conditions on *_preale diagnostic registration. Closes mom-ocean#186
  • Loading branch information
adcroft committed Jun 15, 2015
1 parent 15f71ce commit 5353336
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 76 deletions.
15 changes: 0 additions & 15 deletions ice_ocean_SIS/GOLD_SIS/available_diags.000000
Original file line number Diff line number Diff line change
Expand Up @@ -913,21 +913,6 @@
"ocean_model", "e_predia" [Unused]
! long_name: Interface Heights before diabatic forcing
! units: meter
"ocean_model", "u_preale" [Unused]
! long_name: Zonal velocity before remapping
! units: meter second-1
"ocean_model", "v_preale" [Unused]
! long_name: Meridional velocity before remapping
! units: meter second-1
"ocean_model", "h_preale" [Unused]
! long_name: Layer Thickness before remapping
! units: meter
"ocean_model", "T_preale" [Unused]
! long_name: Temperature before remapping
! units: degC
"ocean_model", "S_preale" [Unused]
! long_name: Salinity before remapping
! units: ppt
"ocean_model", "temp_predia" [Unused]
! long_name: Potential Temperature
! units: Celsius
Expand Down
15 changes: 0 additions & 15 deletions ocean_only/global/available_diags.000000
Original file line number Diff line number Diff line change
Expand Up @@ -967,21 +967,6 @@
"ocean_model", "e_predia" [Unused]
! long_name: Interface Heights before diabatic forcing
! units: meter
"ocean_model", "u_preale" [Unused]
! long_name: Zonal velocity before remapping
! units: meter second-1
"ocean_model", "v_preale" [Unused]
! long_name: Meridional velocity before remapping
! units: meter second-1
"ocean_model", "h_preale" [Unused]
! long_name: Layer Thickness before remapping
! units: meter
"ocean_model", "T_preale" [Unused]
! long_name: Temperature before remapping
! units: degC
"ocean_model", "S_preale" [Unused]
! long_name: Salinity before remapping
! units: ppt
"ocean_model", "temp_predia" [Unused]
! long_name: Potential Temperature
! units: Celsius
Expand Down
15 changes: 0 additions & 15 deletions ocean_only/global_ALE/layer/available_diags.000000
Original file line number Diff line number Diff line change
Expand Up @@ -1052,21 +1052,6 @@
"ocean_model", "e_predia" [Unused]
! long_name: Interface Heights before diabatic forcing
! units: meter
"ocean_model", "u_preale" [Unused]
! long_name: Zonal velocity before remapping
! units: meter second-1
"ocean_model", "v_preale" [Unused]
! long_name: Meridional velocity before remapping
! units: meter second-1
"ocean_model", "h_preale" [Unused]
! long_name: Layer Thickness before remapping
! units: meter
"ocean_model", "T_preale" [Unused]
! long_name: Temperature before remapping
! units: degC
"ocean_model", "S_preale" [Unused]
! long_name: Salinity before remapping
! units: ppt
"ocean_model", "temp_predia" [Unused]
! long_name: Potential Temperature
! units: Celsius
Expand Down
15 changes: 0 additions & 15 deletions ocean_only/global_ALE/z/available_diags.000000
Original file line number Diff line number Diff line change
Expand Up @@ -977,21 +977,6 @@
"ocean_model", "e_predia" [Unused]
! long_name: Interface Heights before diabatic forcing
! units: meter
"ocean_model", "u_preale" [Unused]
! long_name: Zonal velocity before remapping
! units: meter second-1
"ocean_model", "v_preale" [Unused]
! long_name: Meridional velocity before remapping
! units: meter second-1
"ocean_model", "h_preale" [Unused]
! long_name: Layer Thickness before remapping
! units: meter
"ocean_model", "T_preale" [Unused]
! long_name: Temperature before remapping
! units: degC
"ocean_model", "S_preale" [Unused]
! long_name: Salinity before remapping
! units: ppt
"ocean_model", "temp_predia" [Unused]
! long_name: Potential Temperature
! units: Celsius
Expand Down
15 changes: 0 additions & 15 deletions ocean_only/mixed_layer_restrat_2d/available_diags.000000
Original file line number Diff line number Diff line change
Expand Up @@ -769,21 +769,6 @@
"ocean_model", "e_predia" [Unused]
! long_name: Interface Heights before diabatic forcing
! units: meter
"ocean_model", "u_preale" [Unused]
! long_name: Zonal velocity before remapping
! units: meter second-1
"ocean_model", "v_preale" [Unused]
! long_name: Meridional velocity before remapping
! units: meter second-1
"ocean_model", "h_preale" [Unused]
! long_name: Layer Thickness before remapping
! units: meter
"ocean_model", "T_preale" [Unused]
! long_name: Temperature before remapping
! units: degC
"ocean_model", "S_preale" [Unused]
! long_name: Salinity before remapping
! units: ppt
"ocean_model", "temp_predia" [Unused]
! long_name: Potential Temperature
! units: Celsius
Expand Down
2 changes: 1 addition & 1 deletion src/MOM6
Submodule MOM6 updated from bd2320 to a8ce34

0 comments on commit 5353336

Please sign in to comment.