Merge #127

127: Fix tc main commit sha r=charleskawczynski a=charleskawczynski It seems that we're still grabbing commit sha f22e3b2, instead of the latest commit (c360990). This PR uses `Dates` to sort the paths by the date. Co-authored-by: Charles Kawczynski <[email protected]>
CliMA · Aug 15, 2021 · 370cbca · 370cbca
2 parents c360990 + 1321913
commit 370cbca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Project.toml b/Project.toml
@@ -7,6 +7,7 @@ version = "0.1.0"
 ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
 ArtifactWrappers = "a14bc488-3040-4b00-9dc1-f6467924858a"
 CLIMAParameters = "6eacf6c3-8458-43b9-ae03-caf5306d3d53"
+Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Dierckx = "39dd38d3-220a-591b-8e3c-4c3a8c710a94"
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 FastGaussQuadrature = "442a2c76-b920-505d-bb47-c5924d526838"

diff --git a/integration_tests/utils/compute_mse.jl b/integration_tests/utils/compute_mse.jl
@@ -1,6 +1,7 @@
 import Plots
 using OrderedCollections
 using Test
+import Dates
 using NCDatasets
 import StatsBase
 using Dierckx
@@ -88,7 +89,8 @@ function find_latest_dataset_folder(; dir = pwd())
     end
     isempty(matching_paths) && return ""
     # sort by timestamp
-    return pop!(sort(matching_paths))
+    sorted_paths = sort(matching_paths; by = f -> Dates.unix2datetime(stat(f).mtime))
+    return pop!(sorted_paths)
 end
 
 function compute_mse_wrapper(
@@ -109,6 +111,7 @@ function compute_mse_wrapper(
         # TODO: make this more robust in case folder/file changes
         folder_name = joinpath("Output.$case_name.01", "stats")
         ds_tc_main_filename = joinpath(path, folder_name, "Stats.$case_name.nc")
+        @info "TC.jl main dataset: $ds_tc_main_filename"
     end
     # Note that we're using a closure over
     #  - PyCLES_output_dataset_path