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

Adding Data Atmosphere from S2S to mainline gcm #668

Merged
merged 17 commits into from
Jan 7, 2025

Conversation

sshakoor1
Copy link
Contributor

@sshakoor1 sshakoor1 commented Dec 11, 2024

The purpose of this PR is add add a new question to gcm_setup for data atmosphere when running coupled. This originates from GEOS-S2S-3(GEOS-ESM/GEOS-S2S-3#15), and as per request of @mfmehari it is being added to the main gcm.


ETA by @mathomp4: I've put a blocking label on this due to the issue with ExtData mentioned below.

@sshakoor1 sshakoor1 self-assigned this Dec 11, 2024
@sshakoor1 sshakoor1 requested a review from mfmehari December 11, 2024 19:05
@sshakoor1 sshakoor1 added the enhancement New feature or request label Dec 11, 2024
@sshakoor1 sshakoor1 requested a review from mathomp4 December 11, 2024 19:06
gcm_setup Outdated Show resolved Hide resolved
@mathomp4 mathomp4 added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Dec 12, 2024
linkbcs.tmpl Outdated Show resolved Hide resolved
@mathomp4 mathomp4 added the Contingent - DNA Do Not Approve (DNA). These changes are contingent on other PRs label Dec 12, 2024
Copy link
Contributor

@zhaobin74 zhaobin74 left a comment

Choose a reason for hiding this comment

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

This should be
@COUPLED/bin/ln -sf $BOUNDARY_DIR/bcs_shared/make_bcs_inputs/oceanice/* ExtData

Linking current and future forcing datasets.
@mfmehari
Copy link
Contributor

This should be @COUPLED/bin/ln -sf $BOUNDARY_DIR/bcs_shared/make_bcs_inputs/oceanice/* ExtData

@zhaobin74 done!

linkbcs.tmpl Outdated Show resolved Hide resolved
@mathomp4 mathomp4 requested a review from zhaobin74 December 12, 2024 17:08
zhaobin74
zhaobin74 previously approved these changes Dec 12, 2024
Copy link
Contributor

@zhaobin74 zhaobin74 left a comment

Choose a reason for hiding this comment

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

all good. thanks.

@biljanaorescanin
Copy link
Contributor

Did anyone run a test?
fyi I've added readme Bin gave me to dataatm path.
/discover/nobackup/projects/gmao/bcs_shared/make_bcs_inputs/ocean/dataatm

@mfmehari
Copy link
Contributor

Did anyone run a test? fyi I've added readme Bin gave me to dataatm path. /discover/nobackup/projects/gmao/bcs_shared/make_bcs_inputs/ocean/dataatm

@biljanaorescanin in the processes of testing it.

@mathomp4
Copy link
Member

Note: The CI failures are because of the new question. Once @mfmehari says it works, then I can try figuring out how to get my scripts to work.

@mfmehari
Copy link
Contributor

Did anyone run a test? fyi I've added readme Bin gave me to dataatm path. /discover/nobackup/projects/gmao/bcs_shared/make_bcs_inputs/ocean/dataatm

@biljanaorescanin in the processes of testing it.

@biljanaorescanin the new location/directory path for JRA55-DO works.

mfmehari
mfmehari previously approved these changes Dec 13, 2024
@mathomp4 mathomp4 removed the Contingent - DNA Do Not Approve (DNA). These changes are contingent on other PRs label Dec 14, 2024
@mathomp4 mathomp4 marked this pull request as ready for review December 19, 2024 13:17
@mathomp4 mathomp4 requested a review from a team as a code owner December 19, 2024 13:17
@mfmehari
Copy link
Contributor

mfmehari commented Jan 3, 2025

@mathomp4 @sshakoor1 @sdrabenh Thank you all!

@mathomp4
Copy link
Member

mathomp4 commented Jan 6, 2025

After talking with @sdrabenh I've changed:

  • @ACTUAL_ATM4OCN@MODELATM
  • @USE_DATA_ATM4OCN@DATAATM

I've also talked with @mfmehari and he'll check to make sure the data atm side of this is still working.

@mfmehari
Copy link
Contributor

mfmehari commented Jan 6, 2025

After talking with @sdrabenh I've changed:

  • @ACTUAL_ATM4OCN@MODELATM
  • @USE_DATA_ATM4OCN@DATAATM

I've also talked with @mfmehari and he'll check to make sure the data atm side of this is still working.

@mathomp4 @sdrabenh I think we need to keep USE_DATA_ATM4OCN ... previously it was DATAATM but after some discussions it was decided to change it to USE_DATA_ATM4OCN

@mathomp4
Copy link
Member

mathomp4 commented Jan 6, 2025

After talking with @sdrabenh I've changed:

  • @ACTUAL_ATM4OCN@MODELATM
  • @USE_DATA_ATM4OCN@DATAATM

I've also talked with @mfmehari and he'll check to make sure the data atm side of this is still working.

@mathomp4 @sdrabenh I think we need to keep USE_DATA_ATM4OCN ... previously it was DATAATM but after some discussions it was decided to change it to USE_DATA_ATM4OCN

Okay. I'll re-revert that.

@mathomp4
Copy link
Member

mathomp4 commented Jan 6, 2025

@mfmehari Can you take a look now?

@mfmehari
Copy link
Contributor

mfmehari commented Jan 7, 2025

@mfmehari Can you take a look now?

@mathomp4 DataAtm is working.

@sdrabenh sdrabenh merged commit 9a23a6a into develop Jan 7, 2025
10 checks passed
@sdrabenh sdrabenh deleted the feature/sshakoor/dataatm branch January 7, 2025 21:43
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. enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants