Skip to content

Feature/soca remove cdate#252

Merged
guillaumevernieres merged 6 commits into
developfrom
feature/soca-remove-cdate
Dec 21, 2022
Merged

Feature/soca remove cdate#252
guillaumevernieres merged 6 commits into
developfrom
feature/soca-remove-cdate

Conversation

@AndrewEichmann-NOAA
Copy link
Copy Markdown
Collaborator

@AndrewEichmann-NOAA AndrewEichmann-NOAA commented Dec 16, 2022

Removes references to CDATE as non-local variable; in a couple of instances it is assigned locally to ${PDY}${cyc}. Addresses issue #237

Tested with ctests+ in build/test (ie, not just for soca)

Depends on the merging of global-workflow PR NOAA-EMC/global-workflow#1191 to work for g-w, but should work for soca alone

Files changed:
parm/soca/obs/config/adt_j3.yaml
parm/soca/obs/config/icec_emc.yaml
parm/soca/obs/config/salt_profile_fnmoc.yaml
parm/soca/obs/config/sss_smap.yaml
parm/soca/obs/config/sst_noaa19_l3u.yaml
parm/soca/obs/config/sst_noaa19_l3u_so025.yaml
scripts/exgdas_global_marine_analysis_prep.py
test/soca/gw/config.base
test/soca/gw/runtime_vars.sh
test/soca/runtime_vars.sh
ush/ufsda/misc_utils.py

@AndrewEichmann-NOAA AndrewEichmann-NOAA added hera-RT Queue for automated testing on Hera orion-RT Queue for automated testing on Orion labels Dec 16, 2022
Comment thread scripts/exgdas_global_marine_analysis_prep.py Outdated
Comment thread test/soca/gw/config.base
Comment thread test/soca/runtime_vars.sh Outdated
@emcbot emcbot added hera-RT-Running Automated testing running on Hera orion-RT-Running Automated testing running on Orion and removed hera-RT Queue for automated testing on Hera orion-RT Queue for automated testing on Orion labels Dec 16, 2022
@guillaumevernieres
Copy link
Copy Markdown
Contributor

@AndrewEichmann-NOAA , the CI won't work until your gw PR is merged.

@emcbot
Copy link
Copy Markdown

emcbot commented Dec 16, 2022

Automated GDASApp Testing Results:
Machine: hera

Start: Fri Dec 16 21:45:18 UTC 2022 on hfe10
---------------------------------------------------
Build:                                 *SUCCESS*
Build: Completed at Fri Dec 16 22:26:57 UTC 2022
---------------------------------------------------
Tests:                                 *SUCCESS*
Tests: Completed at Fri Dec 16 22:28:58 UTC 2022
Tests: 100% tests passed, 0 tests failed out of 27

@emcbot emcbot added hera-RT-Passed Automated testing successful on Hera and removed hera-RT-Running Automated testing running on Hera labels Dec 16, 2022
@emcbot
Copy link
Copy Markdown

emcbot commented Dec 16, 2022

Automated GDASApp Testing Results:
Machine: orion

Start: Fri Dec 16 15:47:22 CST 2022 on Orion-login-1.HPC.MsState.Edu
---------------------------------------------------
Build:                                 *SUCCESS*
Build: Completed at Fri Dec 16 16:44:55 CST 2022
---------------------------------------------------
Tests:                                 *SUCCESS*
Tests: Completed at Fri Dec 16 16:58:05 CST 2022
Tests: 100% tests passed, 0 tests failed out of 27

@emcbot emcbot added orion-RT-Passed Automated testing successful on Orion and removed orion-RT-Running Automated testing running on Orion labels Dec 16, 2022
Copy link
Copy Markdown
Contributor

@guillaumevernieres guillaumevernieres left a comment

Choose a reason for hiding this comment

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

The CI worked @AndrewEichmann-NOAA but you need to address @CoryMartin-NOAA 's comment about the missing $RUN as a prefix. Looks good otherwise.

@guillaumevernieres
Copy link
Copy Markdown
Contributor

I'm taking the liberty to push to your branch @AndrewEichmann-NOAA ... Needs a few minor updates.

@guillaumevernieres guillaumevernieres added hera-GW-RT Queue for automated testing with global-workflow on Hera orion-GW-RT Queue for automated testing with global-workflow on Orion labels Dec 20, 2022
Copy link
Copy Markdown
Contributor

@RussTreadon-NOAA RussTreadon-NOAA left a comment

Choose a reason for hiding this comment

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

Changes look straightforward. Approve pending successful GW-RT on Hera and Orion.

@emcbot emcbot added hera-GW-RT-Running Automated testing with global-workflow running on Hera orion-GW-RT-Running Automated testing with global-workflow running on Orion and removed hera-GW-RT Queue for automated testing with global-workflow on Hera orion-GW-RT Queue for automated testing with global-workflow on Orion labels Dec 20, 2022
@emcbot
Copy link
Copy Markdown

emcbot commented Dec 20, 2022

Automated Global-Workflow GDASApp Testing Results:
Machine: hera

Start: Tue Dec 20 18:04:08 UTC 2022 on hfe07
---------------------------------------------------
Build:                                 *SUCCESS*
Build: Completed at Tue Dec 20 19:00:59 UTC 2022
---------------------------------------------------
Tests:                                 *SUCCESS*
Tests: Completed at Tue Dec 20 19:09:10 UTC 2022
Tests: 100% tests passed, 0 tests failed out of 35

@emcbot emcbot added hera-GW-RT-Passed Automated testing with global-workflow successful on Hera and removed hera-GW-RT-Running Automated testing with global-workflow running on Hera labels Dec 20, 2022
@emcbot
Copy link
Copy Markdown

emcbot commented Dec 20, 2022

Automated Global-Workflow GDASApp Testing Results:
Machine: orion

Start: Tue Dec 20 12:03:13 CST 2022 on Orion-login-1.HPC.MsState.Edu
---------------------------------------------------
Build:                                 *SUCCESS*
Build: Completed at Tue Dec 20 13:16:37 CST 2022
---------------------------------------------------
Tests:                                 *SUCCESS*
Tests: Completed at Tue Dec 20 13:32:38 CST 2022
Tests: 100% tests passed, 0 tests failed out of 35

@emcbot emcbot added orion-GW-RT-Passed Automated testing with global-workflow successful on Orion and removed orion-GW-RT-Running Automated testing with global-workflow running on Orion labels Dec 20, 2022
@guillaumevernieres guillaumevernieres merged commit 70e3acc into develop Dec 21, 2022
@AndrewEichmann-NOAA
Copy link
Copy Markdown
Collaborator Author

AndrewEichmann-NOAA commented Dec 21, 2022

For clarification, is this the comment in NOAA-EMC/global-workflow#1191 that needs to be addressed?

CoryMartin-NOAA (NOAA-EMC/global-workflow#1191 (comment))
I think @aerorahul wants instead this to be ${RUN}ocnanal_${cyc} per a conversation he and I had yesterday afternoon

Member
@aerorahul aerorahul (NOAA-EMC/global-workflow#1191 (comment))
Yes. Thanks @CoryMartin-NOAA.
${PDY} is not available at this time, so the issue is correct on that, that ${CDATE} should become ${cyc}.

I also realized yesterday, that our run directories will get clobbered when gdas and gfs cycles start. To distinguish between those, it is best to prepend ocnanal with a ${RUN}.

${RUN} is set upstream of the job in the ecflow/rocoto job-card. EMC internally translates that to ${CDUMP}, which is also not available at this point in the j-job.

@guillaumevernieres
Copy link
Copy Markdown
Contributor

I forgot if I added RUN yesterday @AndrewEichmann-NOAA , you might need to issue a bugfix.

@aerorahul
Copy link
Copy Markdown
Contributor

aerorahul commented Dec 21, 2022

@AndrewEichmann-NOAA @guillaumevernieres
I don't think so. This was merged yesterday and it looks right in develop.

export DATA=${DATA:-${DATAROOT}/${RUN}ocnanal_${cyc}}

I think the comment has been addressed. Thank you for doing so.

@AndrewEichmann-NOAA AndrewEichmann-NOAA deleted the feature/soca-remove-cdate branch December 22, 2022 20:24
DavidNew-NOAA pushed a commit that referenced this pull request Jan 16, 2026
* removing CDATE as non-local variable

* CDATE removed from actively tested yamls

* removed pdy, pygw path

Co-authored-by: Cory Martin <cory.r.martin@noaa.gov>
Co-authored-by: Guillaume Vernieres <guillaume.vernieres@noaa.gov>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hera-GW-RT-Passed Automated testing with global-workflow successful on Hera hera-RT-Passed Automated testing successful on Hera orion-GW-RT-Passed Automated testing with global-workflow successful on Orion orion-RT-Passed Automated testing successful on Orion

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants