Skip to content

Added bkg_lfo collections for LDAS processing #707

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.

Sign up for GitHub

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

Open
gmao-jstassi wants to merge 4 commits into
base: feature/rtodling/qrqstot_export_rename
Choose a base branch
from
Open

Added bkg_lfo collections for LDAS processing #707

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29926e6
Added bkg_lfo collections for LDAS processing
gmao-jstassi Mar 20, 2025
570de09
Update github actions
mathomp4 Mar 20, 2025
5673da2
Corrected typo, line 2082, tavg1_2d_lfo_Nx -> tavg1_2d_lfo_Nx+-
gmao-jstassi Mar 20, 2025
4fbc6fe
New HISTORY.rc.tmpl file received from Sara Zhang with SWLAND removed…
gmao-jstassi Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/push-to-develop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v3.3.0
uses: actions/checkout@v4
Copy link
Contributor

@gmao-rreichle gmao-rreichle Apr 8, 2025

Choose a reason for hiding this comment

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

The changes in push-to-develop.yml and validate_yaml_files.yml aren't related to the intent of the PR. It doesn't matter to me if they're included, just pointing this out to avoid inadvertent changes and making sure nothing is out of sync.

with:
fetch-depth: 0
filter: blob:none
- name: Run the action
uses: devops-infra/action-pull-request@v0.5.5
with:
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/validate_yaml_files.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ jobs:
validate-YAML:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.3.0
- name: Checkout repo
uses: actions/checkout@v4
with:
fetch-depth: 0
filter: blob:none
- id: yaml-lint
name: yaml-lint
uses: ibiqlik/action-yamllint@v3
Expand All @@ -24,7 +28,7 @@ jobs:
format: colored
config_file: .yamllint.yml

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
if: always()
with:
name: yamllint-logfile
Expand Down
47 changes: 46 additions & 1 deletion HISTORY.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'bkg.eta'
'bkg.sfc'
'cbkg.eta'
'bkg.inst1_2d_lfo'
Copy link
Contributor

@gmao-rreichle gmao-rreichle Apr 8, 2025

Choose a reason for hiding this comment

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

What do we want these Collection names to be?
bkg.inst1_2d_lfo includes most but not all of the name of the standard (diagnostic) collection.
Using bkg.inst1_2d_lfo_Nx would be more consistent, where the "Nx" part expresses that the file is at the "native" resolution.
Since this is a "bkg" Collection, however, it may be better to keep only the essence of the standard collection name, as in bkg.lfo_inst1, or maybe even bkg.lfo_inst if we don't want to hardwire the 1-hour time step into the name.
My suggestion would be to use bkg.lfo_inst and bkg.lfo_tavg, which is probably most consistent with the other "bkg" Collection names.
(Note that GEOS-ESM/GEOSldas_GridComp#81 will need matching edits in LDAS_Forcing.F90.)

Copy link
Contributor

@saraqzhang saraqzhang Apr 8, 2025

Choose a reason for hiding this comment

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

" Nx " should have not been in the lfo name since it conventionally indicates a lat/lon grid collection. We have had it in lfo Nx+- collection for the convenience ( existing name format in ldas) even though they output in CS resolution. We certainly can modify the names as Rolf suggested here, then there are several places needed to match in the adas PR #327 and in ldasGC PR#81.

'bkg.tavg1_2d_lfo'
'vtx.mix'
# 'vtx.prs'
# 'prog.sfc+-'
Expand Down Expand Up @@ -1011,6 +1013,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'SPEED' , 'DYN' , 'SPEEDLML' ,
'PS' , 'DYN' ,
::


tavg1_2d_ocn_Nx-.format: 'CFIO' ,
tavg1_2d_ocn_Nx-.descr: '2d,1-Hourly,Time-Averaged,Single-Level,Assimilation,Ocean Surface' ,
Expand Down Expand Up @@ -1285,6 +1288,48 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'GOCART::CO2' , 'GOCART' , 'CO2' ,
::

#######################################################################
# Ldas bkg forcing
#######################################################################

bkg.tavg1_2d_lfo.format: 'CFIO' ,
bkg.tavg1_2d_lfo.descr: '2d,1-Hourly,Time-Averaged,Single-Level,Land Surface Forcings' ,
bkg.tavg1_2d_lfo.template: '%y4%m2%d2_%h2%n2z.>>>NCSUFFIX<<<' ,
bkg.tavg1_2d_lfo.mode: 'time-averaged' ,
bkg.tavg1_2d_lfo.frequency: 010000 ,
bkg.tavg1_2d_lfo.duration: 010000 ,
bkg.tavg1_2d_lfo.ref_date: >>>IOBBKGD<<< ,
bkg.tavg1_2d_lfo.ref_time: >>>IOBBKGT<<< ,
bkg.tavg1_2d_lfo.end_date: >>>IOEBKGD<<< ,
bkg.tavg1_2d_lfo.end_time: >>>IOEBKGT<<< ,
bkg.tavg1_2d_lfo.fields: 'SLRSF' , 'SOLAR' , 'SWGDN' ,
'SWLAND' , 'SURFACE' ,
'LWS' , 'IRRAD' , 'LWGAB' ,
'PCU' , 'SURFACE' , 'PRECCU' ,
Copy link
Contributor

@gmao-rreichle gmao-rreichle Apr 8, 2025

Choose a reason for hiding this comment

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

FYI, in the updated file specs of M21C, we now rename as follows:

PCU --> PRECRAINCU    (instead of PRECCU)
PLS --> PRECRAINLS    (instead of PRECLS)

We could make this change now in the bkg.lfo Collections, or we could stick with the older names (PRECCU, PRECLS) until the FP file specs are updated to the M21C conventions.

Copy link
Contributor

@gmao-rreichle gmao-rreichle Apr 10, 2025

Choose a reason for hiding this comment

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

Let's not worry about this now.

'PLS' , 'SURFACE' , 'PRECLS' ,
'SNO' , 'SURFACE' , 'PRECSNO' ,
'DFPAR' , 'SOLAR' , 'PARDF' ,
'DRPAR' , 'SOLAR' , 'PARDR' ,
::

bkg.inst1_2d_lfo.format: 'CFIO' ,
bkg.inst1_2d_lfo.descr: '2d,1-Hourly,Instantaneous,Single-Level,Land Surface Forcings' ,
bkg.inst1_2d_lfo.template: '%y4%m2%d2_%h2%n2z.>>>NCSUFFIX<<<' ,
bkg.inst1_2d_lfo.mode: 'instantaneous' ,
bkg.inst1_2d_lfo.frequency: 010000 ,
bkg.inst1_2d_lfo.duration: 010000 ,
bkg.inst1_2d_lfo.ref_date: >>>IOBBKGD<<< ,
bkg.inst1_2d_lfo.ref_time: >>>IOBBKGT<<< ,
bkg.inst1_2d_lfo.end_date: >>>IOEBKGD<<< ,
bkg.inst1_2d_lfo.end_time: >>>IOEBKGT<<< ,
bkg.inst1_2d_lfo.fields: 'DZ' , 'DYN' , 'HLML' ,
'TA' , 'DYN' , 'TLML' ,
'QA' , 'DYN' , 'QLML' ,
'SPEED' , 'DYN' , 'SPEEDLML' ,
'PS' , 'DYN' ,
::


#######################################################################
# Aerosols/Constituents
#######################################################################
Expand Down Expand Up @@ -2034,7 +2079,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
tavg1_2d_lfo_Nx+-.ref_time: >>>IOBBKGT<<< ,
tavg1_2d_lfo_Nx+-.end_date: >>>IOEBKGD<<< ,
tavg1_2d_lfo_Nx+-.end_time: >>>IOEBKGT<<< ,
tavg1_2d_lfo_Nx.fields: 'SLRSF' , 'SOLAR' , 'SWGDN' ,
tavg1_2d_lfo_Nx+-.fields: 'SLRSF' , 'SOLAR' , 'SWGDN' ,
Copy link
Contributor

@gmao-rreichle gmao-rreichle Apr 8, 2025

Choose a reason for hiding this comment

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

There's no need to keep the "lfo_Nx+-" Collections in the template. They are superseded by the "bkg.lfo" Collections. Both the "Nx+-" inst and tavg Collections should be removed.

'SWLAND' , 'SURFACE' ,
'LWS' , 'IRRAD' , 'LWGAB' ,
'PCU' , 'SURFACE' , 'PRECCU' ,
Expand Down