Skip to content

Merge v11 into v12#378

Merged
sdrabenh merged 56 commits into
feature/sdrabenh/gcm_v12from
feature/sdrabenh/dev_into_v12_20250424
Apr 25, 2025
Merged

Merge v11 into v12#378
sdrabenh merged 56 commits into
feature/sdrabenh/gcm_v12from
feature/sdrabenh/dev_into_v12_20250424

Conversation

@mathomp4
Copy link
Copy Markdown
Member

No description provided.

rtodling and others added 30 commits March 18, 2024 15:35
Co-authored-by: Matt Thompson <matthew.thompson@nasa.gov>
* update g5_modules_perl_wrapper script to remove loadmodules option from call to g5_modules

* Modified the expand function in Perl_Config.pm so that environment variables will be correctly expanded in the string if the variables are defined.

---------

Co-authored-by: rtodling <ricardo.todling@nasa.gov>
…The right brace now needs to be escaped similar to the left brace.
rtodling and others added 22 commits March 13, 2025 12:32
* corrected left/right brace error with perl on SLES-15
* use cmp command to compare files if cdo command fails
* add nc4 files to list of files excluded with the -binX flag
* pause instead of immediately showing menu after displaying diff text differences
vectorize helfsurface() and related subroutines
# Conflicts:
#	.gitignore
#	CHANGELOG.md
#	GMAO_etc/vED
#	GMAO_perllib/CMakeLists.txt
#	GMAO_pyobs/VegType_io.c
@mathomp4 mathomp4 added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Apr 25, 2025
@mathomp4 mathomp4 self-assigned this Apr 25, 2025
@mathomp4 mathomp4 requested review from a team as code owners April 25, 2025 18:16
@mathomp4 mathomp4 requested a review from sdrabenh April 25, 2025 18:18
@sdrabenh sdrabenh merged commit 487ffb8 into feature/sdrabenh/gcm_v12 Apr 25, 2025
8 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0 diff The changes in this pull request have verified to be zero-diff with the target branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants