fix names and preproc functions

CliMA · Nov 15, 2024 · c081243 · c081243
1 parent 7949375
commit c081243
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/src/shared_utilities/drivers.jl b/src/shared_utilities/drivers.jl
@@ -1031,28 +1031,28 @@ function prescribed_forcing_era5(
 
     precip = TimeVaryingInput(
         era5_ncdata_path,
-        ["tp", "sf"],
+        ["mtpr", "msr"],
         surface_space;
         reference_date = start_date,
         regridder_type,
-        file_reader_kwargs = (; preprocess_func = (data) -> -data / 3600,),
+        file_reader_kwargs = (; preprocess_func = (data) -> -data,),
         method = time_interpolation_method,
-        compose_function = (tp, sf) -> tp - sf,
+        compose_function = (mtpr, msr) -> mtpr - msr,
     )
 
     snow_precip = TimeVaryingInput(
         era5_ncdata_path,
-        "sf",
+        "msr",
         surface_space;
         reference_date = start_date,
         regridder_type,
-        file_reader_kwargs = (; preprocess_func = (data) -> -data / 3600,),
+        file_reader_kwargs = (; preprocess_func = (data) -> -data,),
         method = time_interpolation_method,
     )
 
     u_atmos = TimeVaryingInput(
         era5_ncdata_path,
-        ["u10n", "v10n"],
+        ["u10", "v10"],
         surface_space;
         reference_date = start_date,
         regridder_type,
@@ -1105,20 +1105,18 @@ function prescribed_forcing_era5(
 
     SW_d = TimeVaryingInput(
         era5_ncdata_path,
-        "ssrd",
+        "msdwswrf",
         surface_space;
         reference_date = start_date,
         regridder_type,
-        file_reader_kwargs = (; preprocess_func = (data) -> data / 3600,),
         method = time_interpolation_method,
     )
     LW_d = TimeVaryingInput(
         era5_ncdata_path,
-        "strd",
+        "msdwlwrf",
         surface_space;
         reference_date = start_date,
         regridder_type,
-        file_reader_kwargs = (; preprocess_func = (data) -> data / 3600,),
         method = time_interpolation_method,
     )