Skip to content

Add diffusion/diag B for aerosol DA and some other needed changes#2738

Merged
WalterKolczynski-NOAA merged 106 commits into
NOAA-EMC:developfrom
CoryMartin-NOAA:feature/aero-b
Aug 29, 2024
Merged

Add diffusion/diag B for aerosol DA and some other needed changes#2738
WalterKolczynski-NOAA merged 106 commits into
NOAA-EMC:developfrom
CoryMartin-NOAA:feature/aero-b

Conversation

@CoryMartin-NOAA
Copy link
Copy Markdown
Contributor

@CoryMartin-NOAA CoryMartin-NOAA commented Jun 28, 2024

Description

This PR adds in support for computing files needed for the aerosol analysis B. This includes a new task, aeroanlgenb. This work was performed by both me and @andytangborn

Resolves #2501
Resolves #2737

Please note, I am still using python to create dictionaries for FileHandler. This will not be resolved in this PR but a future PR, an issue #2737 has been created to make note of this.
EDIT: this PR has been added to such that the above is no longer true

Type of change

  • New feature (adds functionality)

Change characteristics

  • Is this a breaking change (a change in existing functionality)? NO
  • Does this change require a documentation update? NO

How has this been tested?

  • Cycled test on Hera

Checklist

  • Any dependent changes have been merged and published
  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • New and existing tests pass with my changes
  • I have made corresponding changes to the documentation if necessary

CoryMartin-NOAA and others added 30 commits April 17, 2024 15:50
Added tasks to construct aero_diffparm.yaml from template.
@emcbot
Copy link
Copy Markdown

emcbot commented Aug 27, 2024

CI Update on Wcoss2 at 08/27/24 08:31:10 PM
============================================
Cloning and Building global-workflow PR: 2738
with PID: 15294 on host: clogin03

@emcbot emcbot added CI-Wcoss2-Running CI testing on WCOSS for this PR is in-progress and removed CI-Wcoss2-Building CI testing is cloning/building on WCOSS2 labels Aug 27, 2024
@emcbot
Copy link
Copy Markdown

emcbot commented Aug 27, 2024

Automated global-workflow Testing Results:

Machine: Wcoss2
Start: Tue Aug 27 20:41:27 UTC 2024 on clogin03
---------------------------------------------------
Build: Completed at 08/27/24 09:19:30 PM
Case setup: Completed for experiment C48_ATM_2d5b369f
Case setup: Skipped for experiment C48mx500_3DVarAOWCDA_2d5b369f
Case setup: Skipped for experiment C48_S2SWA_gefs_2d5b369f
Case setup: Completed for experiment C48_S2SW_2d5b369f
Case setup: Completed for experiment C96_atm3DVar_extended_2d5b369f
Case setup: Skipped for experiment C96_atm3DVar_2d5b369f
Case setup: Completed for experiment C96C48_hybatmaerosnowDA_2d5b369f
Case setup: Completed for experiment C96C48_hybatmDA_2d5b369f
Case setup: Skipped for experiment C96C48_ufs_hybatmDA_2d5b369f

Copy link
Copy Markdown
Contributor

@WalterKolczynski-NOAA WalterKolczynski-NOAA left a comment

Choose a reason for hiding this comment

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

Sorry, missed these the first time. Just method names, following the same reasoning as the other PR.

pass

@logit(logger)
def computeVariance(self) -> None:
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Python style guidelines say method names should be snake case, not camel case.

Suggested change
def computeVariance(self) -> None:
def compute_variance(self) -> None:

pass

@logit(logger)
def computeDiffusion(self) -> None:
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
def computeDiffusion(self) -> None:
def compute_diffusion(self) -> None:

self.link_jediexe()

@logit(logger)
def interpBackground(self) -> None:
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
def interpBackground(self) -> None:
def interp_background(self) -> None:


@logit(logger)
def execute(self: Analysis) -> None:
def variational(self: Analysis) -> None:
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Best verb I could come up with here, open to others.

Suggested change
def variational(self: Analysis) -> None:
def var_assimilate(self: Analysis) -> None:

# Instantiate the aerosol analysis task
AeroAnl = AerosolAnalysis(config)
AeroAnl.execute()
AeroAnl.variational()
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
AeroAnl.variational()
AeroAnl.var_assimilate()

Comment on lines +24 to +26
AeroB.interpBackground()
AeroB.computeVariance()
AeroB.computeDiffusion()
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
AeroB.interpBackground()
AeroB.computeVariance()
AeroB.computeDiffusion()
AeroB.interp_background()
AeroB.compute_variance()
AeroB.compute_diffusion()

Copy link
Copy Markdown
Contributor

@WalterKolczynski-NOAA WalterKolczynski-NOAA left a comment

Choose a reason for hiding this comment

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

Upon reflection, this PR has been hanging around long enough. Let's try to get it in as-is and we can address the method names later.

@emcbot emcbot added CI-Wcoss2-Passed CI testing on WCOSS for this PR has completed successfully and removed CI-Wcoss2-Running CI testing on WCOSS for this PR is in-progress labels Aug 28, 2024
@emcbot
Copy link
Copy Markdown

emcbot commented Aug 28, 2024

All CI Test Cases Passed on Wcoss2:

Experiment C48_ATM_2d5b369f *** SUCCESS *** at 08/27/24 10:35:17 PM
Experiment C48_S2SW_2d5b369f *** SUCCESS *** at 08/27/24 10:49:10 PM
Experiment C96C48_hybatmDA_2d5b369f *** SUCCESS *** at 08/27/24 11:28:29 PM
Experiment C96C48_hybatmaerosnowDA_2d5b369f *** SUCCESS *** at 08/28/24 12:21:25 AM
Experiment C96_atm3DVar_extended_2d5b369f *** SUCCESS *** at 08/28/24 08:42:32 AM

@WalterKolczynski-NOAA
Copy link
Copy Markdown
Contributor

@CoryMartin-NOAA Looks like merging Russ's PR created a conflict

@CoryMartin-NOAA
Copy link
Copy Markdown
Contributor Author

@WalterKolczynski-NOAA resolved

@WalterKolczynski-NOAA WalterKolczynski-NOAA added CI-Hera-Ready **CM use only** PR is ready for CI testing on Hera CI-Hercules-Ready **CM use only** PR is ready for CI testing on Hercules labels Aug 28, 2024
@emcbot emcbot added CI-Hera-Building **Bot use only** CI testing is cloning/building on Hera CI-Hera-Running **Bot use only** CI testing on Hera for this PR is in-progress CI-Hera-Passed **Bot use only** CI testing on Hera for this PR has completed successfully and removed CI-Hera-Ready **CM use only** PR is ready for CI testing on Hera CI-Hera-Building **Bot use only** CI testing is cloning/building on Hera CI-Hera-Running **Bot use only** CI testing on Hera for this PR is in-progress labels Aug 28, 2024
@emcbot
Copy link
Copy Markdown

emcbot commented Aug 29, 2024

CI Passed on Hera in Build# 2
Built and ran in directory /scratch1/NCEPDEV/global/CI/2738


Experiment C48_ATM_40c8feb0 Completed 1 Cycles: *SUCCESS* at Wed Aug 28 23:23:56 UTC 2024
Experiment C48mx500_3DVarAOWCDA_40c8feb0 Completed 2 Cycles: *SUCCESS* at Wed Aug 28 23:42:33 UTC 2024
Experiment C96_atm3DVar_40c8feb0 Completed 3 Cycles: *SUCCESS* at Thu Aug 29 00:50:20 UTC 2024
Experiment C48_S2SWA_gefs_40c8feb0 Completed 1 Cycles: *SUCCESS* at Thu Aug 29 00:50:52 UTC 2024
Experiment C48_S2SW_40c8feb0 Completed 1 Cycles: *SUCCESS* at Thu Aug 29 01:02:52 UTC 2024
Experiment C96C48_hybatmDA_40c8feb0 Completed 3 Cycles: *SUCCESS* at Thu Aug 29 01:08:58 UTC 2024
Experiment C96C48_ufs_hybatmDA_40c8feb0 Completed 2 Cycles: *SUCCESS* at Thu Aug 29 01:21:22 UTC 2024
Experiment C96C48_hybatmaerosnowDA_40c8feb0 Completed 3 Cycles: *SUCCESS* at Thu Aug 29 02:16:17 UTC 2024

@emcbot emcbot added CI-Hercules-Building **Bot use only** CI testing is cloning/building on Hercules CI-Hercules-Running **Bot use only** CI testing on Hercules for this PR is in-progress and removed CI-Hercules-Ready **CM use only** PR is ready for CI testing on Hercules CI-Hercules-Building **Bot use only** CI testing is cloning/building on Hercules CI-Hercules-Running **Bot use only** CI testing on Hercules for this PR is in-progress labels Aug 29, 2024
@emcbot
Copy link
Copy Markdown

emcbot commented Aug 29, 2024

CI Passed on Hercules in Build# 1
Built and ran in directory /work2/noaa/stmp/CI/HERCULES/2738


Experiment C48_ATM_40c8feb0 Completed 1 Cycles: *SUCCESS* at Thu Aug 29 14:03:04 CDT 2024
Experiment C48_S2SWA_gefs_40c8feb0 Completed 1 Cycles: *SUCCESS* at Thu Aug 29 14:58:13 CDT 2024
Experiment C48_S2SW_40c8feb0 Completed 1 Cycles: *SUCCESS* at Thu Aug 29 15:03:39 CDT 2024
Experiment C96_atm3DVar_40c8feb0 Completed 3 Cycles: *SUCCESS* at Thu Aug 29 15:03:41 CDT 2024
Experiment C96C48_hybatmDA_40c8feb0 Completed 3 Cycles: *SUCCESS* at Thu Aug 29 15:03:52 CDT 2024

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CI-Hera-Passed **Bot use only** CI testing on Hera for this PR has completed successfully CI-Hercules-Passed **Bot use only** CI testing on Hercules for this PR has completed successfully CI-Wcoss2-Passed CI testing on WCOSS for this PR has completed successfully

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Modify aerosol DA jobs to use Jinja templates to copy files Add B matrix generation job for aerosols to workflow

8 participants