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.

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

Cleaned up and improved generalization of mpas_isobaric_diagnostics code #1184

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
85 changes: 15 additions & 70 deletions src/core_atmosphere/Registry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,8 @@
<package name="limited_area" description="Limited-area simulations, which have lateral boundaries"/>
<package name="jedi_da" description="Data Assimilation in JEDI framework"/>
<package name="no_invariant_stream" description="No separate invariant I/O stream is active"/>

<package name="isobaric" description="Isobaric interpolation of model variables"/>
</packages>


Expand Down Expand Up @@ -976,76 +978,19 @@
<var name="Time"/>

<!-- Begin isobaric diagnostics defined in diagnostics/Registry_isobaric.xml -->
<var name="mslp"/>
<var name="relhum_50hPa"/>
<var name="relhum_100hPa"/>
<var name="relhum_200hPa"/>
<var name="relhum_250hPa"/>
<var name="relhum_500hPa"/>
<var name="relhum_700hPa"/>
<var name="relhum_850hPa"/>
<var name="relhum_925hPa"/>
<var name="dewpoint_50hPa"/>
<var name="dewpoint_100hPa"/>
<var name="dewpoint_200hPa"/>
<var name="dewpoint_250hPa"/>
<var name="dewpoint_500hPa"/>
<var name="dewpoint_700hPa"/>
<var name="dewpoint_850hPa"/>
<var name="dewpoint_925hPa"/>
<var name="temperature_50hPa"/>
<var name="temperature_100hPa"/>
<var name="temperature_200hPa"/>
<var name="temperature_250hPa"/>
<var name="temperature_500hPa"/>
<var name="temperature_700hPa"/>
<var name="temperature_850hPa"/>
<var name="temperature_925hPa"/>
<var name="height_50hPa"/>
<var name="height_100hPa"/>
<var name="height_200hPa"/>
<var name="height_250hPa"/>
<var name="height_500hPa"/>
<var name="height_700hPa"/>
<var name="height_850hPa"/>
<var name="height_925hPa"/>
<var name="uzonal_50hPa"/>
<var name="uzonal_100hPa"/>
<var name="uzonal_200hPa"/>
<var name="uzonal_250hPa"/>
<var name="uzonal_500hPa"/>
<var name="uzonal_700hPa"/>
<var name="uzonal_850hPa"/>
<var name="uzonal_925hPa"/>
<var name="umeridional_50hPa"/>
<var name="umeridional_100hPa"/>
<var name="umeridional_200hPa"/>
<var name="umeridional_250hPa"/>
<var name="umeridional_500hPa"/>
<var name="umeridional_700hPa"/>
<var name="umeridional_850hPa"/>
<var name="umeridional_925hPa"/>
<var name="w_50hPa"/>
<var name="w_100hPa"/>
<var name="w_200hPa"/>
<var name="w_250hPa"/>
<var name="w_500hPa"/>
<var name="w_700hPa"/>
<var name="w_850hPa"/>
<var name="w_925hPa"/>
<var name="vorticity_50hPa"/>
<var name="vorticity_100hPa"/>
<var name="vorticity_200hPa"/>
<var name="vorticity_250hPa"/>
<var name="vorticity_500hPa"/>
<var name="vorticity_700hPa"/>
<var name="vorticity_850hPa"/>
<var name="vorticity_925hPa"/>
<var name="t_isobaric"/>
<var name="t_iso_levels"/>
<var name="z_isobaric"/>
<var name="z_iso_levels"/>
<var name="meanT_500_300"/>
<var name="mslp" packages="isobaric"/>
<var name="iso_levels" packages="isobaric"/>
<var name="temperature_isobaric" packages="isobaric"/>
<var name="theta_isobaric" packages="isobaric"/>
<var name="dewpoint_isobaric" packages="isobaric"/>
<var name="relhum_isobaric" packages="isobaric"/>
<var name="qvapor_isobaric" packages="isobaric"/>
<var name="uzonal_isobaric" packages="isobaric"/>
<var name="umeridional_isobaric" packages="isobaric"/>
<var name="height_isobaric" packages="isobaric"/>
<var name="geoheight_isobaric" packages="isobaric"/>
<var name="w_isobaric" packages="isobaric"/>
<var name="vorticity_isobaric" packages="isobaric"/>
<!-- End isobaric diagnostics defined in diagnostics/Registry_isobaric.xml -->

#ifdef DO_PHYSICS
Expand Down
5 changes: 3 additions & 2 deletions src/core_atmosphere/diagnostics/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,15 @@ mpas_soundings.o:


################### Generally no need to modify below here ###################
# MC -- added mpas_atmphys_packages.o


OBJS = mpas_atm_diagnostics_manager.o mpas_atm_diagnostics_utils.o
OBJS = mpas_atm_diagnostics_manager.o mpas_atm_diagnostics_utils.o mpas_atm_diagnostics_packages.o

all: $(DIAGNOSTIC_MODULES) $(OBJS)

mpas_atm_diagnostics_manager.o: mpas_atm_diagnostics_utils.o $(DIAGNOSTIC_MODULES)

mpas_atm_diagnostics_packages.o: mpas_atm_diagnostics_utils.o

clean:
$(RM) *.o *.mod *.f90
Expand Down
14 changes: 14 additions & 0 deletions src/core_atmosphere/diagnostics/Registry_diagnostics.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,20 @@
<!-- soundings -->
#include "Registry_soundings.xml"


<!-- ........................................................................ -->
<!-- Declare namelist config options for tendency and PV diagnostics packages -->
<!-- ........................................................................ -->
<nml_record name="diagnostics" in_defaults="false">

<!-- Namelist option for isobaric interpolation of model variables -->
<nml_option name="config_isobaric" type="logical" default_value="false" in_defaults="false"
units="-"
description="Logical for outputting model variables interpolated to isobaric levels"
possible_values=".true. for isobaric interpolation; .false. otherwise"/>

</nml_record>

<!-- ******************************* -->
<!-- End includes from diagnostics -->
<!-- ******************************* -->
Loading