Merge pull request #146 from ESCOMP/development

Upgrading to atmos_phys0_06_000
ESCOMP · Oct 25, 2024 · 67927f1 · 67927f1
2 parents f8ce60b + 9955b6d
commit 67927f1
Show file tree

Hide file tree

Showing 42 changed files with 3,512 additions and 524 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -12,4 +12,14 @@ jobs:
     - name: build Docker image
       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 'make test ARGS="--rerun-failed --output-on-failure -j8"'
+      run: docker run --name test-container -t musica bash -c 'make test ARGS="--rerun-failed --output-on-failure -j8"'
+  test_musica_api_no_install:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+    - name: build Docker image
+      run: docker build -t musica-no-install -f test/docker/Dockerfile.musica.no_install .
+    - name: run tests in container
+      run: docker run --name test-container -t musica-no-install bash -c 'make test ARGS="--rerun-failed --output-on-failure -j8"'
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,5 +1,32 @@
 ===============================================================
 
+Tag name:
+Originator(s): jimmielin
+Date: October 17, 2024
+One-line Summary: Implement ccpp_const_get_index in to_be_ccppized to avoid circular dependencies
+Github PR URL: https://github.com/ESCOMP/atmospheric_physics/pull/135
+
+This PR fixes the following NCAR/atmospheric_physics Github issues: N/A
+
+    This routine can be shared by CAM-SIMA code (companion PR to be filled) and atmospheric_physics schemes by passing in the CCPP constituents pointer object.
+
+    This loop-based workaround is to avoid a dependency on cam_ccpp_cap which would in turn depend on all schemes creating a circular dependency.
+
+Code reviewed by: cacraigucar, nusbaume
+
+List all existing files that have been added (A), modified (M), or deleted (D),
+and describe the changes:
+
+- Add to_be_ccppized directory and ccpp_const_utils implementing ccpp_const_get_index
+M       doc/ChangeLog
+A       to_be_ccppized/ccpp_const_utils.F90
+
+List and Describe any test failures: N/A
+
+Summarize any changes to answers: none
+
+===============================================================
+
 Tag name: atmos_phys0_05_001
 Originator(s): nusbaume
 Date: October 10, 2024

diff --git a/doc/NamesNotInDictionary.txt b/doc/NamesNotInDictionary.txt
@@ -1,43 +1,51 @@
 
 #######################
 Date/time of when script was run:
-2024-09-18 19:06:50.047235
+2024-10-10 14:17:36.423628
 #######################
 
 Non-dictionary standard names found in the following metadata files:
 
 --------------------------
 
-atmospheric_physics/tj2016/tj2016_precip.meta
+atmospheric_physics/schemes/sima_diagnostics/sima_state_diagnostics.meta
 
-    - gas_constant_of_water_vapor
-    - lwe_large_scale_precipitation_rate_at_surface
-    - ratio_of_water_vapor_to_dry_air_molecular_weights
-    - sum_of_sigma_pressure_hybrid_coordinate_a_coefficient_and_sigma_pressure_hybrid_coordinate_b_coefficient
+    - air_pressure_at_interface
+    - air_pressure_of_dry_air_at_interface
+    - ln_air_pressure_at_interface
+    - ln_air_pressure_of_dry_air_at_interface
 
 --------------------------
 
-atmospheric_physics/tj2016/tj2016_sfc_pbl_hs.meta
+atmospheric_physics/schemes/sima_diagnostics/tropopause_diagnostics.meta
 
-    - air_pressure_at_interface
-    - eddy_heat_diffusivity
-    - eddy_momentum_diffusivity
-    - gas_constant_of_water_vapor
-    - ln_air_pressure_at_interface
-    - pi_constant
-    - ratio_of_water_vapor_to_dry_air_molecular_weights
-    - sum_of_sigma_pressure_hybrid_coordinate_a_coefficient_and_sigma_pressure_hybrid_coordinate_b_coefficient
-    - surface_eastward_wind_stress
-    - surface_evaporation_rate
-    - surface_northward_wind_stress
-    - surface_upward_sensible_heat_flux
-    - tendency_of_air_temperature_due_to_diabatic_heating
-    - tendency_of_air_temperature_due_to_vertical_diffusion
-    - tendency_of_water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water_due_to_vertical_diffusion
+    - tropopause_air_pressure
+    - tropopause_air_pressure_from_climatological_method
+    - tropopause_air_pressure_from_cold_point_method
+    - tropopause_air_pressure_from_hybrid_stobie_linoz_with_climatological_backup_method
+    - tropopause_air_pressure_from_lapse_rate_method
+    - tropopause_air_temperature
+    - tropopause_air_temperature_from_climatological_method
+    - tropopause_air_temperature_from_cold_point_method
+    - tropopause_air_temperature_from_hybrid_stobie_linoz_with_climatological_backup_method
+    - tropopause_air_temperature_from_lapse_rate_method
+    - tropopause_geopotential_height_wrt_surface
+    - tropopause_geopotential_height_wrt_surface_from_climatological_method
+    - tropopause_geopotential_height_wrt_surface_from_cold_point_method
+    - tropopause_geopotential_height_wrt_surface_from_hybrid_stobie_linoz_with_climatological_backup_method
+    - tropopause_geopotential_height_wrt_surface_from_lapse_rate_method
+    - tropopause_vertical_layer_index
+    - tropopause_vertical_layer_index_from_climatological_method
+    - tropopause_vertical_layer_index_from_cold_point_method
+    - tropopause_vertical_layer_index_from_hybrid_stobie_linoz_with_climatological_backup_method
+    - tropopause_vertical_layer_index_from_hybrid_stobie_linoz_with_climatological_backup_method_for_chemistry
+    - tropopause_vertical_layer_index_from_lapse_rate_method
+    - vertical_layer_index_lower_bound_from_hybrid_stobie_linoz_with_climatological_backup_method_for_linearized_ozone_chemistry
+    - vertical_layer_index_lower_bound_from_hybrid_stobie_linoz_with_climatological_backup_method_for_stratospheric_chemistry
 
 --------------------------
 
-atmospheric_physics/dry_adiabatic_adjust/dadadj.meta
+atmospheric_physics/schemes/dry_adiabatic_adjust/dadadj.meta
 
     - air_pressure_at_interface
     - binary_indicator_for_dry_adiabatic_adjusted_grid_cell
@@ -47,13 +55,59 @@ atmospheric_physics/dry_adiabatic_adjust/dadadj.meta
 
 --------------------------
 
-atmospheric_physics/dry_adiabatic_adjust/dadadj_apply_qv_tendency.meta
+atmospheric_physics/schemes/dry_adiabatic_adjust/dadadj_apply_qv_tendency.meta
 
     - tendency_of_water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water
 
 --------------------------
 
-atmospheric_physics/zhang_mcfarlane/zm_conv_momtran.meta
+atmospheric_physics/schemes/utilities/geopotential_temp.meta
+
+    - air_pressure_at_interface
+    - ln_air_pressure_at_interface
+
+--------------------------
+
+atmospheric_physics/schemes/tropopause_find/tropopause_find.meta
+
+    - air_pressure_at_interface
+    - fill_value_for_diagnostic_output
+    - fractional_calendar_days_on_end_of_current_timestep
+    - pi_constant
+    - ratio_of_dry_air_gas_constant_to_specific_heat_of_dry_air_at_constant_pressure
+    - tropopause_air_pressure
+    - tropopause_air_pressure_from_chemical_method
+    - tropopause_air_pressure_from_climatological_method
+    - tropopause_air_pressure_from_climatology_dataset
+    - tropopause_air_pressure_from_cold_point_method
+    - tropopause_air_pressure_from_hybrid_stobie_linoz_with_climatological_backup_method
+    - tropopause_air_pressure_from_lapse_rate_method
+    - tropopause_air_temperature
+    - tropopause_air_temperature_from_chemical_method
+    - tropopause_air_temperature_from_climatological_method
+    - tropopause_air_temperature_from_cold_point_method
+    - tropopause_air_temperature_from_hybrid_stobie_linoz_with_climatological_backup_method
+    - tropopause_air_temperature_from_lapse_rate_method
+    - tropopause_calendar_days_from_climatology
+    - tropopause_geopotential_height_wrt_surface
+    - tropopause_geopotential_height_wrt_surface_from_chemical_method
+    - tropopause_geopotential_height_wrt_surface_from_climatological_method
+    - tropopause_geopotential_height_wrt_surface_from_cold_point_method
+    - tropopause_geopotential_height_wrt_surface_from_hybrid_stobie_linoz_with_climatological_backup_method
+    - tropopause_geopotential_height_wrt_surface_from_lapse_rate_method
+    - tropopause_vertical_layer_index
+    - tropopause_vertical_layer_index_from_chemical_method
+    - tropopause_vertical_layer_index_from_climatological_method
+    - tropopause_vertical_layer_index_from_cold_point_method
+    - tropopause_vertical_layer_index_from_hybrid_stobie_linoz_with_climatological_backup_method
+    - tropopause_vertical_layer_index_from_hybrid_stobie_linoz_with_climatological_backup_method_for_chemistry
+    - tropopause_vertical_layer_index_from_lapse_rate_method
+    - vertical_layer_index_lower_bound_from_hybrid_stobie_linoz_with_climatological_backup_method_for_linearized_ozone_chemistry
+    - vertical_layer_index_lower_bound_from_hybrid_stobie_linoz_with_climatological_backup_method_for_stratospheric_chemistry
+
+--------------------------
+
+atmospheric_physics/schemes/zhang_mcfarlane/zm_conv_momtran.meta
 
     - atmosphere_detrainment_convective_mass_flux_for_deep_convection_for_convective_columns
     - atmosphere_downdraft_convective_mass_flux_for_deep_convection_for_convective_columns
@@ -80,33 +134,7 @@ atmospheric_physics/zhang_mcfarlane/zm_conv_momtran.meta
 
 --------------------------
 
-atmospheric_physics/zhang_mcfarlane/zm_conv_evap.meta
-
-    - 
-    - cloud_area_fraction
-    - flag_for_zhang_mcfarlane_convective_organization_parameterization?
-    - freezing_point_of_water?
-    - frozen_precipitation_mass_flux_at_interface_due_to_deep_convection?
-    - heating_rate
-    - latent_heat_of_fusion_of_water_at_0c?
-    - latent_heat_of_vaporization_of_water_at_0c?
-    - lwe_frozen_precipitation_rate_at_surface_due_to_deep_convection
-    - lwe_precipitation_rate_at_surface_due_to_deep_convection
-    - precipitation_mass_flux_at_interface_due_to_deep_convection?
-    - pressure_thickness
-    - specific_heat_of_dry_air_at_constant_pressure?
-    - tendency_of_dry_air_enthalpy_at_constant_pressure_due_to_frozen_precipitation_melt?
-    - tendency_of_dry_air_enthalpy_at_constant_pressure_due_to_frozen_precipitation_production_in_deep_convection?
-    - tendency_of_frozen_precipitation_wrt_moist_air_and_condensed_water_due_to_deep_convection?
-    - tendency_of_precipitation_wrt_moist_air_and_condensed_water_due_to_deep_convection?
-    - tendency_of_precipitation_wrt_moist_air_and_condensed_water_due_to_deep_convection_excluding_subcloud_evaporation
-    - tendency_of_water_vapor_mixing_ratio_wrt_moist_air and_condensed_water?
-    - tunable_evaporation_efficiency_for_land_in_zhang_mcfarlane_deep_convection_scheme?
-    - tunable_evaporation_efficiency_in_zhang_mcfarlane_deep_convection_scheme?
-
---------------------------
-
-atmospheric_physics/zhang_mcfarlane/zm_convr.meta
+atmospheric_physics/schemes/zhang_mcfarlane/zm_convr.meta
 
     - air_pressure_at_interface
     - atmosphere_convective_mass_flux_due_to all_convection?
@@ -162,7 +190,7 @@ atmospheric_physics/zhang_mcfarlane/zm_convr.meta
 
 --------------------------
 
-atmospheric_physics/zhang_mcfarlane/zm_conv_convtran.meta
+atmospheric_physics/schemes/zhang_mcfarlane/zm_conv_convtran.meta
 
     - atmosphere_detrainment_convective_mass_flux_for_deep_convection_for_convective_columns
     - atmosphere_downdraft_convective_mass_flux_for_deep_convection_for_convective_columns
@@ -184,76 +212,57 @@ atmospheric_physics/zhang_mcfarlane/zm_conv_convtran.meta
 
 --------------------------
 
-atmospheric_physics/utilities/geopotential_temp.meta
+atmospheric_physics/schemes/zhang_mcfarlane/zm_conv_evap.meta
 
-    - air_pressure_at_interface
-    - ln_air_pressure_at_interface
+    - 
+    - cloud_area_fraction
+    - flag_for_zhang_mcfarlane_convective_organization_parameterization?
+    - freezing_point_of_water?
+    - frozen_precipitation_mass_flux_at_interface_due_to_deep_convection?
+    - heating_rate
+    - latent_heat_of_fusion_of_water_at_0c?
+    - latent_heat_of_vaporization_of_water_at_0c?
+    - lwe_frozen_precipitation_rate_at_surface_due_to_deep_convection
+    - lwe_precipitation_rate_at_surface_due_to_deep_convection
+    - precipitation_mass_flux_at_interface_due_to_deep_convection?
+    - pressure_thickness
+    - specific_heat_of_dry_air_at_constant_pressure?
+    - tendency_of_dry_air_enthalpy_at_constant_pressure_due_to_frozen_precipitation_melt?
+    - tendency_of_dry_air_enthalpy_at_constant_pressure_due_to_frozen_precipitation_production_in_deep_convection?
+    - tendency_of_frozen_precipitation_wrt_moist_air_and_condensed_water_due_to_deep_convection?
+    - tendency_of_precipitation_wrt_moist_air_and_condensed_water_due_to_deep_convection?
+    - tendency_of_precipitation_wrt_moist_air_and_condensed_water_due_to_deep_convection_excluding_subcloud_evaporation
+    - tendency_of_water_vapor_mixing_ratio_wrt_moist_air and_condensed_water?
+    - tunable_evaporation_efficiency_for_land_in_zhang_mcfarlane_deep_convection_scheme?
+    - tunable_evaporation_efficiency_in_zhang_mcfarlane_deep_convection_scheme?
 
 --------------------------
 
-atmospheric_physics/cam_diagnostics/tropopause_diagnostics.meta
+atmospheric_physics/schemes/tj2016/tj2016_precip.meta
 
-    - tropopause_air_pressure
-    - tropopause_air_pressure_from_climatological_method
-    - tropopause_air_pressure_from_cold_point_method
-    - tropopause_air_pressure_from_hybrid_stobie_linoz_with_climatological_backup_method
-    - tropopause_air_pressure_from_lapse_rate_method
-    - tropopause_air_temperature
-    - tropopause_air_temperature_from_climatological_method
-    - tropopause_air_temperature_from_cold_point_method
-    - tropopause_air_temperature_from_hybrid_stobie_linoz_with_climatological_backup_method
-    - tropopause_air_temperature_from_lapse_rate_method
-    - tropopause_geopotential_height_wrt_surface
-    - tropopause_geopotential_height_wrt_surface_from_climatological_method
-    - tropopause_geopotential_height_wrt_surface_from_cold_point_method
-    - tropopause_geopotential_height_wrt_surface_from_hybrid_stobie_linoz_with_climatological_backup_method
-    - tropopause_geopotential_height_wrt_surface_from_lapse_rate_method
-    - tropopause_vertical_layer_index
-    - tropopause_vertical_layer_index_from_climatological_method
-    - tropopause_vertical_layer_index_from_cold_point_method
-    - tropopause_vertical_layer_index_from_hybrid_stobie_linoz_with_climatological_backup_method
-    - tropopause_vertical_layer_index_from_hybrid_stobie_linoz_with_climatological_backup_method_for_chemistry
-    - tropopause_vertical_layer_index_from_lapse_rate_method
-    - vertical_layer_index_lower_bound_from_hybrid_stobie_linoz_with_climatological_backup_method_for_linearized_ozone_chemistry
-    - vertical_layer_index_lower_bound_from_hybrid_stobie_linoz_with_climatological_backup_method_for_stratospheric_chemistry
+    - gas_constant_of_water_vapor
+    - lwe_large_scale_precipitation_rate_at_surface
+    - ratio_of_water_vapor_to_dry_air_molecular_weights
+    - sum_of_sigma_pressure_hybrid_coordinate_a_coefficient_and_sigma_pressure_hybrid_coordinate_b_coefficient
 
 --------------------------
 
-atmospheric_physics/tropopause_find/tropopause_find.meta
+atmospheric_physics/schemes/tj2016/tj2016_sfc_pbl_hs.meta
 
     - air_pressure_at_interface
-    - fill_value_for_diagnostic_output
-    - fractional_calendar_days_on_end_of_current_timestep
+    - eddy_heat_diffusivity
+    - eddy_momentum_diffusivity
+    - gas_constant_of_water_vapor
+    - ln_air_pressure_at_interface
     - pi_constant
-    - ratio_of_dry_air_gas_constant_to_specific_heat_of_dry_air_at_constant_pressure
-    - tropopause_air_pressure
-    - tropopause_air_pressure_from_chemical_method
-    - tropopause_air_pressure_from_climatological_method
-    - tropopause_air_pressure_from_climatology_dataset
-    - tropopause_air_pressure_from_cold_point_method
-    - tropopause_air_pressure_from_hybrid_stobie_linoz_with_climatological_backup_method
-    - tropopause_air_pressure_from_lapse_rate_method
-    - tropopause_air_temperature
-    - tropopause_air_temperature_from_chemical_method
-    - tropopause_air_temperature_from_climatological_method
-    - tropopause_air_temperature_from_cold_point_method
-    - tropopause_air_temperature_from_hybrid_stobie_linoz_with_climatological_backup_method
-    - tropopause_air_temperature_from_lapse_rate_method
-    - tropopause_calendar_days_from_climatology
-    - tropopause_geopotential_height_wrt_surface
-    - tropopause_geopotential_height_wrt_surface_from_chemical_method
-    - tropopause_geopotential_height_wrt_surface_from_climatological_method
-    - tropopause_geopotential_height_wrt_surface_from_cold_point_method
-    - tropopause_geopotential_height_wrt_surface_from_hybrid_stobie_linoz_with_climatological_backup_method
-    - tropopause_geopotential_height_wrt_surface_from_lapse_rate_method
-    - tropopause_vertical_layer_index
-    - tropopause_vertical_layer_index_from_chemical_method
-    - tropopause_vertical_layer_index_from_climatological_method
-    - tropopause_vertical_layer_index_from_cold_point_method
-    - tropopause_vertical_layer_index_from_hybrid_stobie_linoz_with_climatological_backup_method
-    - tropopause_vertical_layer_index_from_hybrid_stobie_linoz_with_climatological_backup_method_for_chemistry
-    - tropopause_vertical_layer_index_from_lapse_rate_method
-    - vertical_layer_index_lower_bound_from_hybrid_stobie_linoz_with_climatological_backup_method_for_linearized_ozone_chemistry
-    - vertical_layer_index_lower_bound_from_hybrid_stobie_linoz_with_climatological_backup_method_for_stratospheric_chemistry
+    - ratio_of_water_vapor_to_dry_air_molecular_weights
+    - sum_of_sigma_pressure_hybrid_coordinate_a_coefficient_and_sigma_pressure_hybrid_coordinate_b_coefficient
+    - surface_eastward_wind_stress
+    - surface_evaporation_rate
+    - surface_northward_wind_stress
+    - surface_upward_sensible_heat_flux
+    - tendency_of_air_temperature_due_to_diabatic_heating
+    - tendency_of_air_temperature_due_to_vertical_diffusion
+    - tendency_of_water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water_due_to_vertical_diffusion
 
 #######################