From 29926e6f1ed123ed255a79a9e25ae11e5b2663a2 Mon Sep 17 00:00:00 2001 From: Joe Stassi Date: Thu, 20 Mar 2025 12:26:56 -0400 Subject: [PATCH 1/4] Added bkg_lfo collections for LDAS processing --- HISTORY.rc.tmpl | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/HISTORY.rc.tmpl b/HISTORY.rc.tmpl index d8ee14cf..79221abd 100644 --- a/HISTORY.rc.tmpl +++ b/HISTORY.rc.tmpl @@ -130,6 +130,8 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 'bkg.eta' 'bkg.sfc' 'cbkg.eta' + 'bkg.inst1_2d_lfo' + 'bkg.tavg1_2d_lfo' 'vtx.mix' # 'vtx.prs' # 'prog.sfc+-' @@ -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' , @@ -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' , + '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 ####################################################################### From 570de091b1c9c9a20c3649b7c548e15eab3c0d40 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 20 Mar 2025 12:44:47 -0400 Subject: [PATCH 2/4] Update github actions --- .github/workflows/push-to-develop.yml | 3 ++- .github/workflows/validate_yaml_files.yml | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push-to-develop.yml b/.github/workflows/push-to-develop.yml index fd525b2a..8660f551 100644 --- a/.github/workflows/push-to-develop.yml +++ b/.github/workflows/push-to-develop.yml @@ -11,9 +11,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repo - uses: actions/checkout@v3.3.0 + uses: actions/checkout@v4 with: fetch-depth: 0 + filter: blob:none - name: Run the action uses: devops-infra/action-pull-request@v0.5.5 with: diff --git a/.github/workflows/validate_yaml_files.yml b/.github/workflows/validate_yaml_files.yml index 86df2bb0..4b4c1167 100644 --- a/.github/workflows/validate_yaml_files.yml +++ b/.github/workflows/validate_yaml_files.yml @@ -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 @@ -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 From 5673da2a50deaac433b7f42310440dc26749837d Mon Sep 17 00:00:00 2001 From: Joe Stassi Date: Thu, 20 Mar 2025 13:04:50 -0400 Subject: [PATCH 3/4] Corrected typo, line 2082, tavg1_2d_lfo_Nx -> tavg1_2d_lfo_Nx+- --- HISTORY.rc.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HISTORY.rc.tmpl b/HISTORY.rc.tmpl index 79221abd..c2454bd1 100644 --- a/HISTORY.rc.tmpl +++ b/HISTORY.rc.tmpl @@ -2079,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' , 'SWLAND' , 'SURFACE' , 'LWS' , 'IRRAD' , 'LWGAB' , 'PCU' , 'SURFACE' , 'PRECCU' , From 4fbc6fe39c663889d9338c1d12cd98623d0a0ec0 Mon Sep 17 00:00:00 2001 From: Joe Stassi Date: Thu, 27 Mar 2025 11:24:23 -0400 Subject: [PATCH 4/4] New HISTORY.rc.tmpl file received from Sara Zhang with SWLAND removed from these collections: * tavg1_2d_lfo_Nx- * tavg1_2d_lfo_Nx+- * bkg.tavg1_2d_lfo --- HISTORY.rc.tmpl | 3 --- 1 file changed, 3 deletions(-) diff --git a/HISTORY.rc.tmpl b/HISTORY.rc.tmpl index c2454bd1..7c3d8f5d 100644 --- a/HISTORY.rc.tmpl +++ b/HISTORY.rc.tmpl @@ -988,7 +988,6 @@ COLLECTIONS: 'inst3_3d_asm_Np-' tavg1_2d_lfo_Nx-.end_date: >>>IOEDATE<<< , tavg1_2d_lfo_Nx-.end_time: >>>IOETIME<<< , tavg1_2d_lfo_Nx-.fields: 'SLRSF' , 'SOLAR' , 'SWGDN' , - 'SWLAND' , 'SURFACE' , 'LWS' , 'IRRAD' , 'LWGAB' , 'PCU' , 'SURFACE' , 'PRECCU' , 'PLS' , 'SURFACE' , 'PRECLS' , @@ -1303,7 +1302,6 @@ COLLECTIONS: 'inst3_3d_asm_Np-' 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' , 'PLS' , 'SURFACE' , 'PRECLS' , @@ -2080,7 +2078,6 @@ COLLECTIONS: 'inst3_3d_asm_Np-' tavg1_2d_lfo_Nx+-.end_date: >>>IOEBKGD<<< , tavg1_2d_lfo_Nx+-.end_time: >>>IOEBKGT<<< , tavg1_2d_lfo_Nx+-.fields: 'SLRSF' , 'SOLAR' , 'SWGDN' , - 'SWLAND' , 'SURFACE' , 'LWS' , 'IRRAD' , 'LWGAB' , 'PCU' , 'SURFACE' , 'PRECCU' , 'PLS' , 'SURFACE' , 'PRECLS' ,