diff --git a/doc/ChangeLog b/doc/ChangeLog index c44469b..9f57b5b 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,93 @@ =============================================================== +Tag name: +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: + +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: Originator(s): jimmielin Date: August 22, 2024 diff --git a/cam_diagnostics/tropopause_diagnostics.F90 b/schemes/cam_diagnostics/tropopause_diagnostics.F90 similarity index 100% rename from cam_diagnostics/tropopause_diagnostics.F90 rename to schemes/cam_diagnostics/tropopause_diagnostics.F90 diff --git a/cam_diagnostics/tropopause_diagnostics.meta b/schemes/cam_diagnostics/tropopause_diagnostics.meta similarity index 100% rename from cam_diagnostics/tropopause_diagnostics.meta rename to schemes/cam_diagnostics/tropopause_diagnostics.meta diff --git a/dry_adiabatic_adjust/dadadj.F90 b/schemes/dry_adiabatic_adjust/dadadj.F90 similarity index 100% rename from dry_adiabatic_adjust/dadadj.F90 rename to schemes/dry_adiabatic_adjust/dadadj.F90 diff --git a/dry_adiabatic_adjust/dadadj.meta b/schemes/dry_adiabatic_adjust/dadadj.meta similarity index 100% rename from dry_adiabatic_adjust/dadadj.meta rename to schemes/dry_adiabatic_adjust/dadadj.meta diff --git a/dry_adiabatic_adjust/dadadj_apply_qv_tendency.F90 b/schemes/dry_adiabatic_adjust/dadadj_apply_qv_tendency.F90 similarity index 100% rename from dry_adiabatic_adjust/dadadj_apply_qv_tendency.F90 rename to schemes/dry_adiabatic_adjust/dadadj_apply_qv_tendency.F90 diff --git a/dry_adiabatic_adjust/dadadj_apply_qv_tendency.meta b/schemes/dry_adiabatic_adjust/dadadj_apply_qv_tendency.meta similarity index 100% rename from dry_adiabatic_adjust/dadadj_apply_qv_tendency.meta rename to schemes/dry_adiabatic_adjust/dadadj_apply_qv_tendency.meta diff --git a/dry_adiabatic_adjust/dadadj_namelist.xml b/schemes/dry_adiabatic_adjust/dadadj_namelist.xml similarity index 100% rename from dry_adiabatic_adjust/dadadj_namelist.xml rename to schemes/dry_adiabatic_adjust/dadadj_namelist.xml diff --git a/held_suarez/held_suarez_1994.F90 b/schemes/held_suarez/held_suarez_1994.F90 similarity index 100% rename from held_suarez/held_suarez_1994.F90 rename to schemes/held_suarez/held_suarez_1994.F90 diff --git a/held_suarez/held_suarez_1994.meta b/schemes/held_suarez/held_suarez_1994.meta similarity index 100% rename from held_suarez/held_suarez_1994.meta rename to schemes/held_suarez/held_suarez_1994.meta diff --git a/kessler/kessler.F90 b/schemes/kessler/kessler.F90 similarity index 100% rename from kessler/kessler.F90 rename to schemes/kessler/kessler.F90 diff --git a/kessler/kessler.meta b/schemes/kessler/kessler.meta similarity index 100% rename from kessler/kessler.meta rename to schemes/kessler/kessler.meta diff --git a/kessler/kessler_update.F90 b/schemes/kessler/kessler_update.F90 similarity index 100% rename from kessler/kessler_update.F90 rename to schemes/kessler/kessler_update.F90 diff --git a/kessler/kessler_update.meta b/schemes/kessler/kessler_update.meta similarity index 100% rename from kessler/kessler_update.meta rename to schemes/kessler/kessler_update.meta diff --git a/musica/micm/micm_util.F90 b/schemes/musica/micm/micm_util.F90 similarity index 100% rename from musica/micm/micm_util.F90 rename to schemes/musica/micm/micm_util.F90 diff --git a/musica/micm/musica_ccpp_micm.F90 b/schemes/musica/micm/musica_ccpp_micm.F90 similarity index 100% rename from musica/micm/musica_ccpp_micm.F90 rename to schemes/musica/micm/musica_ccpp_micm.F90 diff --git a/musica/musica_ccpp.F90 b/schemes/musica/musica_ccpp.F90 similarity index 100% rename from musica/musica_ccpp.F90 rename to schemes/musica/musica_ccpp.F90 diff --git a/musica/musica_ccpp.meta b/schemes/musica/musica_ccpp.meta similarity index 100% rename from musica/musica_ccpp.meta rename to schemes/musica/musica_ccpp.meta diff --git a/musica/musica_ccpp_namelist.xml b/schemes/musica/musica_ccpp_namelist.xml similarity index 100% rename from musica/musica_ccpp_namelist.xml rename to schemes/musica/musica_ccpp_namelist.xml diff --git a/musica/musica_ccpp_util.F90 b/schemes/musica/musica_ccpp_util.F90 similarity index 100% rename from musica/musica_ccpp_util.F90 rename to schemes/musica/musica_ccpp_util.F90 diff --git a/musica/tuvx/musica_ccpp_tuvx.F90 b/schemes/musica/tuvx/musica_ccpp_tuvx.F90 similarity index 100% rename from musica/tuvx/musica_ccpp_tuvx.F90 rename to schemes/musica/tuvx/musica_ccpp_tuvx.F90 diff --git a/tj2016/tj2016_precip.F90 b/schemes/tj2016/tj2016_precip.F90 similarity index 100% rename from tj2016/tj2016_precip.F90 rename to schemes/tj2016/tj2016_precip.F90 diff --git a/tj2016/tj2016_precip.meta b/schemes/tj2016/tj2016_precip.meta similarity index 100% rename from tj2016/tj2016_precip.meta rename to schemes/tj2016/tj2016_precip.meta diff --git a/tj2016/tj2016_sfc_pbl_hs.F90 b/schemes/tj2016/tj2016_sfc_pbl_hs.F90 similarity index 100% rename from tj2016/tj2016_sfc_pbl_hs.F90 rename to schemes/tj2016/tj2016_sfc_pbl_hs.F90 diff --git a/tj2016/tj2016_sfc_pbl_hs.meta b/schemes/tj2016/tj2016_sfc_pbl_hs.meta similarity index 100% rename from tj2016/tj2016_sfc_pbl_hs.meta rename to schemes/tj2016/tj2016_sfc_pbl_hs.meta diff --git a/tropopause_find/tropopause_find.F90 b/schemes/tropopause_find/tropopause_find.F90 similarity index 100% rename from tropopause_find/tropopause_find.F90 rename to schemes/tropopause_find/tropopause_find.F90 diff --git a/tropopause_find/tropopause_find.meta b/schemes/tropopause_find/tropopause_find.meta similarity index 100% rename from tropopause_find/tropopause_find.meta rename to schemes/tropopause_find/tropopause_find.meta diff --git a/utilities/geopotential_temp.F90 b/schemes/utilities/geopotential_temp.F90 similarity index 100% rename from utilities/geopotential_temp.F90 rename to schemes/utilities/geopotential_temp.F90 diff --git a/utilities/geopotential_temp.meta b/schemes/utilities/geopotential_temp.meta similarity index 100% rename from utilities/geopotential_temp.meta rename to schemes/utilities/geopotential_temp.meta diff --git a/utilities/physics_tendency_updaters.F90 b/schemes/utilities/physics_tendency_updaters.F90 similarity index 100% rename from utilities/physics_tendency_updaters.F90 rename to schemes/utilities/physics_tendency_updaters.F90 diff --git a/utilities/physics_tendency_updaters.meta b/schemes/utilities/physics_tendency_updaters.meta similarity index 100% rename from utilities/physics_tendency_updaters.meta rename to schemes/utilities/physics_tendency_updaters.meta diff --git a/utilities/qneg.F90 b/schemes/utilities/qneg.F90 similarity index 100% rename from utilities/qneg.F90 rename to schemes/utilities/qneg.F90 diff --git a/utilities/qneg.meta b/schemes/utilities/qneg.meta similarity index 100% rename from utilities/qneg.meta rename to schemes/utilities/qneg.meta diff --git a/utilities/qneg_namelist.xml b/schemes/utilities/qneg_namelist.xml similarity index 100% rename from utilities/qneg_namelist.xml rename to schemes/utilities/qneg_namelist.xml diff --git a/utilities/state_converters.F90 b/schemes/utilities/state_converters.F90 similarity index 100% rename from utilities/state_converters.F90 rename to schemes/utilities/state_converters.F90 diff --git a/utilities/state_converters.meta b/schemes/utilities/state_converters.meta similarity index 100% rename from utilities/state_converters.meta rename to schemes/utilities/state_converters.meta diff --git a/utilities/static_energy.F90 b/schemes/utilities/static_energy.F90 similarity index 100% rename from utilities/static_energy.F90 rename to schemes/utilities/static_energy.F90 diff --git a/utilities/static_energy.meta b/schemes/utilities/static_energy.meta similarity index 100% rename from utilities/static_energy.meta rename to schemes/utilities/static_energy.meta diff --git a/zhang_mcfarlane/zm_conv_convtran.F90 b/schemes/zhang_mcfarlane/zm_conv_convtran.F90 similarity index 100% rename from zhang_mcfarlane/zm_conv_convtran.F90 rename to schemes/zhang_mcfarlane/zm_conv_convtran.F90 diff --git a/zhang_mcfarlane/zm_conv_convtran.meta b/schemes/zhang_mcfarlane/zm_conv_convtran.meta similarity index 100% rename from zhang_mcfarlane/zm_conv_convtran.meta rename to schemes/zhang_mcfarlane/zm_conv_convtran.meta diff --git a/zhang_mcfarlane/zm_conv_evap.F90 b/schemes/zhang_mcfarlane/zm_conv_evap.F90 similarity index 100% rename from zhang_mcfarlane/zm_conv_evap.F90 rename to schemes/zhang_mcfarlane/zm_conv_evap.F90 diff --git a/zhang_mcfarlane/zm_conv_evap.meta b/schemes/zhang_mcfarlane/zm_conv_evap.meta similarity index 100% rename from zhang_mcfarlane/zm_conv_evap.meta rename to schemes/zhang_mcfarlane/zm_conv_evap.meta diff --git a/zhang_mcfarlane/zm_conv_momtran.F90 b/schemes/zhang_mcfarlane/zm_conv_momtran.F90 similarity index 100% rename from zhang_mcfarlane/zm_conv_momtran.F90 rename to schemes/zhang_mcfarlane/zm_conv_momtran.F90 diff --git a/zhang_mcfarlane/zm_conv_momtran.meta b/schemes/zhang_mcfarlane/zm_conv_momtran.meta similarity index 100% rename from zhang_mcfarlane/zm_conv_momtran.meta rename to schemes/zhang_mcfarlane/zm_conv_momtran.meta diff --git a/zhang_mcfarlane/zm_convr.F90 b/schemes/zhang_mcfarlane/zm_convr.F90 similarity index 100% rename from zhang_mcfarlane/zm_convr.F90 rename to schemes/zhang_mcfarlane/zm_convr.F90 diff --git a/zhang_mcfarlane/zm_convr.meta b/schemes/zhang_mcfarlane/zm_convr.meta similarity index 100% rename from zhang_mcfarlane/zm_convr.meta rename to schemes/zhang_mcfarlane/zm_convr.meta diff --git a/suite_cam4.xml b/suites/suite_cam4.xml similarity index 100% rename from suite_cam4.xml rename to suites/suite_cam4.xml diff --git a/suite_cam6.xml b/suites/suite_cam6.xml similarity index 100% rename from suite_cam6.xml rename to suites/suite_cam6.xml diff --git a/suite_cam6_silhs.xml b/suites/suite_cam6_silhs.xml similarity index 100% rename from suite_cam6_silhs.xml rename to suites/suite_cam6_silhs.xml diff --git a/suite_cam7.xml b/suites/suite_cam7.xml similarity index 100% rename from suite_cam7.xml rename to suites/suite_cam7.xml diff --git a/suite_held_suarez_1994.xml b/suites/suite_held_suarez_1994.xml similarity index 100% rename from suite_held_suarez_1994.xml rename to suites/suite_held_suarez_1994.xml diff --git a/suite_kessler.xml b/suites/suite_kessler.xml similarity index 100% rename from suite_kessler.xml rename to suites/suite_kessler.xml diff --git a/suite_musica.xml b/suites/suite_musica.xml similarity index 100% rename from suite_musica.xml rename to suites/suite_musica.xml diff --git a/suite_tj2016.xml b/suites/suite_tj2016.xml similarity index 100% rename from suite_tj2016.xml rename to suites/suite_tj2016.xml diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 369d526..6a7d1e3 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -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. @@ -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) diff --git a/test/test_sdfs/suite_dry_adiabatic_adjust.xml b/test/test_suites/suite_dry_adiabatic_adjust.xml similarity index 100% rename from test/test_sdfs/suite_dry_adiabatic_adjust.xml rename to test/test_suites/suite_dry_adiabatic_adjust.xml diff --git a/test/test_sdfs/suite_tj2016_precip.xml b/test/test_suites/suite_tj2016_precip.xml similarity index 100% rename from test/test_sdfs/suite_tj2016_precip.xml rename to test/test_suites/suite_tj2016_precip.xml diff --git a/test/test_sdfs/suite_tj2016_sfc_pbl_hs.xml b/test/test_suites/suite_tj2016_sfc_pbl_hs.xml similarity index 100% rename from test/test_sdfs/suite_tj2016_sfc_pbl_hs.xml rename to test/test_suites/suite_tj2016_sfc_pbl_hs.xml diff --git a/test/test_sdfs/suite_tropopause_find.xml b/test/test_suites/suite_tropopause_find.xml similarity index 100% rename from test/test_sdfs/suite_tropopause_find.xml rename to test/test_suites/suite_tropopause_find.xml