Skip to content

Commit 8e59f70

Browse files
AntonMFernando-NOAAAntonMFernando-NOAA
committed
gfs->global
1 parent 8fa33c8 commit 8e59f70

File tree

82 files changed

+455
-455
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+455
-455
lines changed

‎build.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ BUILD_IODA_CONVERTERS=${BUILD_IODA_CONVERTERS:-"NO"}
4949
while getopts "w:t:c:hvdfai" opt; do
5050
case $opt in
5151
w)
52-
HOMEgfs=$OPTARG
52+
HOMEglobal=$OPTARG
5353
;;
5454
t)
5555
BUILD_TARGET=$OPTARG
@@ -114,8 +114,8 @@ if [[ $WORKFLOW_BUILD == 'ON' ]]; then
114114
# Link MOM6 and Icepack in SOCA to submodules in the UFS repo
115115
rm -rf $dir_root/sorc/soca/external/mom6/MOM6
116116
rm -rf $dir_root/sorc/soca/external/icepack/Icepack
117-
ln -sf $HOMEgfs/sorc/ufs_model.fd/MOM6-interface/MOM6/ $dir_root/sorc/soca/external/mom6/MOM6
118-
ln -sf $HOMEgfs/sorc/ufs_model.fd/CICE-interface/CICE/icepack/ $dir_root/sorc/soca/external/icepack/Icepack
117+
ln -sf $HOMEglobal/sorc/ufs_model.fd/MOM6-interface/MOM6/ $dir_root/sorc/soca/external/mom6/MOM6
118+
ln -sf $HOMEglobal/sorc/ufs_model.fd/CICE-interface/CICE/icepack/ $dir_root/sorc/soca/external/icepack/Icepack
119119
else
120120
# Delete forked SOCA NOAA-EMC dev/emc repo and clone the original JCSDA develop repo
121121
rm -rf "$dir_root/sorc/soca/"

‎parm/aero/aero_bmat_config.yaml.j2‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
jedi_config:
22
aero_interpbkg:
33
rundir: '{{ DATA }}'
4-
exe_src: '{{ EXECgfs }}/gdas.x'
4+
exe_src: '{{ EXECglobal }}/gdas.x'
55
jedi_args: ['fv3jedi', 'convertstate']
66
mpi_cmd: '{{ APRUN_AEROANLGENB }}'
7-
jcb_base_yaml: '{{ PARMgfs }}/gdas/aero/jcb-base.yaml.j2'
7+
jcb_base_yaml: '{{ PARMglobal }}/gdas/aero/jcb-base.yaml.j2'
88
jcb_algo: aero_convert_background
99
aero_diagb:
1010
rundir: '{{ DATA }}'
11-
exe_src: '{{ EXECgfs }}/gdas_fv3jedi_chem_diagb.x'
11+
exe_src: '{{ EXECglobal }}/gdas_fv3jedi_chem_diagb.x'
1212
mpi_cmd: '{{ APRUN_AEROANLGENB }}'
13-
jcb_base_yaml: '{{ PARMgfs }}/gdas/aero/jcb-base.yaml.j2'
13+
jcb_base_yaml: '{{ PARMglobal }}/gdas/aero/jcb-base.yaml.j2'
1414
jcb_algo: aero_gen_bmatrix_diagb
1515
aero_diffusion:
1616
rundir: '{{ DATA }}'
17-
exe_src: '{{ EXECgfs }}/gdas_fv3jedi_error_covariance_toolbox.x'
17+
exe_src: '{{ EXECglobal }}/gdas_fv3jedi_error_covariance_toolbox.x'
1818
mpi_cmd: '{{ APRUN_AEROANLGENB }}'
19-
jcb_base_yaml: '{{ PARMgfs }}/gdas/aero/jcb-base.yaml.j2'
19+
jcb_base_yaml: '{{ PARMglobal }}/gdas/aero/jcb-base.yaml.j2'
2020
jcb_algo: aero_gen_bmatrix_diffusion
2121

2222
data_in:

‎parm/aero/aero_det_config.yaml.j2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
jedi_config:
22
aeroanlvar:
33
rundir: '{{ DATA }}'
4-
exe_src: '{{ EXECgfs }}/gdas.x'
4+
exe_src: '{{ EXECglobal }}/gdas.x'
55
mpi_cmd: '{{ APRUN_AEROANL }}'
66
jedi_args: ['fv3jedi', 'variational']
77
jcb_algo: '3dfgat'
8-
jcb_base_yaml: '{{ PARMgfs }}/gdas/aero/jcb-base.yaml.j2'
8+
jcb_base_yaml: '{{ PARMglobal }}/gdas/aero/jcb-base.yaml.j2'
99
obs_list_yaml: '{{ OBS_LIST_YAML }}'
1010

1111
data_in:

‎parm/aero/aero_stage_jedi_fix.yaml.j2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
- ['{{ FIXgfs }}/gdas/fv3jedi/fv3files/akbk{{ npz }}.nc4', '{{ DATA }}/fv3jedi/akbk.nc4']
2-
- ['{{ FIXgfs }}/gdas/fv3jedi/fv3files/fmsmpp.nml', '{{ DATA }}/fv3jedi/fmsmpp.nml']
3-
- ['{{ FIXgfs }}/gdas/fv3jedi/fv3files/field_table_gfdl', '{{ DATA }}/fv3jedi/field_table']
1+
- ['{{ FIXglobal }}/gdas/fv3jedi/fv3files/akbk{{ npz }}.nc4', '{{ DATA }}/fv3jedi/akbk.nc4']
2+
- ['{{ FIXglobal }}/gdas/fv3jedi/fv3files/fmsmpp.nml', '{{ DATA }}/fv3jedi/fmsmpp.nml']
3+
- ['{{ FIXglobal }}/gdas/fv3jedi/fv3files/field_table_gfdl', '{{ DATA }}/fv3jedi/field_table']

‎parm/aero/jcb-base.yaml.j2‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Search path for model and obs for JCB
22
# -------------------------------------
3-
algorithm_path: "{{PARMgfs}}/gdas/jcb-algorithms"
4-
app_path_algorithm: "{{PARMgfs}}/gdas/jcb-gdas/algorithm/aero"
5-
app_path_model: "{{PARMgfs}}/gdas/jcb-gdas/model/aero"
6-
app_path_observations: "{{PARMgfs}}/gdas/jcb-gdas/observations/aero"
7-
app_path_observation_chronicle: "{{PARMgfs}}/gdas/jcb-gdas/observation_chronicle/aero"
3+
algorithm_path: "{{PARMglobal}}/gdas/jcb-algorithms"
4+
app_path_algorithm: "{{PARMglobal}}/gdas/jcb-gdas/algorithm/aero"
5+
app_path_model: "{{PARMglobal}}/gdas/jcb-gdas/model/aero"
6+
app_path_observations: "{{PARMglobal}}/gdas/jcb-gdas/observations/aero"
7+
app_path_observation_chronicle: "{{PARMglobal}}/gdas/jcb-gdas/observation_chronicle/aero"
88

99

1010
# Places where we deviate from the generic file name of a yaml

‎parm/analcalc/analcalc_config.yaml.j2‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
jedi_config:
22
atm_addincrement:
33
rundir: '{{ DATA }}'
4-
exe_src: '{{ EXECgfs }}/gdas.x'
4+
exe_src: '{{ EXECglobal }}/gdas.x'
55
jedi_args: ['fv3jedi', 'addincrement']
66
mpi_cmd: '{{ APRUN_ANALCALC_FV3JEDI }}'
7-
jcb_base_yaml: '{{ PARMgfs }}/gdas/atm/jcb-base.yaml.j2'
7+
jcb_base_yaml: '{{ PARMglobal }}/gdas/atm/jcb-base.yaml.j2'
88
jcb_algo: atm_addincrement
99
{% if DO_AERO_ANL %}
1010
aero_addincrement:
1111
rundir: '{{ DATA }}'
12-
exe_src: '{{ EXECgfs }}/gdas.x'
12+
exe_src: '{{ EXECglobal }}/gdas.x'
1313
jedi_args: ['fv3jedi', 'addincrement']
1414
mpi_cmd: '{{ APRUN_ANALCALC_FV3JEDI }}'
15-
jcb_base_yaml: '{{ PARMgfs }}/gdas/aero/jcb-base.yaml.j2'
15+
jcb_base_yaml: '{{ PARMglobal }}/gdas/aero/jcb-base.yaml.j2'
1616
jcb_algo: aero_addincrement
1717
{% endif %}
1818
{% if DO_JEDISNOWDA %}
1919
snow_addincrement:
2020
rundir: '{{ DATA }}'
21-
exe_src: '{{ EXECgfs }}/gdas.x'
21+
exe_src: '{{ EXECglobal }}/gdas.x'
2222
jedi_args: ['fv3jedi', 'addincrement']
2323
mpi_cmd: '{{ APRUN_ANALCALC_FV3JEDI }}'
24-
jcb_base_yaml: '{{ PARMgfs }}/gdas/snow/jcb-base.yaml.j2'
24+
jcb_base_yaml: '{{ PARMglobal }}/gdas/snow/jcb-base.yaml.j2'
2525
jcb_algo: snow_addincrement
2626
{% endif %}
2727

@@ -66,7 +66,7 @@ data_in:
6666
{% endif %}
6767

6868
{% filter indent(width=4) %}
69-
{% include PARMgfs ~ '/gdas/' ~ '/atm/' ~ 'atm_stage_jedi_fix.yaml.j2' %}
69+
{% include PARMglobal ~ '/gdas/' ~ '/atm/' ~ 'atm_stage_jedi_fix.yaml.j2' %}
7070
{% endfilter %}
7171

7272
data_out:

‎parm/anlstat/aero/jcb-base.yaml.j2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Search path for model and obs for JCB
22
# -------------------------------------
3-
algorithm_path: "{{ PARMgfs }}/gdas/jcb-algorithms"
4-
app_path_algorithm: "{{ PARMgfs }}/gdas/jcb-gdas/algorithm/observation_statistics"
5-
app_path_observations: "{{ PARMgfs }}/gdas/jcb-gdas/observation_statistics/aero"
3+
algorithm_path: "{{ PARMglobal }}/gdas/jcb-algorithms"
4+
app_path_algorithm: "{{ PARMglobal }}/gdas/jcb-gdas/algorithm/observation_statistics"
5+
app_path_observations: "{{ PARMglobal }}/gdas/jcb-gdas/observation_statistics/aero"
66

77
# Assimilation window
88
# -------------------

‎parm/anlstat/anlstat_config.yaml.j2‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
jedi_config:
22
aero:
33
rundir: '{{ DATA }}/aero'
4-
exe_src: '{{ EXECgfs }}/gdas_ioda-stats.x'
4+
exe_src: '{{ EXECglobal }}/gdas_ioda-stats.x'
55
mpi_cmd: '{{ APRUN_ANLSTAT }}'
6-
jcb_base_yaml: '{{ PARMgfs }}/gdas/anlstat/aero/jcb-base.yaml.j2'
6+
jcb_base_yaml: '{{ PARMglobal }}/gdas/anlstat/aero/jcb-base.yaml.j2'
77
jcb_algo: 'anlstat'
8-
obs_list_yaml: '{{ PARMgfs }}/gdas/anlstat/aero/aero_obs_list.yaml.j2'
8+
obs_list_yaml: '{{ PARMglobal }}/gdas/anlstat/aero/aero_obs_list.yaml.j2'
99
atmos:
1010
rundir: '{{ DATA }}/atmos'
11-
exe_src: '{{ EXECgfs }}/gdas_ioda-stats.x'
11+
exe_src: '{{ EXECglobal }}/gdas_ioda-stats.x'
1212
mpi_cmd: '{{ APRUN_ANLSTAT }}'
13-
jcb_base_yaml: '{{ PARMgfs }}/gdas/anlstat/atmos/jcb-base.yaml.j2'
13+
jcb_base_yaml: '{{ PARMglobal }}/gdas/anlstat/atmos/jcb-base.yaml.j2'
1414
jcb_algo: 'anlstat'
15-
obs_list_yaml: '{{ PARMgfs }}/gdas/anlstat/atmos/atmos_obs_list.yaml.j2'
15+
obs_list_yaml: '{{ PARMglobal }}/gdas/anlstat/atmos/atmos_obs_list.yaml.j2'
1616
atmos_gsi:
1717
rundir: '{{ DATA }}/atmos_gsi'
18-
exe_src: '{{ EXECgfs }}/gdas_ioda-stats.x'
18+
exe_src: '{{ EXECglobal }}/gdas_ioda-stats.x'
1919
mpi_cmd: '{{ APRUN_ANLSTAT }}'
20-
jcb_base_yaml: '{{ PARMgfs }}/gdas/anlstat/atmos_gsi/jcb-base.yaml.j2'
20+
jcb_base_yaml: '{{ PARMglobal }}/gdas/anlstat/atmos_gsi/jcb-base.yaml.j2'
2121
jcb_algo: 'anlstat'
22-
obs_list_yaml: '{{ PARMgfs }}/gdas/anlstat/atmos_gsi/atmos_gsi_obs_list.yaml.j2'
22+
obs_list_yaml: '{{ PARMglobal }}/gdas/anlstat/atmos_gsi/atmos_gsi_obs_list.yaml.j2'
2323
snow:
2424
rundir: '{{ DATA }}/snow'
25-
exe_src: '{{ EXECgfs }}/gdas_ioda-stats.x'
25+
exe_src: '{{ EXECglobal }}/gdas_ioda-stats.x'
2626
mpi_cmd: '{{ APRUN_ANLSTAT }}'
27-
jcb_base_yaml: '{{ PARMgfs }}/gdas/anlstat/snow/jcb-base.yaml.j2'
27+
jcb_base_yaml: '{{ PARMglobal }}/gdas/anlstat/snow/jcb-base.yaml.j2'
2828
jcb_algo: 'anlstat'
29-
obs_list_yaml: '{{ PARMgfs }}/gdas/anlstat/snow/snow_obs_list.yaml.j2'
29+
obs_list_yaml: '{{ PARMglobal }}/gdas/anlstat/snow/snow_obs_list.yaml.j2'
3030

3131
data_in:
3232
mkdir:

‎parm/anlstat/atmos/jcb-base.yaml.j2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Search path for model and obs for JCB
22
# -------------------------------------
3-
algorithm_path: "{{ PARMgfs }}/gdas/jcb-algorithms"
4-
app_path_algorithm: "{{ PARMgfs }}/gdas/jcb-gdas/algorithm/observation_statistics"
5-
app_path_observations: "{{ PARMgfs }}/gdas/jcb-gdas/observation_statistics/atmosphere"
3+
algorithm_path: "{{ PARMglobal }}/gdas/jcb-algorithms"
4+
app_path_algorithm: "{{ PARMglobal }}/gdas/jcb-gdas/algorithm/observation_statistics"
5+
app_path_observations: "{{ PARMglobal }}/gdas/jcb-gdas/observation_statistics/atmosphere"
66

77
# Assimilation window
88
# -------------------

‎parm/anlstat/atmos_gsi/jcb-base.yaml.j2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Search path for model and obs for JCB
22
# -------------------------------------
3-
algorithm_path: "{{ PARMgfs }}/gdas/jcb-algorithms"
4-
app_path_algorithm: "{{ PARMgfs }}/gdas/jcb-gdas/algorithm/observation_statistics"
5-
app_path_observations: "{{ PARMgfs }}/gdas/jcb-gdas/observation_statistics/atmosphere_gsi"
3+
algorithm_path: "{{ PARMglobal }}/gdas/jcb-algorithms"
4+
app_path_algorithm: "{{ PARMglobal }}/gdas/jcb-gdas/algorithm/observation_statistics"
5+
app_path_observations: "{{ PARMglobal }}/gdas/jcb-gdas/observation_statistics/atmosphere_gsi"
66

77
# Assimilation window
88
# -------------------

0 commit comments

Comments
 (0)