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 diff --git a/HISTORY.rc.tmpl b/HISTORY.rc.tmpl index d8ee14cf..7c3d8f5d 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+-' @@ -986,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' , @@ -1011,6 +1012,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 +1287,47 @@ 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' , + '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 ####################################################################### @@ -2034,8 +2077,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' , - 'SWLAND' , 'SURFACE' , + tavg1_2d_lfo_Nx+-.fields: 'SLRSF' , 'SOLAR' , 'SWGDN' , 'LWS' , 'IRRAD' , 'LWGAB' , 'PCU' , 'SURFACE' , 'PRECCU' , 'PLS' , 'SURFACE' , 'PRECLS' ,