From ef9eb7fc5d5657d1a0707e841d299ea5b5932a77 Mon Sep 17 00:00:00 2001 From: Tobiwan Date: Wed, 24 May 2023 16:48:35 -0700 Subject: [PATCH] renaming folders in src --- src/ClimaAtmos.jl | 58 +++++++++++-------- .../TurbulenceConvection/tc_functions.jl | 0 .../non_orographic_gravity_wave.jl | 0 .../orographic_gravity_wave.jl | 0 .../orographic_gravity_wave_helper.jl | 0 .../held_suarez/held_suarez.jl | 0 .../microphysics/precipitation.jl | 0 .../radiation/RRTMGPInterface.jl | 0 .../radiation/radiation.jl | 0 .../radiation/radiation_utilities.jl | 0 .../sponge/rayleigh_sponge.jl | 0 .../sponge/viscous_sponge.jl | 0 .../advection.jl | 0 .../edmf_coriolis.jl | 0 .../edmfx_closures.jl | 0 .../forcing/large_scale_advection.jl | 0 .../forcing/subsidence.jl | 0 .../hyperdiffusion.jl | 0 .../implicit/implicit_tendency.jl | 0 .../implicit/schur_complement_W.jl | 0 .../implicit/wfact.jl | 0 .../pressure_work.jl | 0 .../remaining_tendency.jl | 0 .../vertical_diffusion_boundary_layer.jl | 0 .../zero_velocity.jl | 0 25 files changed, 34 insertions(+), 24 deletions(-) rename src/{parameterizations => parameterized_tendencies}/TurbulenceConvection/tc_functions.jl (100%) rename src/{parameterizations => parameterized_tendencies}/gravity_wave_drag/non_orographic_gravity_wave.jl (100%) rename src/{parameterizations => parameterized_tendencies}/gravity_wave_drag/orographic_gravity_wave.jl (100%) rename src/{parameterizations => parameterized_tendencies}/gravity_wave_drag/orographic_gravity_wave_helper.jl (100%) rename src/{parameterizations => parameterized_tendencies}/held_suarez/held_suarez.jl (100%) rename src/{parameterizations => parameterized_tendencies}/microphysics/precipitation.jl (100%) rename src/{parameterizations => parameterized_tendencies}/radiation/RRTMGPInterface.jl (100%) rename src/{parameterizations => parameterized_tendencies}/radiation/radiation.jl (100%) rename src/{parameterizations => parameterized_tendencies}/radiation/radiation_utilities.jl (100%) rename src/{parameterizations => parameterized_tendencies}/sponge/rayleigh_sponge.jl (100%) rename src/{parameterizations => parameterized_tendencies}/sponge/viscous_sponge.jl (100%) rename src/{tendencies => prognostic_equations}/advection.jl (100%) rename src/{tendencies => prognostic_equations}/edmf_coriolis.jl (100%) rename src/{tendencies => prognostic_equations}/edmfx_closures.jl (100%) rename src/{tendencies => prognostic_equations}/forcing/large_scale_advection.jl (100%) rename src/{tendencies => prognostic_equations}/forcing/subsidence.jl (100%) rename src/{tendencies => prognostic_equations}/hyperdiffusion.jl (100%) rename src/{tendencies => prognostic_equations}/implicit/implicit_tendency.jl (100%) rename src/{tendencies => prognostic_equations}/implicit/schur_complement_W.jl (100%) rename src/{tendencies => prognostic_equations}/implicit/wfact.jl (100%) rename src/{tendencies => prognostic_equations}/pressure_work.jl (100%) rename src/{tendencies => prognostic_equations}/remaining_tendency.jl (100%) rename src/{tendencies => prognostic_equations}/vertical_diffusion_boundary_layer.jl (100%) rename src/{tendencies => prognostic_equations}/zero_velocity.jl (100%) diff --git a/src/ClimaAtmos.jl b/src/ClimaAtmos.jl index 733d2b2f27..67675a3d3d 100644 --- a/src/ClimaAtmos.jl +++ b/src/ClimaAtmos.jl @@ -16,10 +16,12 @@ include(joinpath("utils", "classify_case.jl")) include(joinpath("utils", "topography_helper.jl")) include(joinpath("utils", "variable_manipulations.jl")) -include(joinpath("parameterizations", "radiation", "radiation_utilities.jl")) -include(joinpath("parameterizations", "radiation", "RRTMGPInterface.jl")) +include( + joinpath("parameterized_tendencies", "radiation", "radiation_utilities.jl"), +) +include(joinpath("parameterized_tendencies", "radiation", "RRTMGPInterface.jl")) import .RRTMGPInterface as RRTMGPI -include(joinpath("parameterizations", "radiation", "radiation.jl")) +include(joinpath("parameterized_tendencies", "radiation", "radiation.jl")) include("TurbulenceConvection/TurbulenceConvection.jl") import .TurbulenceConvection as TC @@ -28,52 +30,60 @@ include("precomputed_quantities.jl") include(joinpath("InitialConditions", "InitialConditions.jl")) include( - joinpath("parameterizations", "TurbulenceConvection", "tc_functions.jl"), + joinpath( + "parameterized_tendencies", + "TurbulenceConvection", + "tc_functions.jl", + ), ) include(joinpath("SurfaceStates", "SurfaceStates.jl")) include(joinpath("utils", "discrete_hydrostatic_balance.jl")) -include(joinpath("tendencies", "pressure_work.jl")) -include(joinpath("tendencies", "zero_velocity.jl")) +include(joinpath("prognostic_equations", "pressure_work.jl")) +include(joinpath("prognostic_equations", "zero_velocity.jl")) -include(joinpath("tendencies", "implicit", "wfact.jl")) -include(joinpath("tendencies", "implicit", "schur_complement_W.jl")) -include(joinpath("tendencies", "implicit", "implicit_tendency.jl")) +include(joinpath("prognostic_equations", "implicit", "wfact.jl")) +include(joinpath("prognostic_equations", "implicit", "schur_complement_W.jl")) +include(joinpath("prognostic_equations", "implicit", "implicit_tendency.jl")) -include(joinpath("tendencies", "remaining_tendency.jl")) -include(joinpath("tendencies", "forcing", "large_scale_advection.jl")) # TODO: should this be in tendencies/? -include(joinpath("tendencies", "forcing", "subsidence.jl")) -include(joinpath("parameterizations", "held_suarez", "held_suarez.jl")) +include(joinpath("prognostic_equations", "remaining_tendency.jl")) +include(joinpath("prognostic_equations", "forcing", "large_scale_advection.jl")) # TODO: should this be in tendencies/? +include(joinpath("prognostic_equations", "forcing", "subsidence.jl")) +include(joinpath("parameterized_tendencies", "held_suarez", "held_suarez.jl")) include( joinpath( - "parameterizations", + "parameterized_tendencies", "gravity_wave_drag", "non_orographic_gravity_wave.jl", ), ) include( joinpath( - "parameterizations", + "parameterized_tendencies", "gravity_wave_drag", "orographic_gravity_wave_helper.jl", ), ) include( joinpath( - "parameterizations", + "parameterized_tendencies", "gravity_wave_drag", "orographic_gravity_wave.jl", ), ) -include(joinpath("tendencies", "hyperdiffusion.jl")) -include(joinpath("tendencies", "edmf_coriolis.jl")) -include(joinpath("tendencies", "edmfx_closures.jl")) -include(joinpath("parameterizations", "microphysics", "precipitation.jl")) -include(joinpath("tendencies", "vertical_diffusion_boundary_layer.jl")) -include(joinpath("parameterizations", "sponge", "rayleigh_sponge.jl")) -include(joinpath("parameterizations", "sponge", "viscous_sponge.jl")) -include(joinpath("tendencies", "advection.jl")) +include(joinpath("prognostic_equations", "hyperdiffusion.jl")) +include(joinpath("prognostic_equations", "edmf_coriolis.jl")) +include(joinpath("prognostic_equations", "edmfx_closures.jl")) +include( + joinpath("parameterized_tendencies", "microphysics", "precipitation.jl"), +) +include( + joinpath("prognostic_equations", "vertical_diffusion_boundary_layer.jl"), +) +include(joinpath("parameterized_tendencies", "sponge", "rayleigh_sponge.jl")) +include(joinpath("parameterized_tendencies", "sponge", "viscous_sponge.jl")) +include(joinpath("prognostic_equations", "advection.jl")) include(joinpath("dycore_equations", "sgs_flux_tendencies.jl")) include("staggered_nonhydrostatic_model.jl") diff --git a/src/parameterizations/TurbulenceConvection/tc_functions.jl b/src/parameterized_tendencies/TurbulenceConvection/tc_functions.jl similarity index 100% rename from src/parameterizations/TurbulenceConvection/tc_functions.jl rename to src/parameterized_tendencies/TurbulenceConvection/tc_functions.jl diff --git a/src/parameterizations/gravity_wave_drag/non_orographic_gravity_wave.jl b/src/parameterized_tendencies/gravity_wave_drag/non_orographic_gravity_wave.jl similarity index 100% rename from src/parameterizations/gravity_wave_drag/non_orographic_gravity_wave.jl rename to src/parameterized_tendencies/gravity_wave_drag/non_orographic_gravity_wave.jl diff --git a/src/parameterizations/gravity_wave_drag/orographic_gravity_wave.jl b/src/parameterized_tendencies/gravity_wave_drag/orographic_gravity_wave.jl similarity index 100% rename from src/parameterizations/gravity_wave_drag/orographic_gravity_wave.jl rename to src/parameterized_tendencies/gravity_wave_drag/orographic_gravity_wave.jl diff --git a/src/parameterizations/gravity_wave_drag/orographic_gravity_wave_helper.jl b/src/parameterized_tendencies/gravity_wave_drag/orographic_gravity_wave_helper.jl similarity index 100% rename from src/parameterizations/gravity_wave_drag/orographic_gravity_wave_helper.jl rename to src/parameterized_tendencies/gravity_wave_drag/orographic_gravity_wave_helper.jl diff --git a/src/parameterizations/held_suarez/held_suarez.jl b/src/parameterized_tendencies/held_suarez/held_suarez.jl similarity index 100% rename from src/parameterizations/held_suarez/held_suarez.jl rename to src/parameterized_tendencies/held_suarez/held_suarez.jl diff --git a/src/parameterizations/microphysics/precipitation.jl b/src/parameterized_tendencies/microphysics/precipitation.jl similarity index 100% rename from src/parameterizations/microphysics/precipitation.jl rename to src/parameterized_tendencies/microphysics/precipitation.jl diff --git a/src/parameterizations/radiation/RRTMGPInterface.jl b/src/parameterized_tendencies/radiation/RRTMGPInterface.jl similarity index 100% rename from src/parameterizations/radiation/RRTMGPInterface.jl rename to src/parameterized_tendencies/radiation/RRTMGPInterface.jl diff --git a/src/parameterizations/radiation/radiation.jl b/src/parameterized_tendencies/radiation/radiation.jl similarity index 100% rename from src/parameterizations/radiation/radiation.jl rename to src/parameterized_tendencies/radiation/radiation.jl diff --git a/src/parameterizations/radiation/radiation_utilities.jl b/src/parameterized_tendencies/radiation/radiation_utilities.jl similarity index 100% rename from src/parameterizations/radiation/radiation_utilities.jl rename to src/parameterized_tendencies/radiation/radiation_utilities.jl diff --git a/src/parameterizations/sponge/rayleigh_sponge.jl b/src/parameterized_tendencies/sponge/rayleigh_sponge.jl similarity index 100% rename from src/parameterizations/sponge/rayleigh_sponge.jl rename to src/parameterized_tendencies/sponge/rayleigh_sponge.jl diff --git a/src/parameterizations/sponge/viscous_sponge.jl b/src/parameterized_tendencies/sponge/viscous_sponge.jl similarity index 100% rename from src/parameterizations/sponge/viscous_sponge.jl rename to src/parameterized_tendencies/sponge/viscous_sponge.jl diff --git a/src/tendencies/advection.jl b/src/prognostic_equations/advection.jl similarity index 100% rename from src/tendencies/advection.jl rename to src/prognostic_equations/advection.jl diff --git a/src/tendencies/edmf_coriolis.jl b/src/prognostic_equations/edmf_coriolis.jl similarity index 100% rename from src/tendencies/edmf_coriolis.jl rename to src/prognostic_equations/edmf_coriolis.jl diff --git a/src/tendencies/edmfx_closures.jl b/src/prognostic_equations/edmfx_closures.jl similarity index 100% rename from src/tendencies/edmfx_closures.jl rename to src/prognostic_equations/edmfx_closures.jl diff --git a/src/tendencies/forcing/large_scale_advection.jl b/src/prognostic_equations/forcing/large_scale_advection.jl similarity index 100% rename from src/tendencies/forcing/large_scale_advection.jl rename to src/prognostic_equations/forcing/large_scale_advection.jl diff --git a/src/tendencies/forcing/subsidence.jl b/src/prognostic_equations/forcing/subsidence.jl similarity index 100% rename from src/tendencies/forcing/subsidence.jl rename to src/prognostic_equations/forcing/subsidence.jl diff --git a/src/tendencies/hyperdiffusion.jl b/src/prognostic_equations/hyperdiffusion.jl similarity index 100% rename from src/tendencies/hyperdiffusion.jl rename to src/prognostic_equations/hyperdiffusion.jl diff --git a/src/tendencies/implicit/implicit_tendency.jl b/src/prognostic_equations/implicit/implicit_tendency.jl similarity index 100% rename from src/tendencies/implicit/implicit_tendency.jl rename to src/prognostic_equations/implicit/implicit_tendency.jl diff --git a/src/tendencies/implicit/schur_complement_W.jl b/src/prognostic_equations/implicit/schur_complement_W.jl similarity index 100% rename from src/tendencies/implicit/schur_complement_W.jl rename to src/prognostic_equations/implicit/schur_complement_W.jl diff --git a/src/tendencies/implicit/wfact.jl b/src/prognostic_equations/implicit/wfact.jl similarity index 100% rename from src/tendencies/implicit/wfact.jl rename to src/prognostic_equations/implicit/wfact.jl diff --git a/src/tendencies/pressure_work.jl b/src/prognostic_equations/pressure_work.jl similarity index 100% rename from src/tendencies/pressure_work.jl rename to src/prognostic_equations/pressure_work.jl diff --git a/src/tendencies/remaining_tendency.jl b/src/prognostic_equations/remaining_tendency.jl similarity index 100% rename from src/tendencies/remaining_tendency.jl rename to src/prognostic_equations/remaining_tendency.jl diff --git a/src/tendencies/vertical_diffusion_boundary_layer.jl b/src/prognostic_equations/vertical_diffusion_boundary_layer.jl similarity index 100% rename from src/tendencies/vertical_diffusion_boundary_layer.jl rename to src/prognostic_equations/vertical_diffusion_boundary_layer.jl diff --git a/src/tendencies/zero_velocity.jl b/src/prognostic_equations/zero_velocity.jl similarity index 100% rename from src/tendencies/zero_velocity.jl rename to src/prognostic_equations/zero_velocity.jl