Skip to content

Conversation

@brianhenn
Copy link
Contributor

@brianhenn brianhenn commented Jul 11, 2025

Updates the codebase to a recent commit on full-model (1607488c).

This PR was created by the following steps, similar to the prior release in December 2024:

  • Using the script in full-model to specify which files should be copied over, and filter the git history to only include these files.
  • Pushing this filtered repo to a new branch on ace called linear-history.
  • Creating the release-2025-07 branch on ace, and then squash-merging linear-history into this branch using git merge linear-history --squash --allow-unrelated-histories --strategy-option theirs (necessary because GH will not allow opening a PR with incompatible histories, but --allow-unrelated-histories results in a branch that is "compatible").
  • Re-apply deletion of files that had been deleted or moved since last public release, as these are not caught by the merge strategy.
  • Re-apply squashed change of all commits made in ace that are not the public releases, done by running git cherry-pick --no-commit <ref>..<ref> over the various sets of commits made between public releases, and then squashing these sets of changes into one commit.
  • Removing CI-related items that do not run in the public repo, such as the GPU tests and specific compute system references.

@brianhenn brianhenn marked this pull request as ready for review July 12, 2025 00:06
pyproject.toml Outdated
Comment on lines 46 to 48
[tool.ruff]
exclude = ["fme/ace/models/makani_fcn2/**"]

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
[tool.ruff]
exclude = ["fme/ace/models/makani_fcn2/**"]

Copy link
Contributor

@elynnwu elynnwu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did a diff from full-model (52cf66b5a) and have one minor comment

in the dataset configuration. See :class:`fme.ace.XarrayDataConfig` for an example.
While netCDFs files are specified in the example, zarr stores are also compatible, e.g.,
specifying the parent folder containing the zarr store directory as the ``path``, setting ``engine`` to "zarr", and setting ``file_pattern`` to "<zarr_store_name>.zarr"
in the dataset configuration. See :class:`fme.ace.XarrayDataConfig` for more information.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nit] Further down on line 44, links to zenodo but full-model uses https://huggingface.co/allenai/ACE2-ERA5, which is more consistent with the text above

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. The challenge of trying to maintain two versions of the docs between public and private ...

fme/__init__.py Outdated
"using_gpu",
"weighted_std",
"ace",
"coupled",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove coupled

Comment on lines 27 to 28
Inspired by fme/coupled/data_loading/test_data_loader.py::_save_netcdf
and fme.ace.testing.fv3gfs_data.save_nd_netcdf.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nit] this path doesn't exist but it's just in the comment so I don't think it matters

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed

Copy link
Contributor

@elynnwu elynnwu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@brianhenn brianhenn merged commit ad9b178 into main Jul 14, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants