Skip to content
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.

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

EW: Add updated ncdata and bnd_topo files for MPASv8 #33

Merged
merged 28 commits into from
Sep 20, 2024

Conversation

gdicker1
Copy link

@gdicker1 gdicker1 commented Sep 11, 2024

This PR brings in similar changes to those added to the upstream. See linked PR for more information.

ESCOMP#1029

This PR will extend the upstream changes to also add 15 EarthWorks-specifc files1:

  • notopo ncdata files for mpasa15 at 32L, 58L, and 93L
  • Real-data IC ncdata files for the product of {mpasa60, mpasa30, and mpasa15} x {32L, 58L, 93L}
  • bnd_topo files for mpasa60, mpasa30, mpasa15

These changes will fix EarthWorks Issue #55

Footnotes

  1. PR will remain in draft until these files are added to the PR branch

This commit addresses issues that were seen when using ncdata with
longitudes in the [-pi, pi] range in cases with full physics.  This
would cause the atmosphere to become unphysical and runs to fail. This
change is made just after the longitude values are read to ensure they
are correct for the remainder of execution.
NOTE: this is before the 'aux_cam' tests have been run
Previous versions of the lonCell_arr adjustment used an explicit loop. Without this loop, the nCells variable and the routine to fetch it are no longer needed.
Makes code consistent with CAM coding standards: 'All variables of type
real must have a specified kind, including literals.'
This commit also extends the comment that was with this code block,
includes an if condition so valid values aren't modified, uses kinds and
constants (pi) that are already used in the new file, and updates the
ChangeLog so the correct file is referenced.
This aligns the files with changes in cam6_4_001 (PR ESCOMP#1028).
Conform to CAM Coding Standards: 'Use symbolic numerical comparison
operators (e.g., ==, /=, <, >=) not old character versions (e.g.,
.eq.).'
The correct file for these physics schemes must include topography.
Enable no-topography, idealized test cases with the mpas dycore when
running 58L or 93L on 480, 120, 60, and 30km grids.
NOTE: these files also support running with analytic_ic.
Duplicates an entry to ensure that the following two files are used
together:
- mpasa120_L32_topo_coords_c240508.nc
-
mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc

Matches the physics specification on new real-data ICs, so the correct *_20240507.nc
bnd_topo files are used with them.
Remove old L32 real-data files and all physics specififiers from new
real-data files. The old mpasa bnd_topo is similarly replaced.

One entry with the old mpasa120 bnd_topo file remains, it is still used
by the mpas120km.waccm_fulltopo_c220818.nc ncdata. Specifiers are used to
match these entries.
The mpasa120km.waccm_fulltopo_c220818.nc was the last file using
mpas_120_nc3000_Co060_Fi001_MulG_PF_Nsw042_c200921.nc, allowing it to be
removed.
ESCOMP#1095)

These changes address run-time failures that were seen when using MPAS
ncdata with longitudes in the [-pi, pi] range in cases with non-simple
physics. The atmospheric state would become unphysical and fail.
@gdicker1 gdicker1 added enhancement New feature or request upstream Related to the upstream repo (ESCOMP/CAM) labels Sep 11, 2024
@gdicker1 gdicker1 self-assigned this Sep 11, 2024
@gdicker1 gdicker1 changed the title (WIP) EW: Add up dated ncdata and bnd_topo files for MPASv8 (WIP) EW: Add updated ncdata and bnd_topo files for MPASv8 Sep 11, 2024
Bring in dev changes from EarthWorksOrg/CAM
These include:
- mpasa15 32L, 58L, 93L notopo files
- cami (real-data) input files for product {mpasa60, mpasa30, mpasa15 } x {32L, 58L, 93L}
- mpasa60, mpasa30, mpasa15 bnd_topo files.
@gdicker1 gdicker1 marked this pull request as ready for review September 13, 2024 02:39
@gdicker1 gdicker1 changed the title (WIP) EW: Add updated ncdata and bnd_topo files for MPASv8 EW: Add updated ncdata and bnd_topo files for MPASv8 Sep 13, 2024
@gdicker1
Copy link
Author

gdicker1 commented Sep 15, 2024

Note: 1409359 fixes a problem not caught while working on #32 (a missing use statement). Fixes builds for gnu and intel of cases that use cam7 physics.

@gdicker1 gdicker1 merged commit 6344fe3 into EarthWorksOrg:ew-develop Sep 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request upstream Related to the upstream repo (ESCOMP/CAM)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant