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

Update MICM wrapper for species unit conversions #78

Merged
merged 14 commits into from
Feb 21, 2024
Prev Previous commit
Next Next commit
update doc/changelog
  • Loading branch information
boulderdaze committed Feb 7, 2024
commit 1f1a9cf7629dfaf233dc71027b0f45bd1da9b871
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -11,6 +11,6 @@ jobs:
with:
submodules: recursive
- name: build Docker image
run: docker build -t musica -f docker/Dockerfile.musica .
run: docker build -t musica -f test/docker/Dockerfile.musica .
- name: run tests in container
run: docker run --name test-container -t musica bash -c 'ctest'
21 changes: 21 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ Purpose of changes (include the issue number and title text for each relevant Gi

The main purpose of this PR is to add unit conversion functions for species concentrations
to convert CAM-SIMA units (kg kg-1) to MICM units (mol m-3) and vise versa.
A github action has also been added to test the new MICM-CCPP interface.

This PR fixes the following NCAR/atmospheric_physics Github issues:

@@ -26,6 +27,26 @@ M musica/micm/micm.meta
- Updated the list of the entries that are added
M suite_musica.xml
- Updated the xml to add dry air density scheme
M utilities/state_converters.meta
- Updated the standard name of dry air density
A .github/workflows/test.yaml
- Added github action to automate testing
A test/.dockerignore
A test/CMakeLists.txt
A test/cmake/SetDefaults.cmake
A test/docker/Dockerfile.musica
A test/include/ccpp_kinds.F90
A test/musica/micm/CMakeLists.txt
A test/musica/micm/test_micm_api.F90
- Added docker, cmake and test files to test the new MICM-CCPP interface
A test/musica/micm/configs/chapman/config.json
A test/musica/micm/configs/chapman/reactions.json
A test/musica/micm/configs/chapman/species.json
- Moved a set of the MICM configuration to be underneath the test directory
D musica/micm/configs/chapman/config.json
D musica/micm/configs/chapman/reactions.json
D musica/micm/configs/chapman/species.json
- Deleted a set of the MICM configuration

List and Describe any test failures: No known test failures.

34 changes: 17 additions & 17 deletions doc/NamesNotInDictionary.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#######################
Date/time of when script was run:
2024-02-02 18:18:48.886800
2024-02-07 10:29:13.957426
#######################

Non-dictionary standard names found in the following metadata files:
@@ -16,53 +16,53 @@ Non-dictionary standard names found in the following metadata files:

./atmospheric_physics/kessler/kessler.meta

- scheme_name
- density_of_dry_air
- rain_mixing_ratio_wrt_dry_air
- scheme_name
- composition_dependent_specific_heat_of_dry_air_at_constant_pressure

--------------------------

./atmospheric_physics/utilities/geopotential_temp.meta

- geopotential_height_wrt_surface_at_interface
- ccpp_constituents
- ccpp_constituent_properties
- number_of_ccpp_constituents
- geopotential_height_wrt_surface_at_interface
- ccpp_constituent_properties

--------------------------

./atmospheric_physics/utilities/state_converters.meta

- dry_air_density
- composition_dependent_specific_heat_of_dry_air_at_constant_pressure
- cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water
- rain_mixing_ratio_wrt_dry_air
- rain_mixing_ratio_wrt_moist_air_and_condensed_water
- composition_dependent_specific_heat_of_dry_air_at_constant_pressure
- density_of_dry_air

--------------------------

./atmospheric_physics/utilities/qneg.meta

- ccpp_constituent_minimum_values
- number_of_ccpp_constituents
- ccpp_constituents
- log_output_unit
- number_of_ccpp_constituents
- ccpp_constituent_properties
- print_qneg_warn
- scheme_name
- flag_for_mpi_root
- ccpp_constituent_properties
- ccpp_constituents
- scheme_name

--------------------------

./atmospheric_physics/utilities/physics_tendency_updaters.meta

- tendency_of_eastward_wind
- tendency_of_northward_wind
- tendency_of_eastward_wind_due_to_model_physics
- tendency_of_northward_wind_due_to_model_physics
- heating_rate
- tendency_of_eastward_wind
- composition_dependent_specific_heat_of_dry_air_at_constant_pressure
- tendency_of_eastward_wind_due_to_model_physics

--------------------------

@@ -74,21 +74,21 @@ Non-dictionary standard names found in the following metadata files:

./atmospheric_physics/held_suarez/held_suarez_1994.meta

- tendency_of_northward_wind
- composition_dependent_ratio_of_dry_air_gas_constant_to_specific_heat_of_dry_air_at_constant_pressure
- heating_rate
- tendency_of_eastward_wind
- composition_dependent_specific_heat_of_dry_air_at_constant_pressure
- reference_pressure_in_atmosphere_layer_normalized_by_reference_pressure
- scheme_name
- heating_rate
- composition_dependent_ratio_of_dry_air_gas_constant_to_specific_heat_of_dry_air_at_constant_pressure
- tendency_of_northward_wind

--------------------------

./atmospheric_physics/musica/micm/micm.meta

- dry_air_density
- log_output_unit
- ccpp_constituent_properties
- log_output_unit
- dry_air_density
- ccpp_constituents

#######################