From 8ee3a8e01ef13b2767c72810de51197ab12a23b4 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Fri, 24 May 2024 12:27:57 +0000 Subject: [PATCH 1/5] Initial commit --- 3dvar.yaml.j2 | 9 +++++++++ local_ensemble_da.yaml.j2 | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/3dvar.yaml.j2 b/3dvar.yaml.j2 index 725e76e..c497de7 100644 --- a/3dvar.yaml.j2 +++ b/3dvar.yaml.j2 @@ -98,3 +98,12 @@ output: {% set output_file = output_file|default('output', true) ~ '.yaml.j2' %} {% include output_file %} {% endif %} + +# Optionally test the application +{% if test_file is defined %} +test: +{% filter indent(width=2) %} +{% set test_file = test_file|default('test', true) ~ '.yaml.j2' %} +{% include test_file %} +{% endfilter %} +{% endif %} \ No newline at end of file diff --git a/local_ensemble_da.yaml.j2 b/local_ensemble_da.yaml.j2 index dd99c8c..6d3d459 100644 --- a/local_ensemble_da.yaml.j2 +++ b/local_ensemble_da.yaml.j2 @@ -168,3 +168,12 @@ output variance posterior: {% include output_variance_posterior_file %} {% endfilter %} {% endif %} + +# Optionally test the application +{% if test_file is defined %} +test: +{% filter indent(width=2) %} +{% set test_file = test_file|default('test', true) ~ '.yaml.j2' %} +{% include test_file %} +{% endfilter %} +{% endif %} \ No newline at end of file From f737db57fd6b690783382b11e92782d6806da635 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA <134300700+DavidNew-NOAA@users.noreply.github.com> Date: Fri, 24 May 2024 11:28:25 -0400 Subject: [PATCH 2/5] Update 3dvar.yaml.j2 --- 3dvar.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3dvar.yaml.j2 b/3dvar.yaml.j2 index c497de7..a5e0478 100644 --- a/3dvar.yaml.j2 +++ b/3dvar.yaml.j2 @@ -106,4 +106,4 @@ test: {% set test_file = test_file|default('test', true) ~ '.yaml.j2' %} {% include test_file %} {% endfilter %} -{% endif %} \ No newline at end of file +{% endif %} From 3366cc67379ed59dab30b89c46993905bf13c62e Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA <134300700+DavidNew-NOAA@users.noreply.github.com> Date: Fri, 24 May 2024 11:28:50 -0400 Subject: [PATCH 3/5] Update local_ensemble_da.yaml.j2 --- local_ensemble_da.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local_ensemble_da.yaml.j2 b/local_ensemble_da.yaml.j2 index 6d3d459..e9adbeb 100644 --- a/local_ensemble_da.yaml.j2 +++ b/local_ensemble_da.yaml.j2 @@ -176,4 +176,4 @@ test: {% set test_file = test_file|default('test', true) ~ '.yaml.j2' %} {% include test_file %} {% endfilter %} -{% endif %} \ No newline at end of file +{% endif %} From 1257b3e2d7c72b601bc53cf1b55e93168877ba38 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA Date: Fri, 24 May 2024 18:09:10 +0000 Subject: [PATCH 4/5] Make things more generic --- 3dvar.yaml.j2 | 19 ++++++++++++++----- local_ensemble_da.yaml.j2 | 19 ++++++++++++++----- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/3dvar.yaml.j2 b/3dvar.yaml.j2 index c497de7..ce9a79c 100644 --- a/3dvar.yaml.j2 +++ b/3dvar.yaml.j2 @@ -100,10 +100,19 @@ output: {% endif %} # Optionally test the application -{% if test_file is defined %} +{% if test_reference_filename is defined %} test: -{% filter indent(width=2) %} -{% set test_file = test_file|default('test', true) ~ '.yaml.j2' %} -{% include test_file %} -{% endfilter %} + reference filename: {{test_reference_filename}} +{% if test_output_filename is defined %} + test output filename: {{test_output_filename}} +{% endif %} +{% if log_output_filename is defined %} + log output filename: {{log_output_filename}} +{% endif %} +{% if mpi_pattern is defined %} + mpi pattern: {{mpi_pattern}} +{% endif %} + float relative tolerance: {{test_float_relative_tolerance | default(1.0e-6, true)}} + float absolute tolerance: {{test_float_absolute_tolerance | default(0.0, true) }} + integer tolerance: {{test_integer_tolerance | default(0, true) }} {% endif %} \ No newline at end of file diff --git a/local_ensemble_da.yaml.j2 b/local_ensemble_da.yaml.j2 index 6d3d459..4a0b876 100644 --- a/local_ensemble_da.yaml.j2 +++ b/local_ensemble_da.yaml.j2 @@ -170,10 +170,19 @@ output variance posterior: {% endif %} # Optionally test the application -{% if test_file is defined %} +{% if test_reference_filename is defined %} test: -{% filter indent(width=2) %} -{% set test_file = test_file|default('test', true) ~ '.yaml.j2' %} -{% include test_file %} -{% endfilter %} + reference filename: {{test_reference_filename}} +{% if test_output_filename is defined %} + test output filename: {{test_output_filename}} +{% endif %} +{% if log_output_filename is defined %} + log output filename: {{log_output_filename}} +{% endif %} +{% if mpi_pattern is defined %} + mpi pattern: {{mpi_pattern}} +{% endif %} + float relative tolerance: {{test_float_relative_tolerance | default(1.0e-6, true)}} + float absolute tolerance: {{test_float_absolute_tolerance | default(0.0, true) }} + integer tolerance: {{test_integer_tolerance | default(0, true) }} {% endif %} \ No newline at end of file From 362bc58dde4590effc330325f7c37f4fff60be77 Mon Sep 17 00:00:00 2001 From: DavidNew-NOAA <134300700+DavidNew-NOAA@users.noreply.github.com> Date: Fri, 24 May 2024 14:12:37 -0400 Subject: [PATCH 5/5] Update 3dvar.yaml.j2 --- 3dvar.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3dvar.yaml.j2 b/3dvar.yaml.j2 index ce9a79c..8c5d6da 100644 --- a/3dvar.yaml.j2 +++ b/3dvar.yaml.j2 @@ -115,4 +115,4 @@ test: float relative tolerance: {{test_float_relative_tolerance | default(1.0e-6, true)}} float absolute tolerance: {{test_float_absolute_tolerance | default(0.0, true) }} integer tolerance: {{test_integer_tolerance | default(0, true) }} -{% endif %} \ No newline at end of file +{% endif %}