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

Updates to GDASapp to account for new JCB policies #1144

Merged
merged 23 commits into from
Jun 20, 2024

Conversation

danholdaway
Copy link
Contributor

@danholdaway danholdaway commented Jun 4, 2024

  • Renaming of atmosphere YAMLS and keys.
  • Add marine YAML files to JCB
  • Add creation of 3DVarFGAT YAML for marine using JCB (not used yet but YAML matched exactly).

Once approved I will merge the JCB PRs and then we can merge this after updating the hashes.

A G-W PR will follow the approval and merge of this PR.

G-W branch required for testing: https://github.com/danholdaway/global-workflow/tree/feature/rename_atm

* origin/develop:
  Update wcoss2.intel.lua (#1142)
  Add yaml file for prepobsaero task (#1141)
  Diffusion parameter yaml template (#1140)
  Adjust absolute float tolerance for variational and ensemble DA jjob tests (#1136)
  Insitu temp and salt (#1135)
  Adds letkf.yaml(.j2)  (#1134)
  Add optional testing block to 3dvar and lgetkf input YAMLs for jjobs (#1129)
  updates to build and run some ctests on WCOSS2 (#1122)
  Addin a GFSv17 ctest (#1130)
  Feature/rtofs in situ (#1110)
  update jcb-gdas hash to bring in satwnd yaml changes (#1128)
  Optionally run specified rocoto task as part of the ctests  (#1121)
  Add build capability to Gaea-C5 (#1101)
  Python Converter and Json for the ADPUPA BUFR DUMP (#1115)
  Revert "Fix ice water FV3 increment variable name and add a few more … (#1125)
  Satwnd and variable name-convention updates for jcb implementation in GDASApp (#1119)
  Add inverse distance weighting option to superob function (#1116)
  Resume the Marine Vrfy Task on ctests (#1107)
  Replicate the creation of the gw-ci cycling test (#1114)
  Added YAML, JSON, python files for assimilating LEOGEO satwinds (#1099)
  Add an OOPS-based application to recenter snow analysis (#1102)
  Fix ice water FV3 increment variable name and add a few more (#1112)
  Update hera.intel.lua (#1109)
@RussTreadon-NOAA
Copy link
Contributor

RussTreadon-NOAA commented Jun 4, 2024

Orion test
Install feature/rename_atm at 2ec1767 inside g-w devleop at c44d0ac8. Initial run of test_gdasapp yielded the following ctest failures

64% tests passed, 17 tests failed out of 47

Label Time Summary:
gdas-utils    =   4.10 sec*proc (9 tests)
script        =   4.10 sec*proc (9 tests)

Total Test time (real) = 1370.19 sec

The following tests FAILED:
        1756 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP (Failed)
        1757 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT (Failed)
        1758 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN (Failed)
        1761 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_CHKPT (Failed)
        1762 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_POST (Failed)
        1763 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY (Failed)
        1764 - test_gdasapp_soca_socahybridweights (Failed)
        1765 - test_gdasapp_soca_incr_handler (Failed)
        1766 - test_gdasapp_soca_ens_handler (Failed)
        1775 - test_gdasapp_atm_jjob_var_init (Failed)
        1776 - test_gdasapp_atm_jjob_var_run (Failed)
        1777 - test_gdasapp_atm_jjob_var_inc (Failed)
        1778 - test_gdasapp_atm_jjob_var_final (Failed)
        1779 - test_gdasapp_atm_jjob_ens_init (Failed)
        1780 - test_gdasapp_atm_jjob_ens_run (Failed)
        1781 - test_gdasapp_atm_jjob_ens_inc (Failed)
        1782 - test_gdasapp_atm_jjob_ens_final (Failed)

Need to update g-w sorc/jcb to be consistent with jcb-algorithms and jcb-gdas used in sorc/gdas.cd/parm. Update working copy of sorc/jcb to jcb branch feature/rename_atm at d167c6c. Rerun test_gdasapp. More ctests pass. Failures are limited to soca tests

81% tests passed, 9 tests failed out of 47

Label Time Summary:
gdas-utils    =   4.66 sec*proc (9 tests)
script        =   4.66 sec*proc (9 tests)

Total Test time (real) = 1787.51 sec

The following tests FAILED:
        1756 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP (Failed)
        1757 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT (Failed)
        1758 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN (Failed)
        1761 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_CHKPT (Failed)
        1762 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_POST (Failed)
        1763 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY (Failed)
        1764 - test_gdasapp_soca_socahybridweights (Failed)
        1765 - test_gdasapp_soca_incr_handler (Failed)
        1766 - test_gdasapp_soca_ens_handler (Failed)

Some of these failures may flip to Passed if the initial test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP failure is resolved.

Took a peek at /work2/noaa/da/rtreadon/git/global-workflow/rename_atm/sorc/gdas.cd/build/gdas/test/soca/gw/testrun/JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP.out.

The traceback flagged gdas.t12z.insitu_surface_trkob.2018041512.nc4 as a missing file. This, however, may not be the cause of the failure. The traceback ends with

  File "/work2/noaa/da/rtreadon/git/global-workflow/rename_atm/parm/gdas/jcb-algorithms/3dfgat.yaml.j2", line 45, in top-level template code
    {% include observation_from_jcb + '.yaml.j2' %}
  File "/work2/noaa/da/python/opt/core/miniconda3/4.6.14/envs/gdasapp/lib/python3.7/site-packages/jinja2/loaders.py", line 218, in get_source
    raise TemplateNotFound(template)
jinja2.exceptions.TemplateNotFound: insitu_profile_bathy.yaml.j2
+ JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP[1]: postamble JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP 1717527206 1

* develop:
  Update wcoss2.intel.lua (#1142)
  Add yaml file for prepobsaero task (#1141)
  Diffusion parameter yaml template (#1140)
  Adjust absolute float tolerance for variational and ensemble DA jjob tests (#1136)
  Insitu temp and salt (#1135)
  Adds letkf.yaml(.j2)  (#1134)
  Add optional testing block to 3dvar and lgetkf input YAMLs for jjobs (#1129)
  updates to build and run some ctests on WCOSS2 (#1122)
  Addin a GFSv17 ctest (#1130)
  Feature/rtofs in situ (#1110)
  update jcb-gdas hash to bring in satwnd yaml changes (#1128)
  Optionally run specified rocoto task as part of the ctests  (#1121)
  Add build capability to Gaea-C5 (#1101)
  Python Converter and Json for the ADPUPA BUFR DUMP (#1115)
  Revert "Fix ice water FV3 increment variable name and add a few more … (#1125)
  Satwnd and variable name-convention updates for jcb implementation in GDASApp (#1119)
  Add inverse distance weighting option to superob function (#1116)
  Resume the Marine Vrfy Task on ctests (#1107)
  Replicate the creation of the gw-ci cycling test (#1114)
  Added YAML, JSON, python files for assimilating LEOGEO satwinds (#1099)
  Add an OOPS-based application to recenter snow analysis (#1102)
  Fix ice water FV3 increment variable name and add a few more (#1112)
  Update hera.intel.lua (#1109)
@danholdaway
Copy link
Contributor Author

Thanks for testing @RussTreadon-NOAA. Passing tests require https://github.com/danholdaway/global-workflow/tree/feature/rename_atm branch of global-workflow. You should be able to switch branch and run the tests again without a rebuild since it's just a change to jcb and config that matters.

@danholdaway
Copy link
Contributor Author

Ah I see you did that. Perhaps the failure is because of more observations added to obs_list without those YAMLs going to JCB as well. Let me check.

* develop:
  Update hera.intel.lua (#1109)
 into feature/rename_atm

* 'feature/rename_atm' of https://github.com/NOAA-EMC/GDASApp:
  Update wcoss2.intel.lua (#1142)
  Add yaml file for prepobsaero task (#1141)
  Diffusion parameter yaml template (#1140)
  Adjust absolute float tolerance for variational and ensemble DA jjob tests (#1136)
  Insitu temp and salt (#1135)
  Adds letkf.yaml(.j2)  (#1134)
  Add optional testing block to 3dvar and lgetkf input YAMLs for jjobs (#1129)
  updates to build and run some ctests on WCOSS2 (#1122)
  Addin a GFSv17 ctest (#1130)
  Feature/rtofs in situ (#1110)
  update jcb-gdas hash to bring in satwnd yaml changes (#1128)
  Optionally run specified rocoto task as part of the ctests  (#1121)
  Add build capability to Gaea-C5 (#1101)
  Python Converter and Json for the ADPUPA BUFR DUMP (#1115)
  Revert "Fix ice water FV3 increment variable name and add a few more … (#1125)
  Satwnd and variable name-convention updates for jcb implementation in GDASApp (#1119)
  Add inverse distance weighting option to superob function (#1116)
  Resume the Marine Vrfy Task on ctests (#1107)
  Replicate the creation of the gw-ci cycling test (#1114)
  Added YAML, JSON, python files for assimilating LEOGEO satwinds (#1099)
  Add an OOPS-based application to recenter snow analysis (#1102)
  Fix ice water FV3 increment variable name and add a few more (#1112)
@danholdaway
Copy link
Contributor Author

@RussTreadon-NOAA I fixed that failure by adding the insitu YAML files to JCB. There should be zero downstream impact on the other tests, which should all pass again.

@danholdaway danholdaway 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 Jun 6, 2024
@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 Jun 6, 2024
@emcbot
Copy link

emcbot commented Jun 6, 2024

Automated Global-Workflow GDASApp Testing Results:
Machine: orion

Start: Thu Jun  6 13:20:48 CDT 2024 on Orion-login-1.HPC.MsState.Edu
---------------------------------------------------
Build:                                 *SUCCESS*
Build: Completed at Thu Jun  6 14:10:32 CDT 2024
---------------------------------------------------
Tests:                                  *Failed*
Tests: Failed at Thu Jun  6 14:25:32 CDT 2024
Tests: 64% tests passed, 17 tests failed out of 47
	1842 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP (Failed)
	1843 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT (Failed)
	1844 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN (Failed)
	1847 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_CHKPT (Failed)
	1848 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_POST (Failed)
	1849 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY (Failed)
	1850 - test_gdasapp_soca_socahybridweights (Failed)
	1851 - test_gdasapp_soca_incr_handler (Failed)
	1852 - test_gdasapp_soca_ens_handler (Failed)
	1861 - test_gdasapp_atm_jjob_var_init (Failed)
	1862 - test_gdasapp_atm_jjob_var_run (Failed)
	1863 - test_gdasapp_atm_jjob_var_inc (Failed)
	1864 - test_gdasapp_atm_jjob_var_final (Failed)
	1865 - test_gdasapp_atm_jjob_ens_init (Failed)
	1866 - test_gdasapp_atm_jjob_ens_run (Failed)
	1867 - test_gdasapp_atm_jjob_ens_inc (Failed)
	1868 - test_gdasapp_atm_jjob_ens_final (Failed)
Tests: see output at /work2/noaa/stmp/cmartin/CI/GDASApp/workflow/PR/1144/global-workflow/sorc/gdas.cd/build/log.ctest

@emcbot emcbot added orion-GW-RT-Failed Automated testing with global-workflow failed on Orion and removed orion-GW-RT-Running Automated testing with global-workflow running on Orion labels Jun 6, 2024
@emcbot emcbot removed the hera-GW-RT Queue for automated testing with global-workflow on Hera label Jun 18, 2024
@emcbot
Copy link

emcbot commented Jun 18, 2024

Automated Global-Workflow GDASApp Testing Results:
Machine: hera

Start: Tue Jun 18 22:05:37 UTC 2024 on hfe04
---------------------------------------------------
Build:                                 *SUCCESS*
Build: Completed at Tue Jun 18 22:48:47 UTC 2024
---------------------------------------------------
Tests:                                  *Failed*
Tests: Failed at Tue Jun 18 23:09:55 UTC 2024
Tests: 67% tests passed, 16 tests failed out of 48
	1843 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_PREP (Failed)
	1844 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_BMAT (Failed)
	1845 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_RUN (Failed)
	1848 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_CHKPT (Failed)
	1849 - test_gdasapp_soca_JGDAS_GLOBAL_OCEAN_ANALYSIS_POST (Failed)
	1850 - test_gdasapp_soca_socahybridweights (Failed)
	1851 - test_gdasapp_soca_incr_handler (Failed)
	1852 - test_gdasapp_soca_ens_handler (Failed)
	1861 - test_gdasapp_atm_jjob_var_init (Failed)
	1862 - test_gdasapp_atm_jjob_var_run (Failed)
	1863 - test_gdasapp_atm_jjob_var_inc (Failed)
	1864 - test_gdasapp_atm_jjob_var_final (Failed)
	1865 - test_gdasapp_atm_jjob_ens_init (Failed)
	1866 - test_gdasapp_atm_jjob_ens_run (Failed)
	1867 - test_gdasapp_atm_jjob_ens_inc (Failed)
	1868 - test_gdasapp_atm_jjob_ens_final (Failed)
Tests: see output at /scratch1/NCEPDEV/da/role.jedipara/CI/GDASApp/workflow/PR/1144/global-workflow/sorc/gdas.cd/build/log.ctest

@emcbot emcbot added hera-GW-RT-Failed Automated testing with global-workflow failed on Hera and removed hera-GW-RT-Running Automated testing with global-workflow running on Hera labels Jun 18, 2024
@RussTreadon-NOAA RussTreadon-NOAA added hera-GW-RT Queue for automated testing with global-workflow on Hera and removed hera-GW-RT-Failed Automated testing with global-workflow failed on Hera labels Jun 18, 2024
@emcbot emcbot added hera-GW-RT-Running Automated testing with global-workflow running on Hera and removed hera-GW-RT Queue for automated testing with global-workflow on Hera labels Jun 18, 2024
@RussTreadon-NOAA RussTreadon-NOAA added hera-GW-RT Queue for automated testing with global-workflow on Hera and removed hera-GW-RT-Running Automated testing with global-workflow running on Hera labels Jun 18, 2024
@emcbot emcbot added hera-GW-RT-Running Automated testing with global-workflow running on Hera and removed hera-GW-RT Queue for automated testing with global-workflow on Hera labels Jun 18, 2024
@RussTreadon-NOAA RussTreadon-NOAA added hera-GW-RT Queue for automated testing with global-workflow on Hera and removed hera-GW-RT-Running Automated testing with global-workflow running on Hera labels Jun 19, 2024
@emcbot emcbot added hera-GW-RT-Running Automated testing with global-workflow running on Hera and removed hera-GW-RT Queue for automated testing with global-workflow on Hera labels Jun 19, 2024
@RussTreadon-NOAA RussTreadon-NOAA added hera-GW-RT Queue for automated testing with global-workflow on Hera and removed hera-GW-RT-Running Automated testing with global-workflow running on Hera labels Jun 19, 2024
@emcbot emcbot added hera-GW-RT-Running Automated testing with global-workflow running on Hera and removed hera-GW-RT Queue for automated testing with global-workflow on Hera labels Jun 19, 2024
@emcbot
Copy link

emcbot commented Jun 19, 2024

Automated Global-Workflow GDASApp Testing Results:
Machine: hera

Start: Wed Jun 19 00:38:56 UTC 2024 on hfe04
---------------------------------------------------
Build:                                 *SUCCESS*
Build: Completed at Wed Jun 19 01:24:03 UTC 2024
---------------------------------------------------
Tests:                                 *SUCCESS*
Tests: Completed at Wed Jun 19 01:49:26 UTC 2024
Tests: 100% tests passed, 0 tests failed out of 48

@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 Jun 19, 2024
Copy link
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.

Both GDASApp ctests and g-w C96C48_ufs_hybatmDA CI run on various platforms. Results are acceptable.

Approve.

@RussTreadon-NOAA
Copy link
Contributor

@CoryMartin-NOAA, @guillaumevernieres, and @DavidNew-NOAA - the changes in this PR have been tested via g-w PR #2700 with acceptable results. I'd like to merge this PR in GDASApp develop. Any objections?

@danholdaway has three JCB PRs related to GDASApp PR #1144 (this PR):

Each of the jcb PRs have been approved by Cory, David, and Russ. These jcb PRs should also be merged into their respective develop. Are we OK with doing so?

@DavidNew-NOAA
Copy link
Collaborator

@RussTreadon-NOAA No objection here

@RussTreadon-NOAA RussTreadon-NOAA merged commit 32c23cb into develop Jun 20, 2024
45 checks passed
@RussTreadon-NOAA RussTreadon-NOAA deleted the feature/rename_atm branch June 20, 2024 17:06
@RussTreadon-NOAA RussTreadon-NOAA restored the feature/rename_atm branch June 21, 2024 14:19
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants