rm modular/

CliMA · Dec 14, 2023 · 98512f7 · 98512f7
1 parent 8571a76
commit 98512f7
Show file tree

Hide file tree

Showing 33 changed files with 111 additions and 111 deletions.
diff --git a/.buildkite/longruns/pipeline.yml b/.buildkite/longruns/pipeline.yml
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
diff --git a/.dev/up_deps.jl b/.dev/up_deps.jl
@@ -11,7 +11,7 @@ dirs = (
     joinpath(root, ".dev"),
     joinpath(root, "perf"),
     joinpath(root, "docs"),
-    joinpath(root, "experiments/AMIP/modular"),
+    joinpath(root, "experiments/AMIP"),
 )
 
 cd(root) do

diff --git a/docs/make.jl b/docs/make.jl
@@ -10,7 +10,7 @@ const OUTPUT_DIR = joinpath(@__DIR__, "src/generated")
 
 # sea breeze tutorial
 TUTORIAL_DIR_SB = joinpath(EXPERIMENTS_DIR, "ClimaCore/sea_breeze/")
-TUTORIAL_DIR_AMIP = joinpath(EXPERIMENTS_DIR, "AMIP/modular/")
+TUTORIAL_DIR_AMIP = joinpath(EXPERIMENTS_DIR, "AMIP/")
 
 # Pkg.activate(TUTORIAL_DIR)
 # Pkg.instantiate()

diff --git a/experiments/AMIP/modular/Artifacts.toml → experiments/AMIP/Artifacts.toml b/experiments/AMIP/modular/Artifacts.toml → experiments/AMIP/Artifacts.toml
diff --git a/experiments/AMIP/modular/Manifest.toml → experiments/AMIP/Manifest.toml b/experiments/AMIP/modular/Manifest.toml → experiments/AMIP/Manifest.toml
diff --git a/experiments/AMIP/modular/Project.toml → experiments/AMIP/Project.toml b/experiments/AMIP/modular/Project.toml → experiments/AMIP/Project.toml
diff --git a/experiments/AMIP/modular/README.md → experiments/AMIP/README.md b/experiments/AMIP/modular/README.md → experiments/AMIP/README.md
diff --git a/experiments/AMIP/modular/cli_options.jl → experiments/AMIP/cli_options.jl b/experiments/AMIP/modular/cli_options.jl → experiments/AMIP/cli_options.jl
diff --git a/.../components/atmosphere/climaatmos_init.jl → .../components/atmosphere/climaatmos_init.jl b/.../components/atmosphere/climaatmos_init.jl → .../components/atmosphere/climaatmos_init.jl
diff --git a/...IP/modular/components/land/bucket_init.jl → ...ments/AMIP/components/land/bucket_init.jl b/...IP/modular/components/land/bucket_init.jl → ...ments/AMIP/components/land/bucket_init.jl
diff --git a/...P/modular/components/land/bucket_utils.jl → ...ents/AMIP/components/land/bucket_utils.jl b/...P/modular/components/land/bucket_utils.jl → ...ents/AMIP/components/land/bucket_utils.jl
diff --git a/...dular/components/ocean/eisenman_seaice.md → .../AMIP/components/ocean/eisenman_seaice.md b/...dular/components/ocean/eisenman_seaice.md → .../AMIP/components/ocean/eisenman_seaice.md
diff --git a/.../components/ocean/eisenman_seaice_init.jl → .../components/ocean/eisenman_seaice_init.jl b/.../components/ocean/eisenman_seaice_init.jl → .../components/ocean/eisenman_seaice_init.jl
diff --git a/...ar/components/ocean/prescr_seaice_init.jl → ...IP/components/ocean/prescr_seaice_init.jl b/...ar/components/ocean/prescr_seaice_init.jl → ...IP/components/ocean/prescr_seaice_init.jl
diff --git a/...dular/components/ocean/slab_ocean_init.jl → .../AMIP/components/ocean/slab_ocean_init.jl b/...dular/components/ocean/slab_ocean_init.jl → .../AMIP/components/ocean/slab_ocean_init.jl
diff --git a/...nts/AMIP/modular/components/slab_utils.jl → experiments/AMIP/components/slab_utils.jl b/...nts/AMIP/modular/components/slab_utils.jl → experiments/AMIP/components/slab_utils.jl
diff --git a/...ts/AMIP/modular/coupler_driver_modular.jl → experiments/AMIP/coupler_driver_modular.jl b/...ts/AMIP/modular/coupler_driver_modular.jl → experiments/AMIP/coupler_driver_modular.jl
@@ -171,7 +171,7 @@ evolving_ocean = config_dict["evolving_ocean"]
 if isinteractive()
     COUPLER_OUTPUT_DIR = joinpath("output", joinpath(mode_name, run_name)) # TempestRemap fails if interactive and paths are too long
 else
-    COUPLER_OUTPUT_DIR = joinpath(pkg_dir, "experiments/AMIP/modular/output", joinpath(mode_name, run_name))
+    COUPLER_OUTPUT_DIR = joinpath(pkg_dir, "experiments/AMIP/output", joinpath(mode_name, run_name))
 end
 mkpath(COUPLER_OUTPUT_DIR)
 

diff --git a/experiments/AMIP/modular/mpi/mpi_init.jl → experiments/AMIP/mpi/mpi_init.jl b/experiments/AMIP/modular/mpi/mpi_init.jl → experiments/AMIP/mpi/mpi_init.jl
diff --git a/...s/AMIP/modular/user_io/amip_visualizer.jl → experiments/AMIP/user_io/amip_visualizer.jl b/...s/AMIP/modular/user_io/amip_visualizer.jl → experiments/AMIP/user_io/amip_visualizer.jl
diff --git a/...ments/AMIP/modular/user_io/debug_plots.jl → experiments/AMIP/user_io/debug_plots.jl b/...ments/AMIP/modular/user_io/debug_plots.jl → experiments/AMIP/user_io/debug_plots.jl
diff --git a/...s/AMIP/modular/user_io/ncep_visualizer.jl → experiments/AMIP/user_io/ncep_visualizer.jl b/...s/AMIP/modular/user_io/ncep_visualizer.jl → experiments/AMIP/user_io/ncep_visualizer.jl
diff --git a/...ments/AMIP/modular/user_io/plot_helper.jl → experiments/AMIP/user_io/plot_helper.jl b/...ments/AMIP/modular/user_io/plot_helper.jl → experiments/AMIP/user_io/plot_helper.jl
diff --git a/.../AMIP/modular/user_io/user_diagnostics.jl → experiments/AMIP/user_io/user_diagnostics.jl b/.../AMIP/modular/user_io/user_diagnostics.jl → experiments/AMIP/user_io/user_diagnostics.jl
diff --git a/...ents/AMIP/modular/user_io/user_logging.jl → experiments/AMIP/user_io/user_logging.jl b/...ents/AMIP/modular/user_io/user_logging.jl → experiments/AMIP/user_io/user_logging.jl
diff --git a/...ents/AMIP/modular/user_io/viz_explorer.jl → experiments/AMIP/user_io/viz_explorer.jl b/...ents/AMIP/modular/user_io/viz_explorer.jl → experiments/AMIP/user_io/viz_explorer.jl
diff --git a/test/component_model_tests/bucket_tests.jl b/test/component_model_tests/bucket_tests.jl
@@ -3,8 +3,8 @@ import ClimaCoupler
 using ClimaCoupler.TestHelper: create_space
 using ClimaCore: Fields, Spaces
 
-include(pkgdir(ClimaCoupler, "experiments/AMIP/modular/components/land/bucket_init.jl"))
-include(pkgdir(ClimaCoupler, "experiments/AMIP/modular/components/land/bucket_utils.jl"))
+include(pkgdir(ClimaCoupler, "experiments/AMIP/components/land/bucket_init.jl"))
+include(pkgdir(ClimaCoupler, "experiments/AMIP/components/land/bucket_utils.jl"))
 
 for FT in (Float32, Float64)
     @testset "dss_state! BucketSimulation for FT=$FT" begin

diff --git a/test/component_model_tests/climaatmos_tests.jl b/test/component_model_tests/climaatmos_tests.jl
@@ -4,7 +4,7 @@ using ClimaCoupler.Interfacer: AtmosModelSimulation
 using ClimaCoupler.TestHelper: create_space
 using ClimaCore: Fields, Spaces
 
-include(pkgdir(ClimaCoupler, "experiments/AMIP/modular/components/atmosphere/climaatmos_init.jl"))
+include(pkgdir(ClimaCoupler, "experiments/AMIP/components/atmosphere/climaatmos_init.jl"))
 
 for FT in (Float32, Float64)
     @testset "dss_state! ClimaAtmosSimulation for FT=$FT" begin

diff --git a/test/component_model_tests/eisenman_seaice_tests.jl b/test/component_model_tests/eisenman_seaice_tests.jl
@@ -12,7 +12,7 @@ import CLIMAParameters as CP
 import Thermodynamics as TD
 import Thermodynamics.Parameters as TP
 
-include("../../experiments/AMIP/modular/components/ocean/eisenman_seaice_init.jl")
+include("../../experiments/AMIP/components/ocean/eisenman_seaice_init.jl")
 
 
 for FT in (Float32, Float64)
@@ -322,7 +322,7 @@ for FT in (Float32, Float64)
         @test all(parent(Y.h_ice) .< parent(h_ice_0))
     end
 
-    include("../../experiments/AMIP/modular/components/slab_utils.jl")
+    include("../../experiments/AMIP/components/slab_utils.jl")
     @testset "step! update + total energy calculation for FT=$FT" begin
         Δt = Float64(1000)
 

diff --git a/test/component_model_tests/prescr_seaice_tests.jl b/test/component_model_tests/prescr_seaice_tests.jl
@@ -7,7 +7,7 @@ using ClimaCore: Fields, Spaces
 import CLIMAParameters as CP
 import Thermodynamics.Parameters as TDP
 
-include(pkgdir(ClimaCoupler, "experiments/AMIP/modular/components/ocean/prescr_seaice_init.jl"))
+include(pkgdir(ClimaCoupler, "experiments/AMIP/components/ocean/prescr_seaice_init.jl"))
 
 for FT in (Float32, Float64)
     @testset "test sea-ice energy slab for FT=$FT" begin

diff --git a/test/component_model_tests/slab_ocean_tests.jl b/test/component_model_tests/slab_ocean_tests.jl
@@ -7,7 +7,7 @@ using ClimaCore: Fields, Spaces
 import CLIMAParameters as CP
 import Thermodynamics.Parameters as TDP
 
-include(pkgdir(ClimaCoupler, "experiments/AMIP/modular/components/ocean/slab_ocean_init.jl"))
+include(pkgdir(ClimaCoupler, "experiments/AMIP/components/ocean/slab_ocean_init.jl"))
 
 for FT in (Float32, Float64)
     @testset "dss_state! SlabOceanSimulation for FT=$FT" begin

diff --git a/test/debug/debug_amip_plots.jl b/test/debug/debug_amip_plots.jl
@@ -26,7 +26,7 @@ struct BucketSimulation{C} <: SurfaceModelSimulation
 end
 name(sim::BucketSimulation) = "BucketSimulation"
 
-include("../../experiments/AMIP/modular/user_io/debug_plots.jl")
+include("../../experiments/AMIP/user_io/debug_plots.jl")
 
 get_field(sim::BucketSimulation, ::Val{:surface_field}) = sim.cache.surface_field
 get_field(sim::SurfaceStub, ::Val{:stub_field}) = sim.cache.stub_field

diff --git a/test/mpi_tests/local_checks.sh b/test/mpi_tests/local_checks.sh
@@ -14,7 +14,7 @@ export CLIMACORE_DISTRIBUTED="MPI"
 export JULIA_HDF5_PATH=""
 
 export RUN_NAME=amip_restart_mpi_test
-export RESTART_DIR=experiments/AMIP/modular/output/amip/${RUN_NAME}_artifacts/
+export RESTART_DIR=experiments/AMIP/output/amip/${RUN_NAME}_artifacts/
 export RESTART_T=200
 
 julia -e 'using Pkg; Pkg.add("MPIPreferences"); using MPIPreferences; use_system_binary()'
@@ -23,9 +23,9 @@ julia --project -e 'using Pkg; Pkg.build("MPI")'
 julia --project -e 'using Pkg; Pkg.build("HDF5")'
 julia --project -e 'using Pkg; Pkg.API.precompile()'
 
-julia --project=experiments/AMIP/modular/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'
-julia --project=experiments/AMIP/modular/ -e 'using Pkg; Pkg.precompile()'
-julia --project=experiments/AMIP/modular/ -e 'using Pkg; Pkg.status()'
+julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.instantiate(;verbose=true)'
+julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.precompile()'
+julia --project=experiments/AMIP/ -e 'using Pkg; Pkg.status()'
 
 julia --project=artifacts -e 'using Pkg; Pkg.instantiate(;verbose=true)'
 julia --project=artifacts -e 'using Pkg; Pkg.precompile()'
@@ -34,8 +34,8 @@ julia --project=artifacts artifacts/download_artifacts.jl
 
 # run spin up
 # - specify `--hourly_checkpoint true` to save monthly checkpoints of all model prognostic states
-mpiexec julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --run_name $RUN_NAME --coupled true   --start_date 19790101 --hourly_checkpoint true  --anim true --surface_setup PrescribedSurface --dt_cpl 200 --energy_check false --mode_name amip --mono_surface false --vert_diff true --moist equil --rad clearsky --precip_model 0M --z_elem 35 --dz_bottom 50 --h_elem 12 --kappa_4 3e16 --rayleigh_sponge true --alpha_rayleigh_uh 0 --dt 200secs --t_end 0.1days --job_id $RUN_NAME --dt_save_to_sol 1000days --dt_save_to_disk 10days --apply_limiter false --FLOAT_TYPE Float64
+mpiexec julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver_modular.jl --run_name $RUN_NAME --coupled true   --start_date 19790101 --hourly_checkpoint true  --anim true --surface_setup PrescribedSurface --dt_cpl 200 --energy_check false --mode_name amip --mono_surface false --vert_diff true --moist equil --rad clearsky --precip_model 0M --z_elem 35 --dz_bottom 50 --h_elem 12 --kappa_4 3e16 --rayleigh_sponge true --alpha_rayleigh_uh 0 --dt 200secs --t_end 0.1days --job_id $RUN_NAME --dt_save_to_sol 1000days --dt_save_to_disk 10days --apply_limiter false --FLOAT_TYPE Float64
 
 # init using a restart
 # - specify the directory of the `checkpoint/` folder (i.e.,  `--restart_dir`) and time (in secs; `--restart_t`) of the restart file
-mpiexec julia --color=yes --project=experiments/AMIP/modular/ experiments/AMIP/modular/coupler_driver_modular.jl --run_name $RUN_NAME --coupled true --restart_dir $RESTART_DIR --restart_t $RESTART_T --start_date 19790102 --anim true --surface_setup PrescribedSurface --dt_cpl 200 --energy_check false --mode_name amip --mono_surface false --vert_diff true --moist equil --rad clearsky --precip_model 0M --z_elem 35 --dz_bottom 50 --h_elem 12 --kappa_4 3e16 --rayleigh_sponge true --alpha_rayleigh_uh 0 --dt 200secs --t_end 0.1days --job_id $RUN_NAME --dt_save_to_sol 1000days --dt_save_to_disk 10days --apply_limiter false --FLOAT_TYPE Float64
+mpiexec julia --color=yes --project=experiments/AMIP/ experiments/AMIP/coupler_driver_modular.jl --run_name $RUN_NAME --coupled true --restart_dir $RESTART_DIR --restart_t $RESTART_T --start_date 19790102 --anim true --surface_setup PrescribedSurface --dt_cpl 200 --energy_check false --mode_name amip --mono_surface false --vert_diff true --moist equil --rad clearsky --precip_model 0M --z_elem 35 --dz_bottom 50 --h_elem 12 --kappa_4 3e16 --rayleigh_sponge true --alpha_rayleigh_uh 0 --dt 200secs --t_end 0.1days --job_id $RUN_NAME --dt_save_to_sol 1000days --dt_save_to_disk 10days --apply_limiter false --FLOAT_TYPE Float64