Update Var.resampled_as to use Var.reordered_as

This commit also removes the tests for checking whether the order of
dimensions are the same when resampling.

Author: ph-kev

NEWS.md

@@ -9,8 +9,8 @@ v0.5.9
 ### Reorder dimensions
 Before, resampling requires that the order of the dimensions is the same between the two
 `OutputVar`s. This feature adds the functionality of reordering the dimensions in a
-`OutputVar` to match the ordering of dimensions in another `OutputVar`. See the example
-below of this functionality.
+`OutputVar` to match the ordering of another `OutputVar`. The function `resampled_as` is
+updated to use `reordered_as`. See the example below of this functionality.
 
 ```julia
 julia> src_var.dims |> keys |> collect

src/Var.jl

@@ -838,6 +838,7 @@ Resample `data` in `src_var` to `dims` in `dest_var`.
 The resampling performed here is a 1st-order linear resampling.
 """
 function resampled_as(src_var::OutputVar, dest_var::OutputVar)
+    src_var = reordered_as(src_var, dest_var)
     _check_dims_consistent(src_var, dest_var)
 
     src_resampled_data =

test/test_Var.jl

@@ -1205,35 +1205,6 @@ end
         var_missing_dim_units,
     )
 
-    # Mismatch in ordering of dims
-    lon = collect(range(-179.5, 179.5, 360))
-    lat = collect(range(-89.5, 89.5, 180))
-    data_ones = ones(length(lon), length(lat))
-    dims = OrderedDict(["lon" => lon, "lat" => lat])
-    attribs =
-        Dict("long_name" => "idk", "short_name" => "short", "units" => "kg")
-    dim_attribs = OrderedDict([
-        "lon" => Dict("units" => "deg"),
-        "lat" => Dict("units" => "deg"),
-    ])
-    var_lonlat = ClimaAnalysis.OutputVar(attribs, dims, dim_attribs, data_ones)
-    lon = collect(range(-179.5, 179.5, 360))
-    lat = collect(range(-89.5, 89.5, 180))
-    data_ones = ones(length(lat), length(lon))
-    dims = OrderedDict(["lat" => lat, "lon" => lon])
-    attribs =
-        Dict("long_name" => "idk", "short_name" => "short", "units" => "kg")
-    dim_attribs = OrderedDict([
-        "lat" => Dict("units" => "deg"),
-        "lon" => Dict("units" => "deg"),
-    ])
-    var_latlon = ClimaAnalysis.OutputVar(attribs, dims, dim_attribs, data_ones)
-    @test_throws ErrorException ClimaAnalysis.bias(var_lonlat, var_latlon)
-    @test_throws ErrorException ClimaAnalysis.squared_error(
-        var_lonlat,
-        var_latlon,
-    )
-
     # Missing dims
     lon = collect(range(-179.5, 179.5, 360))
     data_missing_dim = ones(length(lon))