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

Feature/update to gfdl 20210224 #56

Merged

Conversation

jiandewang
Copy link
Collaborator

Description of changes

  • update EMC MOM6 to GFDL 20210224 commit

Issues Fixed (include github issue #):

Are changes expected to change answers?

  • No

Testing performed:

  • machine: orion, hera and dell-p3

Hashes used for testing

Raphael Dussin and others added 30 commits December 9, 2020 12:59
- Remove "\n" from ALIASES as it tends to be passed through to latex and causes it to fail.
- Add/move notes around in README.md and details/.
Doxygen support for 1.8.13 through 1.8.20
This patch trims some of the netCDF flag management and adds more
explicit tests for the FMS and MOM6 flags.

- We only test for -I flags when compiling the FMS library, since links
  are not required at compile-time.

  (NOTE: This may need verification for static builds on Gaea).

- Further separation of C and Fortran flags.

- libnetcdf support is explicitly added to MOM6.  Previously it was not
  tested and linked.   This is in preparation for FMS 2020.04 support.
+Add option to fix z-file layer initialization bug
The --cflags/--fflags arguments of nc-config/nf-config can be volatile,
since they generally represent library install-time flags, so we instead
replace them with --includedir/--libdir flags, which explicitly denote
the installation paths.

The only real issue here is that nf-config does not have a --libdir
flag, so we use $(nf-config --prefix)/lib and hope that this is where
it's installed.
The verification tests in .testing are updated to run on FMS 2020.04.

Also, several documentation outputs in .gitignore were moved to
docs/.gitignore, as well as some older files and directories that were
interfering with content in ac/deps.
Eliminate unneeded variables in diabatic_driver
Update CPT fork of MOM6 to latest (12/10/2020) from NOAA-GFDL
Doxygen was not assigning some docstrings for multiline variable
declarations, so this patch splits those variables to one per line, with
updated docstrings.

Whitespace was also condensed in several of the declarations.
Reduction in line length of any lines exceeding 120 characters.
Hallberg-NOAA and others added 16 commits February 13, 2021 09:03
  Added the overloaded interface rescale_comp_data to MOM_domains_infra to
rescale the values in the computational domain of a 2-d, 3-d, or 4-d array by
some factor without having to know the index convention that those arrays used.
Also simplified some of the code in MOM_io_infra by making use of
rescale_comp_data, and added a new optional scale argument to the various
MOM_write_field routines.  All answers are bitwise identical, but there are new
interfaces and optional arguments for existing routines.
  Use the new scale argument to MOM_write_field to simplify write_vertgrid_file
and write_ocean_geometry_file.  All output and answers are bitwise identical.
  Added and used the file_type as the handle for input and output, changing from
using an integer.  This changes the type of one of the required arguments to
write_field, write_MOM_field, create_file, reopen_file, get_file_info,
get_file_times, get_file_fields, write_metadata_axis and write_metadata_field,
and added new variants of open_file, close_file and flush_file using this new
type.  Also added the new routine file_is_open.  All answers are bitwise
identical, but there are changes to multiple I/O interfaces.
  Added the new optional scale argument to the real versions of the
read_variable routines.  All answers are bitwise identical, but there are
new optional arguments to public routines.
  Revised the depth list type used in MOM_sum_output to accommodate I/O using
ordinary routines, and to make the code creating, reading and writing it
potentially separable from the MOM_sum_output module by avoiding the use of the
MOM_sum_output control structure in most of the routines.  Also changed the
index 'l' to 'li' in some places to avoid having it misread as '1'.  All answers
are bitwise identical but there are changes in some subroutine arguments.
Fixing an indexing error in MOM_barotropic
MOM6: +I/O interface changes, including a new file_type
	- this addresses a bug in the apply_ALE_sponge routine which
  	had been passing zero values to the remapping routine for the
	target grid thicknesses.
…ate-2021-02-19

Dev gfdl main candidate 2021-02-19
…update-to-GFDL-20210224

this is corresponding to GFDL 20210224 main branch commit (hash # 00c2819)
@jiandewang
Copy link
Collaborator Author

upload hera run log
hera-log.pdf

@jiandewang
Copy link
Collaborator Author

upload orion run log
log-orion.pdf

@jiandewang
Copy link
Collaborator Author

upload dell-p3 log
log-dell-p3.pdf

@DeniseWorthen
Copy link
Collaborator

DeniseWorthen commented Feb 26, 2021

@jiandewang We need to have these logs posted to the ufs-weather-model repo when it comes time for you to make the commit to ufs-weather and mom6 (at the same time). The need to be committed as .log files to the repo.

So once you begin your commit to ufs-weather and post all the logs to ufs-weather, then we can approve the PR to the MOM6 repo; you'll then make a change in your ufs-weather branch to point to the new MOM6 develop. The ufs-weather PR will then get merged. But all the testing needs to show in the ufs-weather PR.

@jiandewang
Copy link
Collaborator Author

@DeniseWorthen: understood, thanks.

Copy link
Collaborator

@DeniseWorthen DeniseWorthen left a comment

Choose a reason for hiding this comment

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

Approved

@jiandewang
Copy link
Collaborator Author

all RT in ufs-weather-model are done.

@jiandewang jiandewang merged commit 00cb11c into NOAA-EMC:dev/emc Mar 4, 2021
jiandewang pushed a commit to jiandewang/MOM6 that referenced this pull request Jun 17, 2021
Merge in latest dev/gfdl updates
@jiandewang jiandewang deleted the feature/update-to-GFDL-20210224 branch February 28, 2023 03:53
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.