fixs: Write MOM_layout, and removing the /forcing from era5 path

COSIMA · Feb 13, 2025 · f4dbd13 · f4dbd13
1 parent 75ec3c6
commit f4dbd13
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/demos/premade_run_directories/era5_surface/data_table b/demos/premade_run_directories/era5_surface/data_table
@@ -1,17 +1,17 @@
-"ATM", "p_surf", "sp", "./INPUT/forcing/sp_ERA5.nc", "bilinear", 1.0
-"ATM", "p_bot",  "sp", "./INPUT/forcing/sp_ERA5.nc", "bilinear", 1.0
-"ATM", "t_bot",  "t2m", "./INPUT/forcing/2t_ERA5.nc", "bilinear", 1.0
-"ATM", "sphum_bot", "q", "./INPUT/forcing/q_ERA5.nc", "bilinear", 1.0
-"ATM", "u_bot", "u10", "./INPUT/forcing/10u_ERA5.nc", "bicubic", 1.0
-"ATM", "v_bot", "v10", "./INPUT/forcing/10v_ERA5.nc", "bicubic", 1.0
+"ATM", "p_surf", "sp", "./INPUT/sp_ERA5.nc", "bilinear", 1.0
+"ATM", "p_bot",  "sp", "./INPUT/sp_ERA5.nc", "bilinear", 1.0
+"ATM", "t_bot",  "t2m", "./INPUT/2t_ERA5.nc", "bilinear", 1.0
+"ATM", "sphum_bot", "q", "./INPUT/q_ERA5.nc", "bilinear", 1.0
+"ATM", "u_bot", "u10", "./INPUT/10u_ERA5.nc", "bicubic", 1.0
+"ATM", "v_bot", "v10", "./INPUT/10v_ERA5.nc", "bicubic", 1.0
 "ATM", "z_bot", "", "", "bilinear", 10.0
 "ATM", "gust", "", "", "bilinear", 1.0e-4
 "ICE", "lw_flux_dn", "", "", "bilinear", 1.0
-"ICE", "sw_flux_vis_dir_dn", "msdwswrf", "./INPUT/forcing/msdwswrf_ERA5.nc", "bilinear", 0.285
-"ICE", "sw_flux_vis_dif_dn", "msdwswrf", "./INPUT/forcing/msdwswrf_ERA5.nc", "bilinear", 0.285
-"ICE", "sw_flux_nir_dir_dn", "msdwlwrf", "./INPUT/forcing/msdwlwrf_ERA5.nc", "bilinear", 0.215
-"ICE", "sw_flux_nir_dif_dn", "msdwlwrf", "./INPUT/forcing/msdwlwrf_ERA5.nc", "bilinear", 0.215
-"ICE", "lprec", "trr", "./INPUT/forcing/trr_ERA5.nc", "bilinear", 1.0
+"ICE", "sw_flux_vis_dir_dn", "msdwswrf", "./INPUT/msdwswrf_ERA5.nc", "bilinear", 0.285
+"ICE", "sw_flux_vis_dif_dn", "msdwswrf", "./INPUT/msdwswrf_ERA5.nc", "bilinear", 0.285
+"ICE", "sw_flux_nir_dir_dn", "msdwlwrf", "./INPUT/msdwlwrf_ERA5.nc", "bilinear", 0.215
+"ICE", "sw_flux_nir_dif_dn", "msdwlwrf", "./INPUT/msdwlwrf_ERA5.nc", "bilinear", 0.215
+"ICE", "lprec", "trr", "./INPUT/trr_ERA5.nc", "bilinear", 1.0
 "ICE", "fprec", "", "", "bilinear", 0.0
 "ICE", "runoff", "", "", "none", 0.0
 "ICE", "dhdt", "", "", "none", 80.0

diff --git a/regional_mom6/regional_mom6.py b/regional_mom6/regional_mom6.py
@@ -2536,6 +2536,7 @@ def setup_run_directory(
                 MOM_override_dict[key]["override"] = True
         self.write_MOM_file(MOM_input_dict)
         self.write_MOM_file(MOM_override_dict)
+        self.write_MOM_file(MOM_layout_dict)
 
         ## If using payu to run the model, create a payu configuration file
         if not using_payu and os.path.exists(f"{self.mom_run_dir}/config.yaml"):