Merge pull request #478 from NCAR/fluxnet_converter

Fluxnet observation converter
NCAR · Sep 18, 2023 · 6eeb453 · 6eeb453
2 parents 70e6af8 + 06c13cf
commit 6eeb453
Show file tree

Hide file tree

Showing 10 changed files with 1,544 additions and 12 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -22,6 +22,23 @@ individual files.
 
 The changes are now listed with the most recent at the top.
 
+**September 18 2023 :: Fluxnet observation converter and obs_def_rttov13_mod.f90 bug-fixes. Tag v10.8.4**
+
+Fluxnet obs converter:
+
+- Generates a new observation converter (Fluxnetfull_to_obs) for eddy 
+  covariance flux tower data (carbon, water energy fluxes)
+- Documentation changes made to the older, deprecated ameriflux 
+  converter (level4_to_obs) and the broken links have been fixed
+- New flux tower observation types added to accomodate the forward 
+  operator approach for time aggregated fluxes (daily through monthly)
+
+obs_def_rttov13_mod.f90 bug-fixes:
+
+- Added public get_channel to obs_def_rttov13_mod.f90 to compile WRF 
+  successfully with rttov13.
+- Removed cloud_overlap (integer) from the function: get_rttov_option_logical
+
 **August 21 2023 :: CAM-FV shell scripts. Tag v10.8.3**
 
 Performance improvements for CAM-FV shell scripts:

diff --git a/conf.py b/conf.py
@@ -21,7 +21,7 @@
 author = 'Data Assimilation Research Section'
 
 # The full version, including alpha/beta/rc tags
-release = '10.8.3'
+release = '10.8.4'
 root_doc = 'index'
 
 # -- General configuration ---------------------------------------------------

diff --git a/guide/important-capabilities-dart.rst b/guide/important-capabilities-dart.rst
@@ -76,7 +76,9 @@ is as follows:
 +------------------------------------------------------------------------------------------------------+-------------------+-----------------------------------+
 | `Aviso <https://www.aviso.altimetry.fr/en/home.html>`__: satellite derived sea surface height        | Aviso             | netCDF                            |
 +------------------------------------------------------------------------------------------------------+-------------------+-----------------------------------+
-| Level 4 Flux Tower data from `AmeriFlux <http://ameriflux.lbl.gov/>`__                               | Ameriflux         | Comma-separated text              |
+| Level 4 Flux Tower data                                                                              | Ameriflux         | Comma-separated text              |
++------------------------------------------------------------------------------------------------------+-------------------+-----------------------------------+
+| Ameriflux Fullset Flux Tower data from `AmeriFlux <https://ameriflux.lbl.gov/data/download-data>`__  | Ameriflux         | Comma-separated text              |
 +------------------------------------------------------------------------------------------------------+-------------------+-----------------------------------+
 | Level 2 soil moisture from `COSMOS <http://cosmos.hwr.arizona.edu/>`__                               | COSMOS            | Fixed-width text                  |
 +------------------------------------------------------------------------------------------------------+-------------------+-----------------------------------+
@@ -104,6 +106,8 @@ is as follows:
 +------------------------------------------------------------------------------------------------------+-------------------+-----------------------------------+
 | Sea surface temperature                                                                              | SST               | netCDF                            |
 +------------------------------------------------------------------------------------------------------+-------------------+-----------------------------------+
+| Solar-Induced Fluorescence                                                                           | SIF               | netCDF                            |
++------------------------------------------------------------------------------------------------------+-------------------+-----------------------------------+
 | Special Sensor Ultraviolet Spectrographic Imager `(SSUSI) <https://ssusi.jhuapl.edu/>`__ retrievals  | SSUSI             | netCDF                            |
 +------------------------------------------------------------------------------------------------------+-------------------+-----------------------------------+
 | World Ocean Database `(WOD) <http://www.nodc.noaa.gov/OC5/WOD09/pr_wod09.html>`__                    | WOD               | World Ocean Database packed ASCII |

diff --git a/observations/forward_operators/obs_def_rttov13_mod.f90 b/observations/forward_operators/obs_def_rttov13_mod.f90
@@ -397,7 +397,8 @@ module obs_def_rttov_mod
                 write_rttov_metadata, &
           interactive_rttov_metadata, &
                get_expected_radiance, &
-            get_rttov_option_logical
+            get_rttov_option_logical, &
+                         get_channel
 
 ! The rttov_test.f90 program uses these, but no one else should.
 
@@ -4238,8 +4239,6 @@ function get_rttov_option_logical(field_name) result(p)
          p = USER_CLD_OPT_PARAM
       case('GRID_BOX_AVG_CLOUD')
          p = GRID_BOX_AVG_CLOUD
-      case('CLOUD_OVERLAP')
-         p = cloud_overlap
       case('ADDPC')
          p = ADDPC
       case('ADDRADREC')