yoctoyotta1024 · yoctoyotta1024 · Apr 11, 2024 · Apr 9, 2024 · Apr 9, 2024 · Apr 9, 2024
diff --git a/docs/doxygen/doxygen.dox b/docs/doxygen/doxygen.dox
@@ -949,7 +949,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = ../libs/runcleo/ ../libs/superdrops/ ../libs/zarr2/ ../libs/observers2/
+INPUT                  = ../libs/runcleo/ ../libs/superdrops/ ../libs/zarr/ ../libs/observers/
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -6,7 +6,7 @@
 Author: Clara Bayley (CB)
 Additional Contributors:
 -----
-Last Modified: Wednesday 27th March 2024
+Last Modified: Tuesday 9th April 2024
 Modified By: CB
 -----
 License: BSD 3-Clause "New" or "Revised" License
@@ -76,8 +76,8 @@
 breathe_projects = {
     "runcleo"          : "../build/doxygen/xml/",
     "superdrops"       : "../build/doxygen/xml/",
-    "zarr2"            : "../build/doxygen/xml/",
-    "observers2"        : "../build/doxygen/xml/",
+    "zarr"             : "../build/doxygen/xml/",
+    "observers"        : "../build/doxygen/xml/",
 }
 
 breathe_default_project = 'proj'

diff --git a/docs/source/cxx/cxx.rst b/docs/source/cxx/cxx.rst
@@ -19,8 +19,8 @@ a SDM coupled to a Dynamics Solver.
 
    runcleo/runcleomod
    superdrops/superdropsmod
-   zarr2/zarr2mod
-   observers2/observers2mod
+   zarr/zarrmod
+   observers/observersmod
 
 Indices and tables
 ------------------

diff --git a/docs/source/cxx/observers/collect_data_for_dataset.rst b/docs/source/cxx/observers/collect_data_for_dataset.rst
@@ -0,0 +1,25 @@
+Collect Data For Dataset
+========================
+
+Header file: ``<libs/observers/collect_data_for_dataset.hpp>``
+`[source] <https://github.com/yoctoyotta1024/CLEO/blob/main/libs/observers/collect_data_for_dataset.hpp>`_
+
+.. doxygenconcept:: CollectDataForDataset
+   :project: observers
+
+.. doxygenstruct:: CombinedCollectDataForDataset
+   :project: observers
+   :private-members:
+   :protected-members:
+   :members:
+   :undoc-members:
+
+.. doxygenfunction:: operator>>(const CollectData1 a, const CollectData2 b)
+   :project: observers
+
+.. doxygenstruct:: NullCollectDataForDataset
+   :project: observers
+   :private-members:
+   :protected-members:
+   :members:
+   :undoc-members:
diff --git a/docs/source/cxx/observers/gbxindex_observer.rst b/docs/source/cxx/observers/gbxindex_observer.rst
@@ -0,0 +1,19 @@
+Gbxindex Observer
+=================
+
+Header file: ``<libs/observers/gbxindex_observer.hpp>``
+`[source] <https://github.com/yoctoyotta1024/CLEO/blob/main/libs/observers/gbxindex_observer.hpp>`_
+
+.. doxygenstruct:: GbxIndexFunctor
+   :project: observers
+   :private-members:
+   :protected-members:
+   :members:
+   :undoc-members:
+
+.. doxygenclass:: GbxindexObserver
+   :project: observers
+   :private-members:
+   :protected-members:
+   :members:
+   :undoc-members:
diff --git a/docs/source/cxx/observers/generic_collect_data.rst b/docs/source/cxx/observers/generic_collect_data.rst
@@ -0,0 +1,19 @@
+Generic Collect Data
+====================
+
+Header file: ``<libs/observers/generic_collect_data.hpp>``
+`[source] <https://github.com/yoctoyotta1024/CLEO/blob/main/libs/observers/generic_collect_data.hpp>`_
+
+.. doxygenstruct:: XarrayAndViews
+   :project: observers
+   :private-members:
+   :protected-members:
+   :members:
+   :undoc-members:
+
+.. doxygenclass:: GenericCollectData
+   :project: observers
+   :private-members:
+   :protected-members:
+   :members:
+   :undoc-members:
diff --git a/docs/source/cxx/observers/massmoments_observer.rst b/docs/source/cxx/observers/massmoments_observer.rst
@@ -0,0 +1,44 @@
+Massmoments Observer
+====================
+
+Header file: ``<libs/observers/massmoments_observer.hpp>``
+`[source] <https://github.com/yoctoyotta1024/CLEO/blob/main/libs/observers/massmoments_observer.hpp>`_
+
+.. doxygenstruct:: MassMomentsFunc
+   :project: observers
+   :private-members:
+   :protected-members:
+   :members:
+   :undoc-members:
+
+.. doxygenstruct:: RaindropsMassMomentsFunc
+   :project: observers
+   :private-members:
+   :protected-members:
+   :members:
+   :undoc-members:
+
+.. doxygenstruct:: CollectMassMoments
+   :project: observers
+   :private-members:
+   :protected-members:
+   :members:
+   :undoc-members:
+
+.. doxygenfunction:: create_massmoment_xarray
+   :project: observers
+
+.. doxygenfunction:: create_massmom0_xarray
+   :project: observers
+
+.. doxygenfunction::create_massmom1_xarray
+   :project: observers
+
+.. doxygenfunction:: create_massmom2_xarray
+   :project: observers
+
+.. doxygenfunction::MassMomentsObserver
+   :project: observers
+
+.. doxygenfunction::MassMomentsRaindropsObserver
+   :project: observers
diff --git a/docs/source/cxx/observers/nsupers_observer.rst b/docs/source/cxx/observers/nsupers_observer.rst
@@ -0,0 +1,18 @@
+Nsupers Observer
+================
+
+Header file: ``<libs/observers/nsupers_observer.hpp>``
+`[source] <https://github.com/yoctoyotta1024/CLEO/blob/main/libs/observers/nsupers_observer.hpp>`_
+
+.. doxygenstruct:: NsupersFunc
+   :project: observers
+   :private-members:
+   :protected-members:
+   :members:
+   :undoc-members:
+
+.. doxygenfunction:: CollectNsupers
+   :project: observers
+
+.. doxygenfunction:: NsupersObserver
+   :project: observers
diff --git a/docs/source/cxx/observers2/observers.rst → docs/source/cxx/observers/observers.rst b/docs/source/cxx/observers2/observers.rst → docs/source/cxx/observers/observers.rst
@@ -1,34 +1,34 @@
 Observers
 =========
 
-Header file: ``<libs/observers2/observers.hpp>``
-`[source] <https://github.com/yoctoyotta1024/CLEO/blob/main/libs/observers2/observers.hpp>`_
+Header file: ``<libs/observers/observers.hpp>``
+`[source] <https://github.com/yoctoyotta1024/CLEO/blob/main/libs/observers/observers.hpp>`_
 
 .. doxygenconcept:: Observer
-   :project: observers2
+   :project: observers
 
 .. doxygenstruct:: CombinedObserver
-   :project: observers2
+   :project: observers
    :private-members:
    :protected-members:
    :members:
    :undoc-members:
 
 .. doxygenfunction:: operator>>(const Observer auto obs1, const Observer auto obs2)
-   :project: observers2
+   :project: observers
 
 .. doxygenstruct:: NullObserver
-   :project: observers2
+   :project: observers
    :private-members:
    :protected-members:
    :members:
    :undoc-members:
 
 .. doxygenconcept:: ObsFuncs
-   :project: observers2
+   :project: observers
 
 .. doxygenstruct:: ConstTstepObserver
-   :project: observers2
+   :project: observers
    :private-members:
    :protected-members:
    :members:

diff --git a/docs/source/cxx/observers2/observers2mod.rst → docs/source/cxx/observers/observersmod.rst b/docs/source/cxx/observers2/observers2mod.rst → docs/source/cxx/observers/observersmod.rst
@@ -14,3 +14,18 @@ e.g. to a dataset or to a computer screen.
    :caption: Contents:
 
    observers
+   streamout_observer
+   runstats_observer.rst
+   write_to_dataset_observer.rst
+   parallel_write_data.rst
+   collect_data_for_dataset.rst
+   generic_collect_data.rst
+   time_observer.rst
+   gbxindex_observer.rst
+   superdrops_observer.rst
+   nsupers_observer.rst
+   totnsupers_observer.rst
+   state_observer.rst
+   thermo_observer.rst
+   windvel_observer.rst
+   massmoments_observer.rst
diff --git a/docs/source/cxx/observers/parallel_write_data.rst b/docs/source/cxx/observers/parallel_write_data.rst
@@ -0,0 +1,36 @@
+Parallel Write Data
+===================
+
+Header file: ``<libs/observers/parallel_write_data.hpp>``
+`[source] <https://github.com/yoctoyotta1024/CLEO/blob/main/libs/observers/parallel_write_data.hpp>`_
+
+.. doxygenstruct:: ParallelGridboxesRangePolicyFunc
+   :project: observers
+   :private-members:
+   :protected-members:
+   :members:
+   :undoc-members:
+
+.. doxygenstruct:: ParallelGridboxesTeamPolicyFunc
+   :project: observers
+   :private-members:
+   :protected-members:
+   :members:
+   :undoc-members:
+
+.. doxygenclass:: ParallelWriteGridboxes
+   :project: observers
+   :private-members:
+   :protected-members:
+   :members:
+   :undoc-members:
+
+.. doxygenconcept:: CollectRaggedCount
+   :project: observers
+
+.. doxygenclass:: ParallelWriteSupers
+   :project: observers
+   :private-members:
+   :protected-members:
+   :members:
+   :undoc-members:
diff --git a/docs/source/cxx/observers/runstats_observer.rst b/docs/source/cxx/observers/runstats_observer.rst
@@ -0,0 +1,19 @@
+RunStatsObserver
+================
+
+Header file: ``<libs/observers/runstats_observer.hpp>``
+`[source] <https://github.com/yoctoyotta1024/CLEO/blob/main/libs/observers/runstats_observer.hpp>`_
+
+.. doxygenstruct:: RunStats
+   :project: observers
+   :private-members:
+   :protected-members:
+   :members:
+   :undoc-members:
+
+.. doxygenclass:: RunStatsObserver
+   :project: observers
+   :private-members:
+   :protected-members:
+   :members:
+   :undoc-members:
diff --git a/docs/source/cxx/observers/state_observer.rst b/docs/source/cxx/observers/state_observer.rst
@@ -0,0 +1,8 @@
+State Observer
+==============
+
+Header file: ``<libs/observers/state_observer.hpp>``
+`[source] <https://github.com/yoctoyotta1024/CLEO/blob/main/libs/observers/state_observer.hpp>`_
+
+.. doxygenfunction:: StateObserver
+   :project: observers
diff --git a/docs/source/cxx/observers/streamout_observer.rst b/docs/source/cxx/observers/streamout_observer.rst
@@ -0,0 +1,12 @@
+StreamOut Observer
+==================
+
+Header file: ``<libs/observers/streamout_observer.hpp>``
+`[source] <https://github.com/yoctoyotta1024/CLEO/blob/main/libs/observers/streamout_observer.hpp>`_
+
+.. doxygenstruct:: StreamOutObserver
+   :project: observers
+   :private-members:
+   :protected-members:
+   :members:
+   :undoc-members: