Skip to content

Commit

Permalink
Merge branch 'develop' into feature/marineenvar
Browse files Browse the repository at this point in the history
  • Loading branch information
guillaumevernieres authored Dec 2, 2024
2 parents 6a6d515 + 4f50d78 commit c641930
Show file tree
Hide file tree
Showing 19 changed files with 254 additions and 66 deletions.
10 changes: 0 additions & 10 deletions parm/atm/jcb-prototype_3dvar-fv3inc.yaml.j2
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
# Algorithm
# ---------
algorithm: fv3jedi_fv3inc_variational

# Testing things
# --------------
{% if DO_TEST_MODE and RUN == 'gdas' %}
do_testing: true
test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/C96C48_ufs_hybatmDA_3dvar-fv3inc.ref
test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/C96C48_ufs_hybatmDA_3dvar-fv3inc.test.out
test_float_relative_tolerance: 1.0e-3
test_float_absolute_tolerance: 1.0e-5
{% endif %}
10 changes: 0 additions & 10 deletions parm/atm/jcb-prototype_3dvar.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,3 @@ observations:
# - scatwind_ascat_metop-a
# - snowcvr
# - abi_g16

# Testing things
# --------------
{% if DO_TEST_MODE and RUN == 'gdas' %}
do_testing: true
test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/C96C48_ufs_hybatmDA_3dvar.ref
test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/C96C48_ufs_hybatmDA_3dvar.test.out
test_float_relative_tolerance: 1.0e-3
test_float_absolute_tolerance: 1.0e-5
{% endif %}
10 changes: 0 additions & 10 deletions parm/atm/jcb-prototype_lgetkf-fv3inc.yaml.j2
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
# Algorithm
# ---------
algorithm: fv3jedi_fv3inc_lgetkf

# Testing things
# --------------
{% if DO_TEST_MODE and RUN == 'enkfgdas' %}
do_testing: true
test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/C96C48_ufs_hybatmDA_lgetkf-fv3inc.ref
test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/C96C48_ufs_hybatmDA_lgetkf-fv3inc.test.out
test_float_relative_tolerance: 1.0e-3
test_float_absolute_tolerance: 1.0e-5
{% endif %}
10 changes: 0 additions & 10 deletions parm/atm/jcb-prototype_lgetkf.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,3 @@ observations:
- satwnd.viirs_npp
# - scatwind_ascat_metop-a
# - snowcvr

# Testing things
# --------------
{% if DO_TEST_MODE and RUN == 'enkfgdas' %}
do_testing: true
test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/C96C48_ufs_hybatmDA_lgetkf.ref
test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/C96C48_ufs_hybatmDA_lgetkf.test.out
test_float_relative_tolerance: 1.0e-3
test_float_absolute_tolerance: 1.0e-5
{% endif %}
10 changes: 0 additions & 10 deletions parm/atm/jcb-prototype_lgetkf_observer.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,3 @@ atmosphere_obsdataout_prefix: diag_lobs_

# Distribution type
distribution_type: RoundRobin

# Testing things
# --------------
{% if DO_TEST_MODE and RUN == 'enkfgdas' %}
do_testing: true
test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/C96C48_ufs_hybatmDA_lgetkf_observer.ref
test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/C96C48_ufs_hybatmDA_lgetkf_observer.test.out
test_float_relative_tolerance: 1.0e-3
test_float_absolute_tolerance: 1.0e-5
{% endif %}
10 changes: 0 additions & 10 deletions parm/atm/jcb-prototype_lgetkf_solver.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,3 @@ atmosphere_obsdataout_prefix: diag_solv_

# Distribution type
distribution_type: Halo

# Testing things
# --------------
{% if DO_TEST_MODE and RUN == 'enkfgdas' %}
do_testing: true
test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/C96C48_ufs_hybatmDA_lgetkf_solver.ref
test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/C96C48_ufs_hybatmDA_lgetkf_solver.test.out
test_float_relative_tolerance: 1.0e-3
test_float_absolute_tolerance: 1.0e-5
{% endif %}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ algorithm: fv3jedi_fv3inc_variational

# Testing things
# --------------
{% if DO_TEST_MODE and RUN == 'gdas' %}
{% if DO_TEST_MODE == true and RUN == 'gdas' and current_cycle | to_YMDH == '2021032318' %}
do_testing: true
test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/atm_jjob_3dvar-fv3inc.ref
test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/atm_jjob_3dvar-fv3inc.test.out
Expand Down
2 changes: 1 addition & 1 deletion test/atm/global-workflow/jcb-prototype_3dvar.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ atmosphere_obsdatain_suffix: ".{{ current_cycle | to_YMDH }}.nc"

# Testing things
# --------------
{% if DO_TEST_MODE and RUN == 'gdas' %}
{% if DO_TEST_MODE == true and RUN == 'gdas' and current_cycle | to_YMDH == '2021032318' %}
do_testing: true
test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/atm_jjob_3dvar.ref
test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/atm_jjob_3dvar.test.out
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ algorithm: fv3jedi_fv3inc_lgetkf

# Testing things
# --------------
{% if DO_TEST_MODE and RUN == 'enkfgdas' %}
{% if DO_TEST_MODE == true and RUN == 'enkfgdas' and current_cycle | to_YMDH == '2021032318' %}
do_testing: true
test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/atm_jjob_lgetkf-fv3inc.ref
test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/atm_jjob_lgetkf-fv3inc.test.out
Expand Down
2 changes: 1 addition & 1 deletion test/atm/global-workflow/jcb-prototype_lgetkf.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ atmosphere_obsdatain_suffix: ".{{ current_cycle | to_YMDH }}.nc"

# Testing things
# --------------
{% if DO_TEST_MODE and RUN == 'enkfgdas' %}
{% if DO_TEST_MODE == true and RUN == 'enkfgdas' and current_cycle | to_YMDH == '2021032318' %}
do_testing: true
test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/atm_jjob_lgetkf.ref
test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/atm_jjob_lgetkf.test.out
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ distribution_type: RoundRobin

# Testing things
# --------------
{% if DO_TEST_MODE and RUN == 'enkfgdas' %}
{% if DO_TEST_MODE == true and RUN == 'enkfgdas' and current_cycle | to_YMDH == '2021032318' %}
do_testing: true
test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/atm_jjob_lgetkf_observer.ref
test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/atm_jjob_lgetkf_observer.test.out
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ distribution_type: Halo

# Testing things
# --------------
{% if DO_TEST_MODE and RUN == 'enkfgdas' %}
{% if DO_TEST_MODE == true and RUN == 'enkfgdas' and current_cycle | to_YMDH == '2021032318' %}
do_testing: true
test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/atm_jjob_lgetkf_solver.ref
test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/atm_jjob_lgetkf_solver.test.out
Expand Down
13 changes: 13 additions & 0 deletions test/gw-ci/atm/jcb-prototype_3dvar-fv3inc_ufs_hybatmDA.yaml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Algorithm
# ---------
algorithm: fv3jedi_fv3inc_variational

# Testing things
# --------------
{% if DO_TEST_MODE == true and RUN == 'gdas' and current_cycle | to_YMDH == '2024022400' %}
do_testing: true
test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/{{ CASE }}{{ CASE_ENS }}_ufs_hybatmDA_3dvar-fv3inc.ref
test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/{{ CASE }}{{ CASE_ENS }}_ufs_hybatmDA_3dvar-fv3inc.test.out
test_float_relative_tolerance: 1.0e-3
test_float_absolute_tolerance: 1.0e-5
{% endif %}
42 changes: 42 additions & 0 deletions test/gw-ci/atm/jcb-prototype_3dvar_ufs_hybatmDA.yaml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Algorithm
# ---------
algorithm: 3dvar

# Observation things
# ------------------
observations:
# - ADPSFC
# - ADPUPA
# - SFCSHP
- aircraft
- ascatw.ascat_metop-b
# - ascatw.ascat_metop-c
- atms_n20
# - atms_npp
- conventional_ps
- gnssro
# - gpsro
# - iasi_metop-a
# - iasi_metop-b
# - ompsnp_n20
- ompsnp_npp
# - ompstc_n20
- ompstc_npp
- satwnd.abi_goes-16
# - satwnd.abi_goes-18
# - satwnd.leogeo_multi
# - satwnd.viirs_n20
# - satwnd.viirs_npp
# - scatwind_ascat_metop-a
# - snowcvr
# - abi_g16

# Testing things
# --------------
{% if DO_TEST_MODE == true and RUN == 'gdas' and current_cycle | to_YMDH == '2024022400' %}
do_testing: true
test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/{{ CASE }}{{ CASE_ENS }}_ufs_hybatmDA_3dvar.ref
test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/{{ CASE }}{{ CASE_ENS }}_ufs_hybatmDA_3dvar.test.out
test_float_relative_tolerance: 1.0e-3
test_float_absolute_tolerance: 1.0e-5
{% endif %}
13 changes: 13 additions & 0 deletions test/gw-ci/atm/jcb-prototype_lgetkf-fv3inc_ufs_hybatmDA.yaml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Algorithm
# ---------
algorithm: fv3jedi_fv3inc_lgetkf

# Testing things
# --------------
{% if DO_TEST_MODE == true and RUN == 'enkfgdas' and current_cycle | to_YMDH == '2024022400' %}
do_testing: true
test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/{{ CASE }}{{ CASE_ENS }}_ufs_hybatmDA_lgetkf-fv3inc.ref
test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/{{ CASE }}{{ CASE_ENS }}_ufs_hybatmDA_lgetkf-fv3inc.test.out
test_float_relative_tolerance: 1.0e-3
test_float_absolute_tolerance: 1.0e-5
{% endif %}
56 changes: 56 additions & 0 deletions test/gw-ci/atm/jcb-prototype_lgetkf_observer_ufs_hybatmDA.yaml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# Use observations for lgetkf
# ---------------------------
app_path_observations: {{PARMgfs}}/gdas/jcb-gdas/observations/atmosphere-lgetkf
app_path_observation_chronicle: {{PARMgfs}}/gdas/jcb-gdas/observation_chronicle/atmosphere

# Algorithm
# ---------
algorithm: local_ensemble_da_observer

# Model things
# ------------
atmosphere_background_ensemble_path: ./bkg/mem%mem%

# Observation things
# ------------------
observations:
# - ADPSFC
# - ADPUPA
# - SFCSHP
- aircraft
- ascatw.ascat_metop-b
# - ascatw.ascat_metop-c
- atms_n20
# - atms_npp
- conventional_ps
- gnssro
# - gpsro
# - iasi_metop-a
# - iasi_metop-b
# - ompsnp_n20
- ompsnp_npp
# - ompstc_n20
- ompstc_npp
- satwnd.abi_goes-16
# - satwnd.abi_goes-18
# - satwnd.leogeo_multi
# - satwnd.viirs_n20
# - satwnd.viirs_npp
# - scatwind_ascat_metop-a
# - snowcvr

# Naming conventions for observation files
atmosphere_obsdataout_prefix: diag_lobs_

# Distribution type
distribution_type: RoundRobin

# Testing things
# --------------
{% if DO_TEST_MODE == true and RUN == 'enkfgdas' and current_cycle | to_YMDH == '2024022400' %}
do_testing: true
test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/{{ CASE }}{{ CASE_ENS }}_ufs_hybatmDA_lgetkf_observer.ref
test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/{{ CASE }}{{ CASE_ENS }}_ufs_hybatmDA_lgetkf_observer.test.out
test_float_relative_tolerance: 1.0e-3
test_float_absolute_tolerance: 1.0e-5
{% endif %}
59 changes: 59 additions & 0 deletions test/gw-ci/atm/jcb-prototype_lgetkf_solver_ufs_hybatmDA.yaml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# Use observations for lgetkf
# ---------------------------
app_path_observations: {{PARMgfs}}/gdas/jcb-gdas/observations/atmosphere-lgetkf
app_path_observation_chronicle: {{PARMgfs}}/gdas/jcb-gdas/observation_chronicle/atmosphere

# Algorithm
# ---------
algorithm: local_ensemble_da_solver

# Model things
# ------------
atmosphere_background_ensemble_path: ./bkg/mem%mem%

# Observation things
# ------------------
observations:
# - ADPSFC
# - ADPUPA
# - SFCSHP
- aircraft
- ascatw.ascat_metop-b
# - ascatw.ascat_metop-c
- atms_n20
# - atms_npp
- conventional_ps
- gnssro
# - gpsro
# - iasi_metop-a
# - iasi_metop-b
# - ompsnp_n20
- ompsnp_npp
# - ompstc_n20
- ompstc_npp
- satwnd.abi_goes-16
# - satwnd.abi_goes-18
# - satwnd.leogeo_multi
# - satwnd.viirs_n20
# - satwnd.viirs_npp
# - scatwind_ascat_metop-a
# - snowcvr

# Naming conventions for observation files
atmosphere_obsdatain_path: "{{atm_obsdataout_path}}"
atmosphere_obsdatain_prefix: diag_lobs_
atmosphere_obsdatain_suffix: "_{{ current_cycle | to_YMDH }}.nc"
atmosphere_obsdataout_prefix: diag_solv_

# Distribution type
distribution_type: Halo

# Testing things
# --------------
{% if DO_TEST_MODE == true and RUN == 'enkfgdas' and current_cycle | to_YMDH == '2024022400' %}
do_testing: true
test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/{{ CASE }}{{ CASE_ENS }}_ufs_hybatmDA_lgetkf_solver.ref
test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/{{ CASE }}{{ CASE_ENS }}_ufs_hybatmDA_lgetkf_solver.test.out
test_float_relative_tolerance: 1.0e-3
test_float_absolute_tolerance: 1.0e-5
{% endif %}
50 changes: 50 additions & 0 deletions test/gw-ci/atm/jcb-prototype_lgetkf_ufs_hybatmDA.yaml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# Use observations for lgetkf
# ---------------------------
app_path_observations: {{PARMgfs}}/gdas/jcb-gdas/observations/atmosphere-lgetkf
app_path_observation_chronicle: {{PARMgfs}}/gdas/jcb-gdas/observation_chronicle/atmosphere

# Algorithm
# ---------
algorithm: local_ensemble_da

# Model things
# ------------
atmosphere_background_ensemble_path: ./bkg/mem%mem%

# Observation things
# ------------------
observations:
# - ADPSFC
# - ADPUPA
# - SFCSHP
- aircraft
- ascatw.ascat_metop-b
# - ascatw.ascat_metop-c
- atms_n20
- atms_npp
- conventional_ps
- gnssro
# - gpsro
# - iasi_metop-a
# - iasi_metop-b
# - ompsnp_n20
- ompsnp_npp
# - ompstc_n20
- ompstc_npp
- satwnd.abi_goes-16
- satwnd.abi_goes-18
- satwnd.leogeo_multi
- satwnd.viirs_n20
- satwnd.viirs_npp
# - scatwind_ascat_metop-a
# - snowcvr

# Testing things
# --------------
{% if DO_TEST_MODE == true and RUN == 'enkfgdas' and current_cycle | to_YMDH == '2024022400' %}
do_testing: true
test_reference_filename: {{ HOMEgfs }}/sorc/gdas.cd/test/testreference/{{ CASE }}{{ CASE_ENS }}_ufs_hybatmDA_lgetkf.ref
test_output_filename: {{ HOMEgfs }}/sorc/gdas.cd/build/gdas/test/testoutput/{{ CASE }}{{ CASE_ENS }}_ufs_hybatmDA_lgetkf.test.out
test_float_relative_tolerance: 1.0e-3
test_float_absolute_tolerance: 1.0e-5
{% endif %}
15 changes: 15 additions & 0 deletions test/gw-ci/soca/jcb-prototype_3dfgat_3DVarAOWCDA.yaml.j2
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# JEDI algorithm being invoked
algorithm: 3dfgat

# Observations
observations: !INC ${OBS_LIST_SHORT}

# Testing things
# --------------
{% if DO_TEST_MODE == true and RUN == 'gdas' and current_cycle | to_YMDH == '2021032418' %}
do_testing: true
test_reference_filename: '{{HOMEgfs}}/sorc/gdas.cd/test/testreference/{{ CASE }}mx{{ OCNRES }}_3DVarAOWCDA_3dfgat.ref'
test_output_filename: '{{HOMEgfs}}/sorc/gdas.cd/build/gdas/test/testoutput/{{ CASE }}mx{{ OCNRES }}_3DVarAOWCDA_3dfgat.test.out'
test_float_relative_tolerance: 1.0e-3
test_float_absolute_tolerance: 1.0e-5
{% endif %}

0 comments on commit c641930

Please sign in to comment.