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.

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

Jump to bottom

Change $(foo) to {{ foo }} in YAMLs #928

Merged
merged 17 commits into from
Mar 25, 2024
Merged

Change $(foo) to {{ foo }} in YAMLs #928

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
dc990c9
Change $(foo) to {{ foo }}
CoryMartin-NOAA Feb 16, 2024
0e3c98c
Norm
CoryMartin-NOAA Feb 16, 2024
42d2ed3
Remove ewok to gdas yaml test, modify aero 3dvar yaml test
CoryMartin-NOAA Feb 16, 2024
0795289
Merge branch 'develop' into feature/yaml_syntax
CoryMartin-NOAA Feb 16, 2024
4b0cb8b
Try this
CoryMartin-NOAA Feb 16, 2024
33a2cfa
Merge branch 'feature/yaml_syntax' of https://github.com/NOAA-EMC/GDA…
CoryMartin-NOAA Feb 16, 2024
71ecb0f
Update genyaml_3dvar.sh
CoryMartin-NOAA Feb 16, 2024
1406718
Remove useless test that is a waste of time
CoryMartin-NOAA Feb 16, 2024
ac5c801
Flat out remove the ewok conversion test
CoryMartin-NOAA Feb 16, 2024
6e80e58
Account for ones that already were double curly but no spaces
CoryMartin-NOAA Feb 16, 2024
de88cc3
Revert "Remove useless test that is a waste of time"
CoryMartin-NOAA Feb 16, 2024
1f03e97
Merge branch 'develop' into feature/yaml_syntax
CoryMartin-NOAA Mar 18, 2024
167442c
Add quotes, revert changes to EVA YAML
CoryMartin-NOAA Mar 18, 2024
470d82b
Merge branch 'develop' into feature/yaml_syntax
CoryMartin-NOAA Mar 20, 2024
8e6caec
revert soca changes
CoryMartin-NOAA Mar 20, 2024
3f977e1
Update stage.yaml
CoryMartin-NOAA Mar 20, 2024
dcc51bb
Merge branch 'develop' into feature/yaml_syntax
RussTreadon-NOAA Mar 22, 2024
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
4 changes: 2 additions & 2 deletions parm/aero/berror/staticb_bump.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ saber central block:
saber block name: BUMP_NICAS
read:
io:
data directory: &staticb_aero_dir $(DATA)/berror
data directory: &staticb_aero_dir {{ DATA }}/berror
files prefix: 'nicas_aero'
overriding universe radius file: cor_aero_universe_radius
drivers:
Expand All @@ -18,7 +18,7 @@ saber outer blocks:
set datetime on read: true
filetype: fms restart
psinfile: true
datapath: $(DATA)/berror
datapath: {{ DATA }}/berror
filename_core: 20210227.000000.stddev.fv_core.res.nc
filename_trcr: 20210227.000000.stddev.fv_tracer.res.nc
filename_cplr: 20210227.000000.stddev.coupler.res
Expand Down
22 changes: 11 additions & 11 deletions parm/aero/hofx/hofx_nomodel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
time window:
begin: '{{ AERO_WINDOW_BEGIN | to_isotime }}'
length: $(AERO_WINDOW_LENGTH)
length: {{ AERO_WINDOW_LENGTH }}
geometry:
fms initialization:
namelist filename: $(DATA)/fv3jedi/fmsmpp.nml
field table filename: $(DATA)/fv3jedi/field_table
akbk: $(DATA)/fv3jedi/akbk.nc4
namelist filename: {{ DATA }}/fv3jedi/fmsmpp.nml
field table filename: {{ DATA }}/fv3jedi/field_table
akbk: {{ DATA }}/fv3jedi/akbk.nc4
layout:
- $(layout_x)
- $(layout_y)
npx: $(npx_ges)
npy: $(npy_ges)
npz: $(npz_ges)
field metadata override: $(DATA)/fv3jedi/fv3jedi_fieldmetadata_restart.yaml
- {{ layout_x }}
- {{ layout_y }}
npx: {{ npx_ges }}
npy: {{ npy_ges }}
npz: {{ npz_ges }}
field metadata override: {{ DATA }}/fv3jedi/fv3jedi_fieldmetadata_restart.yaml
state:
datapath: $(DATA)/bkg
datapath: {{ DATA }}/bkg
filetype: fms restart
datetime: '{{ current_cycle | to_isotime }}'
filename_core: '{{ current_cycle | to_fv3time }}.fv_core.res.nc'
Expand Down
6 changes: 3 additions & 3 deletions parm/aero/obs/config/viirs_n20_aod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ obs space:
obsdatain:
engine:
type: H5File
obsfile: $(DATA)/obs/$(OPREFIX)viirs_n20.{{ current_cycle | to_YMDH }}.nc4
obsfile: {{ DATA }}/obs/{{ OPREFIX }}viirs_n20.{{ current_cycle | to_YMDH }}.nc4
obsdataout:
engine:
type: H5File
obsfile: $(DATA)/diags/diag_viirs_n20_{{ current_cycle | to_YMDH }}.nc4
obsfile: {{ DATA }}/diags/diag_viirs_n20_{{ current_cycle | to_YMDH }}.nc4
io pool:
max pool size: 1
simulated variables: [aerosolOpticalDepth]
Expand All @@ -21,7 +21,7 @@ obs operator:
obs options:
Sensor_ID: v.viirs-m_j1
EndianType: little_endian
CoefficientPath: $(DATA)/crtm/
CoefficientPath: {{ DATA }}/crtm/
AerosolOption: aerosols_gocart_default
obs error:
covariance model: diagonal
Expand Down
6 changes: 3 additions & 3 deletions parm/aero/obs/config/viirs_npp_aod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ obs space:
obsdatain:
engine:
type: H5File
obsfile: $(DATA)/obs/$(OPREFIX)viirs_npp.{{ current_cycle | to_YMDH }}.nc4
obsfile: {{ DATA }}/obs/{{ OPREFIX }}viirs_npp.{{ current_cycle | to_YMDH }}.nc4
obsdataout:
engine:
type: H5File
obsfile: $(DATA)/diags/diag_viirs_npp_{{ current_cycle | to_YMDH }}.nc4
obsfile: {{ DATA }}/diags/diag_viirs_npp_{{ current_cycle | to_YMDH }}.nc4
io pool:
max pool size: 1
simulated variables: [aerosolOpticalDepth]
Expand All @@ -21,7 +21,7 @@ obs operator:
obs options:
Sensor_ID: v.viirs-m_npp
EndianType: little_endian
CoefficientPath: $(DATA)/crtm/
CoefficientPath: {{ DATA }}/crtm/
AerosolOption: aerosols_gocart_default
obs error:
covariance model: diagonal
Expand Down
42 changes: 21 additions & 21 deletions parm/aero/variational/3dvar_fgat_gfs_aero.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cost function:
cost type: 3D-FGAT
time window:
begin: '{{ AERO_WINDOW_BEGIN | to_isotime }}'
length: $(AERO_WINDOW_LENGTH)
length: {{ AERO_WINDOW_LENGTH }}
analysis variables: &3dvars
[mass_fraction_of_sulfate_in_air,
mass_fraction_of_hydrophobic_black_carbon_in_air,
Expand All @@ -20,11 +20,11 @@ cost function:
field table filename: ./fv3jedi/field_table
akbk: ./fv3jedi/akbk.nc4
layout:
- $(layout_x)
- $(layout_y)
npx: $(npx_ges)
npy: $(npy_ges)
npz: $(npz_ges)
- {{ layout_x }}
- {{ layout_y }}
npx: {{ npx_ges }}
npy: {{ npy_ges }}
npz: {{ npz_ges }}
field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
model:
name: PSEUDO
Expand Down Expand Up @@ -60,11 +60,11 @@ variational:
field table filename: ./fv3jedi/field_table
akbk: ./fv3jedi/akbk.nc4
layout:
- $(layout_x)
- $(layout_y)
npx: $(npx_anl)
npy: $(npy_anl)
npz: $(npz_anl)
- {{ layout_x }}
- {{ layout_y }}
npx: {{ npx_anl }}
npy: {{ npy_anl }}
npz: {{ npz_anl }}
field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
diagnostics:
departures: bkgmob
Expand All @@ -77,11 +77,11 @@ variational:
field table filename: ./fv3jedi/field_table
akbk: ./fv3jedi/akbk.nc4
layout:
- $(layout_x)
- $(layout_y)
npx: $(npx_anl)
npy: $(npy_anl)
npz: $(npz_anl)
- {{ layout_x }}
- {{ layout_y }}
npx: {{ npx_anl }}
npy: {{ npy_anl }}
npz: {{ npz_anl }}
field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
diagnostics:
departures: bkgmob1
Expand All @@ -95,11 +95,11 @@ final:
field table filename: ./fv3jedi/field_table
akbk: ./fv3jedi/akbk.nc4
layout:
- $(layout_x)
- $(layout_y)
npx: $(npx_ges)
npy: $(npy_ges)
npz: $(npz_ges)
- {{ layout_x }}
- {{ layout_y }}
npx: {{ npx_ges }}
npy: {{ npy_ges }}
npz: {{ npz_ges }}
field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
output:
state component:
Expand Down
42 changes: 21 additions & 21 deletions parm/aero/variational/3dvar_gfs_aero.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cost function:
cost type: 3D-Var
time window:
begin: '{{ AERO_WINDOW_BEGIN | to_isotime }}'
length: $(AERO_WINDOW_LENGTH)
length: {{ AERO_WINDOW_LENGTH }}
analysis variables: &3dvars
[mass_fraction_of_sulfate_in_air,
mass_fraction_of_hydrophobic_black_carbon_in_air,
Expand All @@ -20,11 +20,11 @@ cost function:
field table filename: ./fv3jedi/field_table
akbk: ./fv3jedi/akbk.nc4
layout:
- $(layout_x)
- $(layout_y)
npx: $(npx_ges)
npy: $(npy_ges)
npz: $(npz_ges)
- {{ layout_x }}
- {{ layout_y }}
npx: {{ npx_ges }}
npy: {{ npy_ges }}
npz: {{ npz_ges }}
field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
background:
datapath: ./bkg
Expand All @@ -51,11 +51,11 @@ variational:
field table filename: ./fv3jedi/field_table
akbk: ./fv3jedi/akbk.nc4
layout:
- $(layout_x)
- $(layout_y)
npx: $(npx_anl)
npy: $(npy_anl)
npz: $(npz_anl)
- {{ layout_x }}
- {{ layout_y }}
npx: {{ npx_anl }}
npy: {{ npy_anl }}
npz: {{ npz_anl }}
field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
diagnostics:
departures: bkgmob
Expand All @@ -68,11 +68,11 @@ variational:
field table filename: ./fv3jedi/field_table
akbk: ./fv3jedi/akbk.nc4
layout:
- $(layout_x)
- $(layout_y)
npx: $(npx_anl)
npy: $(npy_anl)
npz: $(npz_anl)
- {{ layout_x }}
- {{ layout_y }}
npx: {{ npx_anl }}
npy: {{ npy_anl }}
npz: {{ npz_anl }}
field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
diagnostics:
departures: bkgmob1
Expand All @@ -86,11 +86,11 @@ final:
field table filename: ./fv3jedi/field_table
akbk: ./fv3jedi/akbk.nc4
layout:
- $(layout_x)
- $(layout_y)
npx: $(npx_ges)
npy: $(npy_ges)
npz: $(npz_ges)
- {{ layout_x }}
- {{ layout_y }}
npx: {{ npx_ges }}
npy: {{ npy_ges }}
npz: {{ npz_ges }}
field metadata override: ./fv3jedi/fv3jedi_fieldmetadata_restart.yaml
output:
state component:
Expand Down
4 changes: 2 additions & 2 deletions parm/atm/berror/hybvar_bump.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ components:
active variables: &active_vars [psi,chi,t,ps,rh,liq_wat,o3mr]
bump:
io:
data directory: &staticb_dir $(DATA)/berror
data directory: &staticb_dir {{ DATA }}/berror
drivers:
multivariate strategy: specific_univariate
read local nicas: true
Expand Down Expand Up @@ -105,7 +105,7 @@ components:
filename_sfcw: '{{ current_cycle | to_fv3time }}.fv_srf_wnd.res.nc'
filename_cplr: '{{ current_cycle | to_fv3time }}.coupler.res'
pattern: '%mem%'
nmembers: $(NMEM_ENS)
nmembers: {{ NMEM_ENS }}
zero padding: 3
# localization:
# localization method: SABER
Expand Down
14 changes: 7 additions & 7 deletions parm/atm/berror/hybvar_gsibec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ components:
saber central block:
saber block name: gsi covariance
read:
gsi akbk: &akbk $(DATA)/fv3jedi/akbk.nc4
gsi error covariance file: &gsiberr $(DATA)/berror/gsi-coeffs-gfs-global.nc4
# gsi error covariance file: &gsiberr $(DATA)/berror/global_berror.f77
gsi berror namelist file: &gsibnml $(DATA)/berror/gfs_gsi_global.nml
processor layout x direction: &layout_gsib_x $(layout_gsib_x)
processor layout y direction: &layout_gsib_y $(layout_gsib_y)
gsi akbk: &akbk {{ DATA }}/fv3jedi/akbk.nc4
gsi error covariance file: &gsiberr {{ DATA }}/berror/gsi-coeffs-gfs-global.nc4
# gsi error covariance file: &gsiberr {{ DATA }}/berror/global_berror.f77
gsi berror namelist file: &gsibnml {{ DATA }}/berror/gfs_gsi_global.nml
processor layout x direction: &layout_gsib_x {{ layout_gsib_x }}
processor layout y direction: &layout_gsib_y {{ layout_gsib_y }}
debugging mode: false
saber outer blocks:
- saber block name: gsi interpolation to model grid
Expand Down Expand Up @@ -42,7 +42,7 @@ components:
filename_sfcw: '{{ current_cycle | to_fv3time }}.fv_srf_wnd.res.nc'
filename_cplr: '{{ current_cycle | to_fv3time }}.coupler.res'
pattern: '%mem%'
nmembers: $(NMEM_ENS)
nmembers: {{ NMEM_ENS }}
zero padding: 3
localization:
localization method: SABER
Expand Down
2 changes: 1 addition & 1 deletion parm/atm/berror/staticb_bump.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ saber blocks:
active variables: &active_vars [psi,chi,t,ps,rh,liq_wat,o3mr]
bump:
io:
data directory: &staticb_dir $(DATA)/berror
data directory: &staticb_dir {{ DATA }}/berror
drivers:
multivariate strategy: specific_univariate
read local nicas: true
Expand Down
12 changes: 6 additions & 6 deletions parm/atm/berror/staticb_gsibec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ full inverse: true
saber central block:
saber block name: gsi covariance
read:
gsi akbk: &akbk $(DATA)/fv3jedi/akbk.nc4
gsi error covariance file: &gsiberr $(DATA)/berror/gsi-coeffs-gfs-global.nc4
# gsi error covariance file: &gsiberr $(DATA)/berror/global_berror.f77
gsi berror namelist file: &gsibnml $(DATA)/berror/gfs_gsi_global.nml
processor layout x direction: &layout_gsib_x $(layout_gsib_x)
processor layout y direction: &layout_gsib_y $(layout_gsib_y)
gsi akbk: &akbk {{ DATA }}/fv3jedi/akbk.nc4
gsi error covariance file: &gsiberr {{ DATA }}/berror/gsi-coeffs-gfs-global.nc4
# gsi error covariance file: &gsiberr {{ DATA }}/berror/global_berror.f77
gsi berror namelist file: &gsibnml {{ DATA }}/berror/gfs_gsi_global.nml
processor layout x direction: &layout_gsib_x {{ layout_gsib_x }}
processor layout y direction: &layout_gsib_y {{ layout_gsib_y }}
debugging mode: false
saber outer blocks:
- saber block name: gsi interpolation to model grid
Expand Down
2 changes: 1 addition & 1 deletion parm/atm/berror/staticb_identity.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
covariance model: FV3JEDI-ID
date: '{{ATM_WINDOW_BEGIN}}'
date: '{{ ATM_WINDOW_BEGIN }}'
28 changes: 14 additions & 14 deletions parm/atm/hofx/hofx4d.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
time window:
begin: '{{ ATM_WINDOW_BEGIN | to_isotime }}'
length: $(ATM_WINDOW_LENGTH)
forecast length: $(ATM_WINDOW_LENGTH)
length: {{ ATM_WINDOW_LENGTH }}
forecast length: {{ ATM_WINDOW_LENGTH }}
geometry:
fms initialization:
namelist filename: $(DATA)/fv3jedi/fmsmpp.nml
field table filename: $(DATA)/fv3jedi/field_table
akbk: $(DATA)/fv3jedi/akbk.nc4
namelist filename: {{ DATA }}/fv3jedi/fmsmpp.nml
field table filename: {{ DATA }}/fv3jedi/field_table
akbk: {{ DATA }}/fv3jedi/akbk.nc4
layout:
- $(layout_x)
- $(layout_y)
npx: $(npx_ges)
npy: $(npy_ges)
npz: $(npz_ges)
field metadata override: $(DATA)/fv3jedi/fv3jedi_fieldmetadata_restart.yaml
- {{ layout_x }}
- {{ layout_y }}
npx: {{ npx_ges }}
npy: {{ npy_ges }}
npz: {{ npz_ges }}
field metadata override: {{ DATA }}/fv3jedi/fv3jedi_fieldmetadata_restart.yaml
initial condition:
datapath: $(DATA)/bkg
datapath: {{ DATA }}/bkg
filetype: fms restart
datetime: '{{ ATM_WINDOW_BEGIN | to_isotime }}'
filename_core: '{{ ATM_WINDOW_BEGIN | to_fv3time }}.fv_core.res.nc'
Expand All @@ -28,7 +28,7 @@ initial condition:
u_srf,v_srf,f10m]
model:
name: PSEUDO
datapath: $(DATA)/bkg
datapath: {{ DATA }}/bkg
filetype: fms restart
datetime: '{{ ATM_WINDOW_BEGIN | to_isotime }}'
filename is datetime templated: true
Expand All @@ -37,7 +37,7 @@ model:
filename_sfcd: '%yyyy%mm%dd.%hh%MM%ss.sfc_data.nc'
filename_sfcw: '%yyyy%mm%dd.%hh%MM%ss.fv_srf_wnd.res.nc'
filename_cplr: '%yyyy%mm%dd.%hh%MM%ss.coupler.res'
tstep: $(BKG_TSTEP)
tstep: {{ BKG_TSTEP }}
model variables: [ua,va,t,delp,sphum,ice_wat,liq_wat,o3mr,phis,
slmsk,sheleg,tsea,vtype,stype,vfrac,stc,smc,snwdph,
u_srf,v_srf,f10m]
Expand Down
Loading
Loading