Merge #615

615: Reorganize folders r=charleskawczynski a=charleskawczynski We're preparing to move dycore code outside of `src/`, and decided it would be good to reorganize some of the folders Co-authored-by: Charles Kawczynski <kawczynski.charles@gmail.com>
CliMA · Dec 3, 2021 · 24f361f · 24f361f
2 parents 726c600 + c1e3aa8
commit 24f361f
Show file tree

Hide file tree

Showing 27 changed files with 113 additions and 79 deletions.
diff --git a/docs/src/PlotReferenceStates.jl b/docs/src/PlotReferenceStates.jl
@@ -4,10 +4,10 @@ import NCDatasets
 import CLIMAParameters
 import ClimaCore
 const CC = ClimaCore
-tc_dir = dirname(dirname(pathof(TurbulenceConvection)))
-include(joinpath(tc_dir, "integration_tests", "utils", "generate_namelist.jl"))
-include(joinpath(tc_dir, "integration_tests", "utils", "Cases.jl"))
-include(joinpath(tc_dir, "integration_tests", "utils", "parameter_set.jl"))
+const tc_dir = dirname(dirname(pathof(TurbulenceConvection)))
+include(joinpath(tc_dir, "driver", "generate_namelist.jl"))
+include(joinpath(tc_dir, "driver", "Cases.jl"))
+include(joinpath(tc_dir, "driver", "parameter_set.jl"))
 import .NameList
 import .Cases
 function export_ref_profile(case_name::String)

diff --git a/driver/Artifacts.toml b/driver/Artifacts.toml
@@ -0,0 +1,8 @@
+[LESDrivenSCM_output_dataset]
+git-tree-sha1 = "3d6bb62d803fb01908ffe85469a89933f28ced45"
+
+[PyCLES_output]
+git-tree-sha1 = "4a54eb3dfa48035d7a4318005963408a4e94c6d5"
+
+[SCAMPy_output]
+git-tree-sha1 = "6b82611f969d3cf99102baa7d898e3c759cf014c"
diff --git a/integration_tests/utils/Cases.jl → driver/Cases.jl b/integration_tests/utils/Cases.jl → driver/Cases.jl
diff --git a/integration_tests/utils/generate_namelist.jl → driver/generate_namelist.jl b/integration_tests/utils/generate_namelist.jl → driver/generate_namelist.jl
diff --git a/...gration_tests/utils/initial_conditions.jl → driver/initial_conditions.jl b/...gration_tests/utils/initial_conditions.jl → driver/initial_conditions.jl
diff --git a/integration_tests/utils/main.jl → driver/main.jl b/integration_tests/utils/main.jl → driver/main.jl
diff --git a/integration_tests/utils/parameter_set.jl → driver/parameter_set.jl b/integration_tests/utils/parameter_set.jl → driver/parameter_set.jl
diff --git a/integration_tests/ARM_SGP.jl b/integration_tests/ARM_SGP.jl
@@ -4,10 +4,11 @@ end
 import TurbulenceConvection
 using Test
 
-include(joinpath("utils", "main.jl"))
-include(joinpath("utils", "generate_namelist.jl"))
-include(joinpath("utils", "compute_mse.jl"))
-include(joinpath("utils", "mse_tables.jl"))
+const tc_dir = dirname(dirname(pathof(TurbulenceConvection)))
+include(joinpath(tc_dir, "driver", "main.jl"))
+include(joinpath(tc_dir, "driver", "generate_namelist.jl"))
+include(joinpath(tc_dir, "post_processing", "compute_mse.jl"))
+include(joinpath(tc_dir, "post_processing", "mse_tables.jl"))
 import .NameList
 
 best_mse = all_best_mse["ARM_SGP"]
@@ -35,6 +36,6 @@ end
     for k in keys(best_mse)
         test_mse(computed_mse, best_mse, k)
     end
-    include(joinpath("utils", "post_run_tests.jl"))
+    include(joinpath(tc_dir, "post_processing", "post_run_tests.jl"))
     nothing
 end
diff --git a/integration_tests/Bomex.jl b/integration_tests/Bomex.jl
@@ -4,10 +4,11 @@ end
 import TurbulenceConvection
 using Test
 
-include(joinpath("utils", "main.jl"))
-include(joinpath("utils", "generate_namelist.jl"))
-include(joinpath("utils", "compute_mse.jl"))
-include(joinpath("utils", "mse_tables.jl"))
+const tc_dir = dirname(dirname(pathof(TurbulenceConvection)))
+include(joinpath(tc_dir, "driver", "main.jl"))
+include(joinpath(tc_dir, "driver", "generate_namelist.jl"))
+include(joinpath(tc_dir, "post_processing", "compute_mse.jl"))
+include(joinpath(tc_dir, "post_processing", "mse_tables.jl"))
 import .NameList
 
 best_mse = all_best_mse["Bomex"]
@@ -35,6 +36,6 @@ end
     for k in keys(best_mse)
         test_mse(computed_mse, best_mse, k)
     end
-    include(joinpath("utils", "post_run_tests.jl"))
+    include(joinpath(tc_dir, "post_processing", "post_run_tests.jl"))
     nothing
 end
diff --git a/integration_tests/DYCOMS_RF01.jl b/integration_tests/DYCOMS_RF01.jl
@@ -4,10 +4,11 @@ end
 import TurbulenceConvection
 using Test
 
-include(joinpath("utils", "main.jl"))
-include(joinpath("utils", "generate_namelist.jl"))
-include(joinpath("utils", "compute_mse.jl"))
-include(joinpath("utils", "mse_tables.jl"))
+const tc_dir = dirname(dirname(pathof(TurbulenceConvection)))
+include(joinpath(tc_dir, "driver", "main.jl"))
+include(joinpath(tc_dir, "driver", "generate_namelist.jl"))
+include(joinpath(tc_dir, "post_processing", "compute_mse.jl"))
+include(joinpath(tc_dir, "post_processing", "mse_tables.jl"))
 import .NameList
 
 best_mse = all_best_mse["DYCOMS_RF01"]
@@ -35,6 +36,6 @@ end
     for k in keys(best_mse)
         test_mse(computed_mse, best_mse, k)
     end
-    include(joinpath("utils", "post_run_tests.jl"))
+    include(joinpath(tc_dir, "post_processing", "post_run_tests.jl"))
     nothing
 end
diff --git a/integration_tests/DryBubble.jl b/integration_tests/DryBubble.jl
@@ -4,10 +4,11 @@ end
 import TurbulenceConvection
 using Test
 
-include(joinpath("utils", "main.jl"))
-include(joinpath("utils", "generate_namelist.jl"))
-include(joinpath("utils", "compute_mse.jl"))
-include(joinpath("utils", "mse_tables.jl"))
+const tc_dir = dirname(dirname(pathof(TurbulenceConvection)))
+include(joinpath(tc_dir, "driver", "main.jl"))
+include(joinpath(tc_dir, "driver", "generate_namelist.jl"))
+include(joinpath(tc_dir, "post_processing", "compute_mse.jl"))
+include(joinpath(tc_dir, "post_processing", "mse_tables.jl"))
 import .NameList
 
 best_mse = all_best_mse["DryBubble"]
@@ -29,6 +30,6 @@ end
     for k in keys(best_mse)
         test_mse(computed_mse, best_mse, k)
     end
-    include(joinpath("utils", "post_run_tests.jl"))
+    include(joinpath(tc_dir, "post_processing", "post_run_tests.jl"))
     nothing
 end
diff --git a/integration_tests/GABLS.jl b/integration_tests/GABLS.jl
@@ -4,10 +4,11 @@ end
 import TurbulenceConvection
 using Test
 
-include(joinpath("utils", "main.jl"))
-include(joinpath("utils", "generate_namelist.jl"))
-include(joinpath("utils", "compute_mse.jl"))
-include(joinpath("utils", "mse_tables.jl"))
+const tc_dir = dirname(dirname(pathof(TurbulenceConvection)))
+include(joinpath(tc_dir, "driver", "main.jl"))
+include(joinpath(tc_dir, "driver", "generate_namelist.jl"))
+include(joinpath(tc_dir, "post_processing", "compute_mse.jl"))
+include(joinpath(tc_dir, "post_processing", "mse_tables.jl"))
 import .NameList
 
 best_mse = all_best_mse["GABLS"]
@@ -35,6 +36,6 @@ end
     for k in keys(best_mse)
         test_mse(computed_mse, best_mse, k)
     end
-    include(joinpath("utils", "post_run_tests.jl"))
+    include(joinpath(tc_dir, "post_processing", "post_run_tests.jl"))
     nothing
 end
diff --git a/integration_tests/GATE_III.jl b/integration_tests/GATE_III.jl
@@ -4,17 +4,26 @@ end
 import TurbulenceConvection
 using Test
 
-include(joinpath("utils", "main.jl"))
-include(joinpath("utils", "generate_namelist.jl"))
-include(joinpath("utils", "compute_mse.jl"))
+const tc_dir = dirname(dirname(pathof(TurbulenceConvection)))
+include(joinpath(tc_dir, "driver", "main.jl"))
+include(joinpath(tc_dir, "driver", "generate_namelist.jl"))
+include(joinpath(tc_dir, "post_processing", "compute_mse.jl"))
+include(joinpath(tc_dir, "post_processing", "mse_tables.jl"))
 import .NameList
 
-println("Running GATE_III...")
-namelist = default_namelist("GATE_III")
+case_name = "GATE_III"
+
+best_mse = Dict()
+
+println("Running $case_name...")
+namelist = NameList.default_namelist(case_name)
 namelist["meta"]["uuid"] = "01"
 ds_tc_filename, return_code = @time main(namelist; time_run = true)
 
 @testset "GATE_III" begin
-    include(joinpath("utils", "post_run_tests.jl"))
+    for k in keys(best_mse)
+        test_mse(computed_mse, best_mse, k)
+    end
+    include(joinpath(tc_dir, "post_processing", "post_run_tests.jl"))
     nothing
 end
diff --git a/integration_tests/LES_driven_SCM.jl b/integration_tests/LES_driven_SCM.jl
@@ -4,10 +4,11 @@ end
 import TurbulenceConvection
 using Test
 
-include(joinpath("utils", "main.jl"))
-include(joinpath("utils", "generate_namelist.jl"))
-include(joinpath("utils", "compute_mse.jl"))
-include(joinpath("utils", "mse_tables.jl"))
+const tc_dir = dirname(dirname(pathof(TurbulenceConvection)))
+include(joinpath(tc_dir, "driver", "main.jl"))
+include(joinpath(tc_dir, "driver", "generate_namelist.jl"))
+include(joinpath(tc_dir, "post_processing", "compute_mse.jl"))
+include(joinpath(tc_dir, "post_processing", "mse_tables.jl"))
 import .NameList
 
 best_mse = all_best_mse["LES_driven_SCM"]
@@ -39,6 +40,6 @@ end
     for k in keys(best_mse)
         test_mse(computed_mse, best_mse, k)
     end
-    include(joinpath("utils", "post_run_tests.jl"))
+    include(joinpath(tc_dir, "post_processing", "post_run_tests.jl"))
     nothing
 end
diff --git a/integration_tests/Nieuwstadt.jl b/integration_tests/Nieuwstadt.jl
@@ -4,10 +4,11 @@ end
 import TurbulenceConvection
 using Test
 
-include(joinpath("utils", "main.jl"))
-include(joinpath("utils", "generate_namelist.jl"))
-include(joinpath("utils", "compute_mse.jl"))
-include(joinpath("utils", "mse_tables.jl"))
+const tc_dir = dirname(dirname(pathof(TurbulenceConvection)))
+include(joinpath(tc_dir, "driver", "main.jl"))
+include(joinpath(tc_dir, "driver", "generate_namelist.jl"))
+include(joinpath(tc_dir, "post_processing", "compute_mse.jl"))
+include(joinpath(tc_dir, "post_processing", "mse_tables.jl"))
 import .NameList
 
 best_mse = all_best_mse["Nieuwstadt"]
@@ -35,6 +36,6 @@ end
     for k in keys(best_mse)
         test_mse(computed_mse, best_mse, k)
     end
-    include(joinpath("utils", "post_run_tests.jl"))
+    include(joinpath(tc_dir, "post_processing", "post_run_tests.jl"))
     nothing
 end
diff --git a/integration_tests/Rico.jl b/integration_tests/Rico.jl
@@ -4,10 +4,11 @@ end
 import TurbulenceConvection
 using Test
 
-include(joinpath("utils", "main.jl"))
-include(joinpath("utils", "generate_namelist.jl"))
-include(joinpath("utils", "compute_mse.jl"))
-include(joinpath("utils", "mse_tables.jl"))
+const tc_dir = dirname(dirname(pathof(TurbulenceConvection)))
+include(joinpath(tc_dir, "driver", "main.jl"))
+include(joinpath(tc_dir, "driver", "generate_namelist.jl"))
+include(joinpath(tc_dir, "post_processing", "compute_mse.jl"))
+include(joinpath(tc_dir, "post_processing", "mse_tables.jl"))
 import .NameList
 
 best_mse = all_best_mse["Rico"]
@@ -35,6 +36,6 @@ end
     for k in keys(best_mse)
         test_mse(computed_mse, best_mse, k)
     end
-    include(joinpath("utils", "post_run_tests.jl"))
+    include(joinpath(tc_dir, "post_processing", "post_run_tests.jl"))
     nothing
 end
diff --git a/integration_tests/SP.jl b/integration_tests/SP.jl
@@ -4,10 +4,11 @@ end
 import TurbulenceConvection
 using Test
 
-include(joinpath("utils", "main.jl"))
-include(joinpath("utils", "generate_namelist.jl"))
-include(joinpath("utils", "compute_mse.jl"))
-include(joinpath("utils", "mse_tables.jl"))
+const tc_dir = dirname(dirname(pathof(TurbulenceConvection)))
+include(joinpath(tc_dir, "driver", "main.jl"))
+include(joinpath(tc_dir, "driver", "generate_namelist.jl"))
+include(joinpath(tc_dir, "post_processing", "compute_mse.jl"))
+include(joinpath(tc_dir, "post_processing", "mse_tables.jl"))
 import .NameList
 
 best_mse = all_best_mse["SP"]
@@ -29,6 +30,6 @@ end
     for k in keys(best_mse)
         test_mse(computed_mse, best_mse, k)
     end
-    include(joinpath("utils", "post_run_tests.jl"))
+    include(joinpath(tc_dir, "post_processing", "post_run_tests.jl"))
     nothing
 end
diff --git a/integration_tests/Soares.jl b/integration_tests/Soares.jl
@@ -4,10 +4,11 @@ end
 import TurbulenceConvection
 using Test
 
-include(joinpath("utils", "main.jl"))
-include(joinpath("utils", "generate_namelist.jl"))
-include(joinpath("utils", "compute_mse.jl"))
-include(joinpath("utils", "mse_tables.jl"))
+const tc_dir = dirname(dirname(pathof(TurbulenceConvection)))
+include(joinpath(tc_dir, "driver", "main.jl"))
+include(joinpath(tc_dir, "driver", "generate_namelist.jl"))
+include(joinpath(tc_dir, "post_processing", "compute_mse.jl"))
+include(joinpath(tc_dir, "post_processing", "mse_tables.jl"))
 import .NameList
 
 best_mse = all_best_mse["Soares"]
@@ -35,6 +36,6 @@ end
     for k in keys(best_mse)
         test_mse(computed_mse, best_mse, k)
     end
-    include(joinpath("utils", "post_run_tests.jl"))
+    include(joinpath(tc_dir, "post_processing", "post_run_tests.jl"))
     nothing
 end
diff --git a/integration_tests/TRMM_LBA.jl b/integration_tests/TRMM_LBA.jl
@@ -4,10 +4,11 @@ end
 import TurbulenceConvection
 using Test
 
-include(joinpath("utils", "main.jl"))
-include(joinpath("utils", "generate_namelist.jl"))
-include(joinpath("utils", "compute_mse.jl"))
-include(joinpath("utils", "mse_tables.jl"))
+const tc_dir = dirname(dirname(pathof(TurbulenceConvection)))
+include(joinpath(tc_dir, "driver", "main.jl"))
+include(joinpath(tc_dir, "driver", "generate_namelist.jl"))
+include(joinpath(tc_dir, "post_processing", "compute_mse.jl"))
+include(joinpath(tc_dir, "post_processing", "mse_tables.jl"))
 import .NameList
 
 best_mse = all_best_mse["TRMM_LBA"]
@@ -35,6 +36,6 @@ end
     for k in keys(best_mse)
         test_mse(computed_mse, best_mse, k)
     end
-    include(joinpath("utils", "post_run_tests.jl"))
+    include(joinpath(tc_dir, "post_processing", "post_run_tests.jl"))
     nothing
 end
diff --git a/integration_tests/life_cycle_Tan2018.jl b/integration_tests/life_cycle_Tan2018.jl
@@ -4,10 +4,11 @@ end
 import TurbulenceConvection
 using Test
 
-include(joinpath("utils", "main.jl"))
-include(joinpath("utils", "generate_namelist.jl"))
-include(joinpath("utils", "compute_mse.jl"))
-include(joinpath("utils", "mse_tables.jl"))
+const tc_dir = dirname(dirname(pathof(TurbulenceConvection)))
+include(joinpath(tc_dir, "driver", "main.jl"))
+include(joinpath(tc_dir, "driver", "generate_namelist.jl"))
+include(joinpath(tc_dir, "post_processing", "compute_mse.jl"))
+include(joinpath(tc_dir, "post_processing", "mse_tables.jl"))
 import .NameList
 
 best_mse = all_best_mse["life_cycle_Tan2018"]
@@ -35,6 +36,6 @@ end
     for k in keys(best_mse)
         test_mse(computed_mse, best_mse, k)
     end
-    include(joinpath("utils", "post_run_tests.jl"))
+    include(joinpath(tc_dir, "post_processing", "post_run_tests.jl"))
     nothing
 end
diff --git a/perf/common.jl b/perf/common.jl
@@ -1,10 +1,10 @@
 import TurbulenceConvection
 
 const tc_dir = dirname(dirname(pathof(TurbulenceConvection)))
-include(joinpath(tc_dir, "integration_tests", "utils", "generate_namelist.jl"))
-include(joinpath(tc_dir, "integration_tests", "utils", "Cases.jl"))
-include(joinpath(tc_dir, "integration_tests", "utils", "parameter_set.jl"))
-include(joinpath(tc_dir, "integration_tests", "utils", "main.jl"))
+include(joinpath(tc_dir, "driver", "generate_namelist.jl"))
+include(joinpath(tc_dir, "driver", "Cases.jl"))
+include(joinpath(tc_dir, "driver", "parameter_set.jl"))
+include(joinpath(tc_dir, "driver", "main.jl"))
 import .NameList
 
 TurbulenceConvection.initialize_io(sim::Simulation1d) = nothing

diff --git a/post_processing/Artifacts.toml b/post_processing/Artifacts.toml
@@ -0,0 +1,5 @@
+[PyCLES_output]
+git-tree-sha1 = "4a54eb3dfa48035d7a4318005963408a4e94c6d5"
+
+[SCAMPy_output]
+git-tree-sha1 = "6b82611f969d3cf99102baa7d898e3c759cf014c"
diff --git a/integration_tests/utils/compute_mse.jl → post_processing/compute_mse.jl b/integration_tests/utils/compute_mse.jl → post_processing/compute_mse.jl
diff --git a/integration_tests/utils/mse_tables.jl → post_processing/mse_tables.jl b/integration_tests/utils/mse_tables.jl → post_processing/mse_tables.jl
diff --git a/integration_tests/utils/post_run_tests.jl → post_processing/post_run_tests.jl b/integration_tests/utils/post_run_tests.jl → post_processing/post_run_tests.jl
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -6,10 +6,10 @@ import TurbulenceConvection
 const TC = TurbulenceConvection
 const tc_dir = dirname(dirname(pathof(TC)))
 
-include(joinpath(tc_dir, "integration_tests", "utils", "main.jl"))
-include(joinpath(tc_dir, "integration_tests", "utils", "generate_namelist.jl"))
-include(joinpath(tc_dir, "integration_tests", "utils", "compute_mse.jl"))
-include(joinpath(tc_dir, "integration_tests", "utils", "mse_tables.jl"))
+include(joinpath(tc_dir, "driver", "main.jl"))
+include(joinpath(tc_dir, "driver", "generate_namelist.jl"))
+include(joinpath(tc_dir, "post_processing", "compute_mse.jl"))
+include(joinpath(tc_dir, "post_processing", "mse_tables.jl"))
 import .NameList
 best_mse = all_best_mse["Bomex"]
 

diff --git a/utils/print_new_mse.jl b/utils/print_new_mse.jl
@@ -20,7 +20,7 @@ all_cases = [
 filter!(x -> x ≠ "GATE_III", all_cases) # no mse tables for GATE_III
 filter!(x -> x ≠ "SP", all_cases) # not currently running SP
 
-include(joinpath("..", "integration_tests", "utils", "mse_tables.jl"))
+include(joinpath("..", "post_processing", "mse_tables.jl"))
 
 percent_reduction_mse = Dict()