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.

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

Jump to bottom

update the mixedmode branch to main #1153

Merged
merged 18 commits into from
Mar 15, 2023
Merged

update the mixedmode branch to main #1153

merged 18 commits into from
Mar 15, 2023

Conversation

mlee03
Copy link
Contributor

@mlee03 mlee03 commented Mar 10, 2023

Description
This PR brings in changes from the main branch,

  • diag_manager
  • string_utils
  • tridiagonal

to the mixedmode branch

Fixes # (issue)

How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Please also note
any relevant details for your test configuration (e.g. compiler, OS). Include
enough information so someone can reproduce your tests.

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules
  • New check tests, if applicable, are included
  • make distcheck passes

J-Lentz and others added 15 commits February 1, 2023 08:28
@J-Lentz
fix: misspellings and rename variable in yaml_parser.F90 (NOAA-GFDL#1127
485d631 
)
@mlee03
fix: module and local variable name conflicts in time_interp (NOAA-GF…
35a5f2a 
…DL#1125)

Co-authored-by: mlee03 <Mikyung.Lee@lscamd50-d.gfdl.noaa.gov>
@J-Lentz
docs: Correct instructions to build without MPI (NOAA-GFDL#1128)
ba9c712
@ganganoaa
fix: pointer to allocatable in amip_interp_type (NOAA-GFDL#1106)
15df841
@rem1776
feat: log_diag_field_info updates from diag rewrite (NOAA-GFDL#1117)
f0e8cab
@uramirez8707
fix: remove implied save for valid_types variables in sat_vapor_pres_k (
ec2020a 
NOAA-GFDL#1120)
@rem1776
revert: log_diag_field_info argument changes (NOAA-GFDL#1136)
4526cc9 
Co-authored-by: rem1776 <Ryan.Mulhall@noaa.gov>
@ngs333
feat: refactored send_data math (field buffer update) functions. (NOA…
6255971 
…A-GFDL#1131)
@ngs333
fix: adds tags to nested do loops in fms_diag_fieldbuff.fh to fix his…
74d8e73 
…tory file issues (NOAA-GFDL#1139)
@nikizadehgfdl
fix - gnu and pgi issue with class(*) in send_data3d (NOAA-GFDL#1149)
9b83c8c
@J-Lentz
feat: extend string interface in fms_string_utils_mod (NOAA-GFDL#…
9339b88 
…1142)
@ganganoaa
fix: add omp directives for race condition in tridiagonal (NOAA-GFDL#…
0ff254e 
…1109)
update to main
da9da5f
bring changes to inc files
820c710
resolve merge conflicts in cmake
b57b4a1
@mlee03 mlee03 requested review from J-Lentz and mcallic2 March 10, 2023 18:10
@rem1776 rem1776 merged commit 24760ee into NOAA-GFDL:mixedmode Mar 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rem1776 rem1776 rem1776 approved these changes

@thomas-robinson thomas-robinson Awaiting requested review from thomas-robinson

@bensonr bensonr Awaiting requested review from bensonr

@J-Lentz J-Lentz Awaiting requested review from J-Lentz

@mcallic2 mcallic2 Awaiting requested review from mcallic2

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@mlee03 @rem1776 @J-Lentz @ganganoaa @uramirez8707 @ngs333 @nikizadehgfdl