Merge pull request #1228 from CliMA/ne/hotfix

Prepend coupler pkgdir to all coupler TOML files

Author: nefrathenrici

NEWS.md

@@ -6,6 +6,11 @@ ClimaCoupler.jl Release Notes
 
 ### ClimaCoupler features
 
+#### Add support for relative parameter filepaths PR[#1228](https://github.com/CliMA/ClimaCoupler.jl/pull/1228)
+Changed TOML parameter file handling to prepend the `pkgdir(ClimaCoupler)` 
+if no file is found at the relative filepath. Before this change, all files
+were assumed to be within the `ClimaCoupler` or `ClimaAtmos` repositories.
+
 #### Add support for parameter files in `BucketSimulation` PR[#1217](https://github.com/CliMA/ClimaCoupler.jl/pull/1217)
 Add a keyword argument `parameter_files` to `BucketSimulation` to enable
 calibration in a coupled simulation, passed via the `"coupler_toml"` argument.

experiments/ClimaEarth/components/atmosphere/climaatmos.jl

@@ -447,8 +447,11 @@ function get_atmos_config_dict(coupler_dict::Dict, job_id::String, atmos_output_
     end
 
     # use atmos toml if coupler toml is not defined
-    atmos_toml = joinpath.(pkgdir(CA), atmos_config["toml"])
-    coupler_toml = joinpath.(pkgdir(ClimaCoupler), coupler_dict["coupler_toml"])
+    # If we can't find the file at the relative path, prepend pkgdir(ClimaAtmos)
+    atmos_toml = map(atmos_config["toml"]) do file
+        isfile(file) ? file : joinpath(pkgdir(CA), file)
+    end
+    coupler_toml = atmos_config["coupler_toml"]
     toml = isempty(coupler_toml) ? atmos_toml : coupler_toml
     if !isempty(toml)
         @info "Overwriting Atmos parameters from input TOML file(s): $toml"

experiments/ClimaEarth/user_io/arg_parsing.jl

@@ -59,7 +59,9 @@ function get_coupler_args(config_dict::Dict)
     FT = config_dict["FLOAT_TYPE"] == "Float64" ? Float64 : Float32
 
     # Vector of TOML files containing model parameters
-    parameter_files = config_dict["coupler_toml"]
+    parameter_files = map(config_dict["coupler_toml"]) do file
+        isfile(file) ? file : joinpath(pkgdir(ClimaCoupler), file)
+    end
 
     # Time information
     t_end = Float64(Utilities.time_to_seconds(config_dict["t_end"]))