Skip to content

Commit 69a6475

Browse files
mer-a-omer-a-o
authored
Merge pull request #1526 from JCSDA-internal/release/mpas-1.0
Release/mpas 1.0
2 parents 2af9b91 + 2b7c010 commit 69a6475

File tree

771 files changed

+32683
-6895
lines changed

Some content is hidden

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

771 files changed

+32683
-6895
lines changed

‎CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
cmake_minimum_required( VERSION 3.12 )
1111

12-
project( ufo VERSION 1.1.0 LANGUAGES C CXX Fortran )
12+
project( ufo VERSION 1.2.0 LANGUAGES C CXX Fortran )
1313

1414
## Ecbuild integration
1515
find_package( ecbuild 3.3.2 REQUIRED )

‎LICENSE ‎LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright [yyyy] [name of copyright owner]
189+
Copyright 2017-2021 UCAR
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

‎README.md

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
GNU:[![AWS-gnu](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiVjRjeGRXc2EyQit2Z3J4YXNWYjl3dGpWaFMyc0V4UkxGR25PS29VSXN1Z3ExbjJwNHBjRVZCUUptV243dlNWUFFtSmdxS1k5VHBwK25HeHdNbXJmTlFRPSIsIml2UGFyYW1ldGVyU3BlYyI6InM4dW1jYjE1enUxU216Y3UiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/projects/automated-testing-ufo-gnu/history?region=us-east-1)
1+
### Continuous integration:
2+
| Platform | JCSDA-internal | JCSDA |
3+
| ------------- | ------------- |------------- |
4+
| GNU | [![AWS-gnu](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiVngyM2gvQ3d4dzRMb1c0ZmJKa2xnWmtTTHFhVEFoWFZNTHFBNWZTQ3ZrUlhVeldqNHFRQlVxbHJrRUs5MDlPRkhvZkt6K1kyaUs1UkJzaEpSSkZaRllNPSIsIml2UGFyYW1ldGVyU3BlYyI6IjJtd3F5dlk0WDhuUGRrWGkiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/ufo-internal-gnu/history) | [![AWS-gnu](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiVjRjeGRXc2EyQit2Z3J4YXNWYjl3dGpWaFMyc0V4UkxGR25PS29VSXN1Z3ExbjJwNHBjRVZCUUptV243dlNWUFFtSmdxS1k5VHBwK25HeHdNbXJmTlFRPSIsIml2UGFyYW1ldGVyU3BlYyI6InM4dW1jYjE1enUxU216Y3UiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/automated-testing-ufo-gnu/history)
5+
| Intel | [![AWS-intel](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiSnVxeG5qNndXd3JyZk1MaHJKODRCVlJXRTNnV2NnSGNzUGMxcFNaY3NnK3oyS0hHaklCdG8vK0VDeFZlSVFRLzhDZVBOMExPM29ncVQ2Z255KzVXWmg4PSIsIml2UGFyYW1ldGVyU3BlYyI6ImRtQ09kb0RjVG5ObWI2Vm8iLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/ufo-internal-intel/history) | [![AWS-intel](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiVjRjeGRXc2EyQit2Z3J4YXNWYjl3dGpWaFMyc0V4UkxGR25PS29VSXN1Z3ExbjJwNHBjRVZCUUptV243dlNWUFFtSmdxS1k5VHBwK25HeHdNbXJmTlFRPSIsIml2UGFyYW1ldGVyU3BlYyI6InM4dW1jYjE1enUxU216Y3UiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/automated-testing-ufo-gnu/history)
6+
| CLANG | [![AWS-clang](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiWEI0Z2xCa0NpdlpNVTdLNEJGRWR5aEJ5NkpKdjNTT2ZQMURJWG5GNFZQUjV4Mkc4R1I2M3NGbEtUYzM2MCthdzZDeDVjS0NVSjB1R3h1TUFCYkdNb0RrPSIsIml2UGFyYW1ldGVyU3BlYyI6ImdrWGZnaXhzSG9pcDBMa0IiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/ufo-internal-clang/history) | [![AWS-clang](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiVU1vbVR2Y0twa3NpWHRoMUhraGlreU9Da2t5RVpZQk9kV3NrL2hTc0szdXRlaCszVzhHRndrd0VqcnpSb2lyL2VCRXNtK1Y4WG5LRHVxbldteFArU2IwPSIsIml2UGFyYW1ldGVyU3BlYyI6IkpQUTRlaThyRWVkWEJjNEwiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/469205354006/projects/automated-testing-ufo-clang/history)
7+
| Code Coverage | [![codecov](https://codecov.io/gh/JCSDA/ufo/branch/develop/graph/badge.svg?token=nxhUKP82Pd)](https://codecov.io/gh/JCSDA-internal/ufo) |
28

3-
INTEL:[![AWS-intel](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiUGxUMXUrdkNTVURCcjlwaTFlVlZ5eklHWGNodVdlWko2M0phM0lTRVIrWS9OcWQraWpwN3FvL240N2FDZWdEZGF3dU9vSHZHS1lFbEVJd2M5M1NWWHUwPSIsIml2UGFyYW1ldGVyU3BlYyI6Ii8xWTZDL0VxV1hNSE1LVHMiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://console.aws.amazon.com/codesuite/codebuild/projects/automated-testing-ufo-intel/history?region=us-east-1)
4-
5-
CLANG: [![AWS_clang](https://codebuild.us-east-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiVU1vbVR2Y0twa3NpWHRoMUhraGlreU9Da2t5RVpZQk9kV3NrL2hTc0szdXRlaCszVzhHRndrd0VqcnpSb2lyL2VCRXNtK1Y4WG5LRHVxbldteFArU2IwPSIsIml2UGFyYW1ldGVyU3BlYyI6IkpQUTRlaThyRWVkWEJjNEwiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=develop)](https://us-east-1.console.aws.amazon.com/codesuite/codebuild/projects/automated-testing-ufo-clang/history?region=us-east-1)
6-
7-
[![codecov](https://codecov.io/gh/JCSDA/ufo/branch/develop/graph/badge.svg?token=nxhUKP82Pd)](https://codecov.io/gh/JCSDA/ufo)
89

910
Unified Forward Operators for Joint Effort for Data assimilation Integration (JEDI) project.
1011

11-
(C) Copyright 2017-2019 UCAR.
12+
(C) Copyright 2017-2021 UCAR.
1213

1314
This software is licensed under the terms of the Apache Licence Version 2.0
1415
which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.

‎docs/Doxyfile.in

+1-8
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,7 @@ RECURSIVE = YES
909909
# Note that relative paths are relative to the directory from which doxygen is
910910
# run.
911911

912-
#EXCLUDE = @CMAKE_CURRENT_SOURCE_DIR@/../src/util
912+
EXCLUDE = @CMAKE_CURRENT_SOURCE_DIR@/../test/testinput/reference/README.md
913913

914914
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
915915
# directories that are symbolic links (a Unix file system feature) are excluded
@@ -1126,13 +1126,6 @@ VERBATIM_HEADERS = YES
11261126

11271127
ALPHABETICAL_INDEX = YES
11281128

1129-
# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
1130-
# which the alphabetical index list will be split.
1131-
# Minimum value: 1, maximum value: 20, default value: 5.
1132-
# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
1133-
1134-
COLS_IN_ALPHA_INDEX = 5
1135-
11361129
# In case all classes in a project start with a common prefix, all classes will
11371130
# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
11381131
# can be used to specify a prefix (or a list of prefixes) that should be ignored

‎docs/mainpage.h

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#pragma once
2+
3+
// This file defines what appears on the Main Page of the documentation
4+
// generated by doxygen. The file contains no code, and does not appear
5+
// in any cpp include statement.
6+
//
7+
/*!
8+
* \mainpage Unified Forward Operator (UFO)
9+
*
10+
* UFO provides the observational operators needed to compute departures and innovations. In other words, it enables the comparison between model forecasts and observations that lies at the heart of the data assimilation process. UFO also provides related functionality related to observations such as quality control (QC) filters and variational bias correction.
11+
*
12+
*/

‎ewok/aircraft.yaml

-13
This file was deleted.

‎ewok/jedi-gdas/airs_aqua.yaml

+6-11
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,17 @@ obs bias:
4040
predictors:
4141
- name: constant
4242
- name: lapse_rate
43-
options:
44-
order: 2
45-
tlapse: &airs_aqua_tlapse $(experiment_dir)/{{current_cycle}}/airs_aqua.{{background_time}}.tlapse.txt
43+
order: 2
44+
tlapse: &airs_aqua_tlapse $(experiment_dir)/{{current_cycle}}/airs_aqua.{{background_time}}.tlapse.txt
4645
- name: lapse_rate
47-
options:
48-
tlapse: *airs_aqua_tlapse
46+
tlapse: *airs_aqua_tlapse
4947
- name: emissivity
5048
- name: scan_angle
51-
options:
52-
order: 4
49+
order: 4
5350
- name: scan_angle
54-
options:
55-
order: 3
51+
order: 3
5652
- name: scan_angle
57-
options:
58-
order: 2
53+
order: 2
5954
- name: scan_angle
6055
obs filters:
6156
# Wavenumber Check

‎ewok/jedi-gdas/amsua_aqua.yaml

+6-15
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,18 @@ obs bias:
2020
variational bc:
2121
predictors:
2222
- name: constant
23-
- name: cosine_of_latitude_times_orbit_node
24-
options:
25-
preconditioner: 0.01
26-
- name: sine_of_latitude
2723
- name: lapse_rate
28-
options:
29-
order: 2
30-
tlapse: &amsua_aqua_tlapse $(experiment_dir)/{{current_cycle}}/amsua_aqua.{{background_time}}.tlapse.txt
24+
order: 2
25+
tlapse: &amsua_aqua_tlapse $(experiment_dir)/{{current_cycle}}/amsua_aqua.{{background_time}}.tlapse.txt
3126
- name: lapse_rate
32-
options:
33-
tlapse: *amsua_aqua_tlapse
27+
tlapse: *amsua_aqua_tlapse
3428
- name: emissivity
3529
- name: scan_angle
36-
options:
37-
order: 4
30+
order: 4
3831
- name: scan_angle
39-
options:
40-
order: 3
32+
order: 3
4133
- name: scan_angle
42-
options:
43-
order: 2
34+
order: 2
4435
- name: scan_angle
4536
obs filters:
4637
- filter: BlackList

‎ewok/jedi-gdas/amsua_metop-a.yaml

+6-15
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,18 @@ obs bias:
2020
variational bc:
2121
predictors:
2222
- name: constant
23-
- name: cosine_of_latitude_times_orbit_node
24-
options:
25-
preconditioner: 0.01
26-
- name: sine_of_latitude
2723
- name: lapse_rate
28-
options:
29-
order: 2
30-
tlapse: &amsua_metop-a_tlapse $(experiment_dir)/{{current_cycle}}/amsua_metop-a.{{background_time}}.tlapse.txt
24+
order: 2
25+
tlapse: &amsua_metop-a_tlapse $(experiment_dir)/{{current_cycle}}/amsua_metop-a.{{background_time}}.tlapse.txt
3126
- name: lapse_rate
32-
options:
33-
tlapse: *amsua_metop-a_tlapse
27+
tlapse: *amsua_metop-a_tlapse
3428
- name: emissivity
3529
- name: scan_angle
36-
options:
37-
order: 4
30+
order: 4
3831
- name: scan_angle
39-
options:
40-
order: 3
32+
order: 3
4133
- name: scan_angle
42-
options:
43-
order: 2
34+
order: 2
4435
- name: scan_angle
4536
obs filters:
4637
- filter: BlackList

‎ewok/jedi-gdas/amsua_metop-b.yaml

+6-15
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,18 @@ obs bias:
2020
variational bc:
2121
predictors:
2222
- name: constant
23-
- name: cosine_of_latitude_times_orbit_node
24-
options:
25-
preconditioner: 0.01
26-
- name: sine_of_latitude
2723
- name: lapse_rate
28-
options:
29-
order: 2
30-
tlapse: &amsua_metop-b_tlapse $(experiment_dir)/{{current_cycle}}/amsua_metop-b.{{background_time}}.tlapse.txt
24+
order: 2
25+
tlapse: &amsua_metop-b_tlapse $(experiment_dir)/{{current_cycle}}/amsua_metop-b.{{background_time}}.tlapse.txt
3126
- name: lapse_rate
32-
options:
33-
tlapse: *amsua_metop-b_tlapse
27+
tlapse: *amsua_metop-b_tlapse
3428
- name: emissivity
3529
- name: scan_angle
36-
options:
37-
order: 4
30+
order: 4
3831
- name: scan_angle
39-
options:
40-
order: 3
32+
order: 3
4133
- name: scan_angle
42-
options:
43-
order: 2
34+
order: 2
4435
- name: scan_angle
4536
obs filters:
4637
- filter: BlackList

‎ewok/jedi-gdas/amsua_metop-c.yaml

+6-15
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,18 @@ obs bias:
2020
variational bc:
2121
predictors:
2222
- name: constant
23-
- name: cosine_of_latitude_times_orbit_node
24-
options:
25-
preconditioner: 0.01
26-
- name: sine_of_latitude
2723
- name: lapse_rate
28-
options:
29-
order: 2
30-
tlapse: &amsua_metop-c_tlapse $(experiment_dir)/{{current_cycle}}/amsua_metop-c.{{background_time}}.tlapse.txt
24+
order: 2
25+
tlapse: &amsua_metop-c_tlapse $(experiment_dir)/{{current_cycle}}/amsua_metop-c.{{background_time}}.tlapse.txt
3126
- name: lapse_rate
32-
options:
33-
tlapse: *amsua_metop-c_tlapse
27+
tlapse: *amsua_metop-c_tlapse
3428
- name: emissivity
3529
- name: scan_angle
36-
options:
37-
order: 4
30+
order: 4
3831
- name: scan_angle
39-
options:
40-
order: 3
32+
order: 3
4133
- name: scan_angle
42-
options:
43-
order: 2
34+
order: 2
4435
- name: scan_angle
4536
obs filters:
4637
- filter: BlackList

‎ewok/jedi-gdas/amsua_n15.yaml

+6-15
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,18 @@ obs bias:
2020
variational bc:
2121
predictors:
2222
- name: constant
23-
- name: cosine_of_latitude_times_orbit_node
24-
options:
25-
preconditioner: 0.01
26-
- name: sine_of_latitude
2723
- name: lapse_rate
28-
options:
29-
order: 2
30-
tlapse: &amsua_n15_tlapse $(experiment_dir)/{{current_cycle}}/amsua_n15.{{background_time}}.tlapse.txt
24+
order: 2
25+
tlapse: &amsua_n15_tlapse $(experiment_dir)/{{current_cycle}}/amsua_n15.{{background_time}}.tlapse.txt
3126
- name: lapse_rate
32-
options:
33-
tlapse: *amsua_n15_tlapse
27+
tlapse: *amsua_n15_tlapse
3428
- name: emissivity
3529
- name: scan_angle
36-
options:
37-
order: 4
30+
order: 4
3831
- name: scan_angle
39-
options:
40-
order: 3
32+
order: 3
4133
- name: scan_angle
42-
options:
43-
order: 2
34+
order: 2
4435
- name: scan_angle
4536
obs filters:
4637
- filter: BlackList

‎ewok/jedi-gdas/amsua_n18.yaml

+6-15
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,18 @@ obs bias:
2020
variational bc:
2121
predictors:
2222
- name: constant
23-
- name: cosine_of_latitude_times_orbit_node
24-
options:
25-
preconditioner: 0.01
26-
- name: sine_of_latitude
2723
- name: lapse_rate
28-
options:
29-
order: 2
30-
tlapse: &amsua_n18_tlapse $(experiment_dir)/{{current_cycle}}/amsua_n18.{{background_time}}.tlapse.txt
24+
order: 2
25+
tlapse: &amsua_n18_tlapse $(experiment_dir)/{{current_cycle}}/amsua_n18.{{background_time}}.tlapse.txt
3126
- name: lapse_rate
32-
options:
33-
tlapse: *amsua_n18_tlapse
27+
tlapse: *amsua_n18_tlapse
3428
- name: emissivity
3529
- name: scan_angle
36-
options:
37-
order: 4
30+
order: 4
3831
- name: scan_angle
39-
options:
40-
order: 3
32+
order: 3
4133
- name: scan_angle
42-
options:
43-
order: 2
34+
order: 2
4435
- name: scan_angle
4536
obs filters:
4637
- filter: BlackList

‎ewok/jedi-gdas/amsua_n19.yaml

+6-15
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,18 @@ obs bias:
2020
variational bc:
2121
predictors:
2222
- name: constant
23-
- name: cosine_of_latitude_times_orbit_node
24-
options:
25-
preconditioner: 0.01
26-
- name: sine_of_latitude
2723
- name: lapse_rate
28-
options:
29-
order: 2
30-
tlapse: &amsua_n19_tlapse $(experiment_dir)/{{current_cycle}}/amsua_n19.{{background_time}}.tlapse.txt
24+
order: 2
25+
tlapse: &amsua_n19_tlapse $(experiment_dir)/{{current_cycle}}/amsua_n19.{{background_time}}.tlapse.txt
3126
- name: lapse_rate
32-
options:
33-
tlapse: *amsua_n19_tlapse
27+
tlapse: *amsua_n19_tlapse
3428
- name: emissivity
3529
- name: scan_angle
36-
options:
37-
order: 4
30+
order: 4
3831
- name: scan_angle
39-
options:
40-
order: 3
32+
order: 3
4133
- name: scan_angle
42-
options:
43-
order: 2
34+
order: 2
4435
- name: scan_angle
4536
obs filters:
4637
- filter: BlackList

‎ewok/jedi-gdas/atms_n20.yaml

+6-15
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,18 @@ obs bias:
2020
variational bc:
2121
predictors:
2222
- name: constant
23-
- name: cosine_of_latitude_times_orbit_node
24-
options:
25-
preconditioner: 0.01
26-
- name: sine_of_latitude
2723
- name: lapse_rate
28-
options:
29-
order: 2
30-
tlapse: &atms_n20_tlapse $(experiment_dir)/{{current_cycle}}/atms_n20.{{background_time}}.tlapse.txt
24+
order: 2
25+
tlapse: &atms_n20_tlapse $(experiment_dir)/{{current_cycle}}/atms_n20.{{background_time}}.tlapse.txt
3126
- name: lapse_rate
32-
options:
33-
tlapse: *atms_n20_tlapse
27+
tlapse: *atms_n20_tlapse
3428
- name: emissivity
3529
- name: scan_angle
36-
options:
37-
order: 4
30+
order: 4
3831
- name: scan_angle
39-
options:
40-
order: 3
32+
order: 3
4133
- name: scan_angle
42-
options:
43-
order: 2
34+
order: 2
4435
- name: scan_angle
4536
obs filters:
4637
- filter: BlackList

0 commit comments

Comments
 (0)