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

Bring in new directory structure from development #130

Merged
merged 6 commits into from
Oct 3, 2024
Merged
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
89 changes: 88 additions & 1 deletion doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,6 +1,93 @@
===============================================================

Tag name:
Tag name: atmos_phys0_05_001
Originator(s): nusbaume
Date: October 10, 2024
One-line Summary: Move suite and scheme files to new directories
Github PR URL: https://github.com/ESCOMP/atmospheric_physics/pull/126

This PR fixes the following NCAR/atmospheric_physics Github issues:

Fixes #124 -> Re-organize directory structure

Code reviewed by: peverwhee, jimmielin

List all existing files that have been added (A), modified (M), or deleted (D),
and describe the changes:

- Move top-level suite definition files to "suites" directory:
R100 suite_cam4.xml suites/suite_cam4.xml
R100 suite_cam6.xml suites/suite_cam6.xml
R100 suite_cam6_silhs.xml suites/suite_cam6_silhs.xml
R100 suite_cam7.xml suites/suite_cam7.xml
R100 suite_held_suarez_1994.xml suites/suite_held_suarez_1994.xml
R100 suite_kessler.xml suites/suite_kessler.xml
R100 suite_musica.xml suites/suite_musica.xml
R100 suite_tj2016.xml suites/suite_tj2016.xml

- Rename 'test_sdfs' to 'test_suites':
R100 test/test_sdfs/suite_dry_adiabatic_adjust.xml test/test_suites/suite_dry_adiabatic_adjust.xml
R100 test/test_sdfs/suite_tj2016_precip.xml test/test_suites/suite_tj2016_precip.xml
R100 test/test_sdfs/suite_tj2016_sfc_pbl_hs.xml test/test_suites/suite_tj2016_sfc_pbl_hs.xml
R100 test/test_sdfs/suite_tropopause_find.xml test/test_suites/suite_tropopause_find.xml

- Move top-level scheme directories to new "schemes" subdirectory:
R100 cam_diagnostics/tropopause_diagnostics.F90 schemes/cam_diagnostics/tropopause_diagnostics.F90
R100 cam_diagnostics/tropopause_diagnostics.meta schemes/cam_diagnostics/tropopause_diagnostics.meta
R100 dry_adiabatic_adjust/dadadj.F90 schemes/dry_adiabatic_adjust/dadadj.F90
R100 dry_adiabatic_adjust/dadadj.meta schemes/dry_adiabatic_adjust/dadadj.meta
R100 dry_adiabatic_adjust/dadadj_apply_qv_tendency.F90 schemes/dry_adiabatic_adjust/dadadj_apply_qv_tendency.F90
R100 dry_adiabatic_adjust/dadadj_apply_qv_tendency.meta schemes/dry_adiabatic_adjust/dadadj_apply_qv_tendency.meta
R100 dry_adiabatic_adjust/dadadj_namelist.xml schemes/dry_adiabatic_adjust/dadadj_namelist.xml
R100 held_suarez/held_suarez_1994.F90 schemes/held_suarez/held_suarez_1994.F90
R100 held_suarez/held_suarez_1994.meta schemes/held_suarez/held_suarez_1994.meta
R100 kessler/kessler.F90 schemes/kessler/kessler.F90
R100 kessler/kessler.meta schemes/kessler/kessler.meta
R100 kessler/kessler_update.F90 schemes/kessler/kessler_update.F90
R100 kessler/kessler_update.meta schemes/kessler/kessler_update.meta
R100 musica/micm/micm_util.F90 schemes/musica/micm/micm_util.F90
R100 musica/micm/musica_ccpp_micm.F90 schemes/musica/micm/musica_ccpp_micm.F90
R100 musica/musica_ccpp.F90 schemes/musica/musica_ccpp.F90
R100 musica/musica_ccpp.meta schemes/musica/musica_ccpp.meta
R100 musica/musica_ccpp_namelist.xml schemes/musica/musica_ccpp_namelist.xml
R100 musica/musica_ccpp_util.F90 schemes/musica/musica_ccpp_util.F90
R100 musica/tuvx/musica_ccpp_tuvx.F90 schemes/musica/tuvx/musica_ccpp_tuvx.F90
R100 tj2016/tj2016_precip.F90 schemes/tj2016/tj2016_precip.F90
R100 tj2016/tj2016_precip.meta schemes/tj2016/tj2016_precip.meta
R100 tj2016/tj2016_sfc_pbl_hs.F90 schemes/tj2016/tj2016_sfc_pbl_hs.F90
R100 tj2016/tj2016_sfc_pbl_hs.meta schemes/tj2016/tj2016_sfc_pbl_hs.meta
R100 tropopause_find/tropopause_find.F90 schemes/tropopause_find/tropopause_find.F90
R100 tropopause_find/tropopause_find.meta schemes/tropopause_find/tropopause_find.meta
R100 utilities/geopotential_temp.F90 schemes/utilities/geopotential_temp.F90
R100 utilities/geopotential_temp.meta schemes/utilities/geopotential_temp.meta
R100 utilities/physics_tendency_updaters.F90 schemes/utilities/physics_tendency_updaters.F90
R100 utilities/physics_tendency_updaters.meta schemes/utilities/physics_tendency_updaters.meta
R100 utilities/qneg.F90 schemes/utilities/qneg.F90
R100 utilities/qneg.meta schemes/utilities/qneg.meta
R100 utilities/qneg_namelist.xml schemes/utilities/qneg_namelist.xml
R100 utilities/state_converters.F90 schemes/utilities/state_converters.F90
R100 utilities/state_converters.meta schemes/utilities/state_converters.meta
R100 utilities/static_energy.F90 schemes/utilities/static_energy.F90
R100 utilities/static_energy.meta schemes/utilities/static_energy.meta
R100 zhang_mcfarlane/zm_conv_convtran.F90 schemes/zhang_mcfarlane/zm_conv_convtran.F90
R100 zhang_mcfarlane/zm_conv_convtran.meta schemes/zhang_mcfarlane/zm_conv_convtran.meta
R100 zhang_mcfarlane/zm_conv_evap.F90 schemes/zhang_mcfarlane/zm_conv_evap.F90
R100 zhang_mcfarlane/zm_conv_evap.meta schemes/zhang_mcfarlane/zm_conv_evap.meta
R100 zhang_mcfarlane/zm_conv_momtran.F90 schemes/zhang_mcfarlane/zm_conv_momtran.F90
R100 zhang_mcfarlane/zm_conv_momtran.meta schemes/zhang_mcfarlane/zm_conv_momtran.meta
R100 zhang_mcfarlane/zm_convr.F90 schemes/zhang_mcfarlane/zm_convr.F90
R100 zhang_mcfarlane/zm_convr.meta schemes/zhang_mcfarlane/zm_convr.meta

- Update CMake path to point to new directory location (found during testing):
M test/CMakeLists.txt

List and Describe any test failures: N/A

Summarize any changes to answers: none

===============================================================

Tag name: atmos_phys0_05_000
Originator(s): jimmielin
Date: August 22, 2024
One-line Summary: tropopause_find CCPP-ization
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE ${CMAKE_MODULE_PATH}/SetDefaults.cmake)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})

# --------------------------------------------------------------------------------
# NOTE: If 'CCPP_ENABLE_MUSICA_TESTS' on, this is not a stand-alone cmake project anymore.
# NOTE: If 'CCPP_ENABLE_MUSICA_TESTS' on, this is not a stand-alone cmake project anymore.
# MUSICA CCPP wrapper needs MUSICA library and ccpp-framework/src.
# To 'CCPP_ENABLE_MUSICA_TESTS', you either build a cmake project through
# 'docker/Dockerfile.musica' or follow the build instructions in the file.
Expand All @@ -25,7 +25,7 @@ set(BUILD_GMOCK OFF CACHE BOOL "" FORCE)

if (CCPP_ENABLE_MUSICA_TESTS)
set(MUSICA_VERSION $ENV{MUSICA_VERSION})
set(MUSICA_SRC_PATH ${CMAKE_SOURCE_DIR}/../musica)
set(MUSICA_SRC_PATH ${CMAKE_SOURCE_DIR}/../schemes/musica)
set(CCPP_SRC_PATH ${CMAKE_SOURCE_DIR}/$ENV{CCPP_SRC_PATH})
set(CCPP_TEST_SRC_PATH ${CMAKE_SOURCE_DIR}/include)

Expand Down