ifs-source sync #8
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…e subgrid blocking counter because the full line will be delt with right after
…e subgrid blocking counter because the full line will be delt with right after
… updated namelists
…api is in ifs-source/contrib
|
|
awnawab
force-pushed
the
naan-ifs-source-sync
branch
from
b97b16f to
3f77924
Compare
|
@ioanhadade and @jrbidlot could you please sign the CLA? This PR contains commits contributed by both of you. @jrbidlot as most of the commits included herein are yours, could you also please review the PR? Thanks! |
wdeconinck
requested changes
Jan 8, 2024
CMakeLists.txt
Outdated
| set(ECWAM_STANDALONE 0) | ||
| ecbuild_find_package( ecflow_light REQUIRED ) | ||
| endif() | ||
|
|
There was a problem hiding this comment.
This could be replaced with
ecbuild_add_option( FEATURE ECFLOW
DESCRIPTION "ecflow meter updates"
REQUIRED_PACKAGES )
It is then not an absolutely required package unless requested via "-DENABLE_ECFLOW=ON" or in the bundle.yml.
This then does not bind this feature to a package or bundle name.
src/ecwam/CMakeLists.txt
Outdated
| @@ -414,7 +423,7 @@ endif() | |||
| ecbuild_add_library( | |||
| TARGET ${ecwam} | |||
| SOURCES ${ecwam_srcs} | |||
| PUBLIC_LIBS fiat parkind_${prec} ${ecwam}_intfb | |||
| PUBLIC_LIBS fiat parkind_${prec} $<$<NOT:${ECWAM_STANDALONE}>:ecflow_lightf> ${ecwam}_intfb | |||
There was a problem hiding this comment.
Suggested change
| PUBLIC_LIBS fiat parkind_${prec} $<$<NOT:${ECWAM_STANDALONE}>:ecflow_lightf> ${ecwam}_intfb | |
| PUBLIC_LIBS fiat parkind_${prec} $<${HAVE_ECFLOW}:ecflow_lightf> ${ecwam}_intfb |
src/ecwam/CMakeLists.txt
Outdated
| @@ -423,7 +432,7 @@ ecbuild_add_library( | |||
| field_api_${prec} | |||
| PUBLIC_INCLUDES $<INSTALL_INTERFACE:include> | |||
| PRIVATE_INCLUDES ${${PNAME}_OCEANMODEL_INCLUDE_DIRS} | |||
| PUBLIC_DEFINITIONS ${ECWAM_DEFINITIONS} | |||
| PUBLIC_DEFINITIONS ${ECWAM_DEFINITIONS} $<${ECWAM_STANDALONE}:_ECWAM_STANDALONE> | |||
There was a problem hiding this comment.
Can the logic of _ECWAM_STANDALONE be changed to PRIVATELY define variable WAM_HAVE_ECFLOW
and use that within the code?
This is consistent with other preprocessor definitions.
|
done
…________________________________
From: Ahmad Nawab ***@***.***>
Sent: 29 December 2023 10:21
To: ecmwf-ifs/ecwam ***@***.***>
Cc: Ioan Hadade ***@***.***>; Mention ***@***.***>
Subject: Re: [ecmwf-ifs/ecwam] ifs-source sync (PR #8)
@ioanhadade<https://github.com/ioanhadade> and @jrbidlot<https://github.com/jrbidlot> could you please sign the CLA? This PR contains commits contributed by both of you. @jrbidlot<https://github.com/jrbidlot> as most of the commits included herein are yours, could you also please review the PR? Thanks!
—
Reply to this email directly, view it on GitHub<#8 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AI7K3UTJ5GNZAXXAGV2MVX3YL2DS7AVCNFSM6AAAAABBF5XTEGVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTQNZRHA3DQNZSHE>.
You are receiving this because you were mentioned.Message ID: ***@***.***>
|
awnawab
force-pushed
the
naan-ifs-source-sync
branch
from
f0295f5 to
b326f5a
Compare
wdeconinck
approved these changes
Jan 9, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is one part of a two-way sync between ifs-source contrib/ecwam and the standalone repo. The corresponding ifs-source branch is:
https://git.ecmwf.int/users/naan/repos/ifs-source/commits?until=refs%2Fheads%2Fnaan_CY49R1_ecwam_sync.IFS-3196
The code herein is string-identical to the ifs-source branch, which has bit-identical results in both double and single precision to the CY49R1 CI forecast experiment.
The PR comprises mostly of the scientific changes for CY49. The validation hashes for all the test cases have been updated accordingly. Some technical changes are also included: