Skip to content

Rename land_sea_mask.nc to land_mask.nc #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
azrael417 merged 2 commits into from
Jul 8, 2026
Merged

Rename land_sea_mask.nc to land_mask.nc #147

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
292f73a
Rename land_sea_mask.nc to land_mask.nc
sgpearse Jul 6, 2026
d24e6d5
Normalize static/normalization file names in save_model_package
azrael417 Jul 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions makani/models/model_package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class LocalPackage:
MEANS_FILE = "global_means.npy"
STDS_FILE = "global_stds.npy"
OROGRAPHY_FILE = "orography.nc"
LANDMASK_FILE = "land_sea_mask.nc"
LANDMASK_FILE = "land_mask.nc"
SOILTYPE_FILE = "soil_type.nc"

def __init__(self, root):
Expand Down Expand Up @@ -184,24 +184,27 @@ def save_model_package(params):
msg = json.dumps(params.to_dict(), indent=4, sort_keys=True)
f.write(msg)

# copy static data into the package under the canonical file names expected
# by LocalPackage, so packages are self-consistent regardless of how the
# source files happen to be named on a given system
if params.get("add_orography", False):
shutil.copy(params.orography_path, os.path.join(params.experiment_dir, os.path.basename(params.orography_path)))
shutil.copy(params.orography_path, os.path.join(params.experiment_dir, LocalPackage.OROGRAPHY_FILE))

if params.get("add_landmask", False):
shutil.copy(params.landmask_path, os.path.join(params.experiment_dir, os.path.basename(params.landmask_path)))
shutil.copy(params.landmask_path, os.path.join(params.experiment_dir, LocalPackage.LANDMASK_FILE))

if params.get("add_soiltype", False):
shutil.copy(params.soiltype_path, os.path.join(params.experiment_dir, os.path.basename(params.soiltype_path)))
shutil.copy(params.soiltype_path, os.path.join(params.experiment_dir, LocalPackage.SOILTYPE_FILE))

# always save out all normalization files
# always save out all normalization files under their canonical names
if params.get("global_means_path", None) is not None:
shutil.copy(params.global_means_path, os.path.join(params.experiment_dir, os.path.basename(params.global_means_path)))
shutil.copy(params.global_means_path, os.path.join(params.experiment_dir, LocalPackage.MEANS_FILE))
if params.get("global_stds_path", None) is not None:
shutil.copy(params.global_stds_path, os.path.join(params.experiment_dir, os.path.basename(params.global_stds_path)))
shutil.copy(params.global_stds_path, os.path.join(params.experiment_dir, LocalPackage.STDS_FILE))
if params.get("min_path", None) is not None:
shutil.copy(params.min_path, os.path.join(params.experiment_dir, os.path.basename(params.min_path)))
shutil.copy(params.min_path, os.path.join(params.experiment_dir, LocalPackage.MINS_FILE))
if params.get("max_path", None) is not None:
shutil.copy(params.max_path, os.path.join(params.experiment_dir, os.path.basename(params.max_path)))
shutil.copy(params.max_path, os.path.join(params.experiment_dir, LocalPackage.MAXS_FILE))

# write out earth2mip metadata.json
fcn_mip_data = {
Expand Down