Add comparisons for 3dvar_cf

src/swell/suites/3dvar_cf/suite_config.py

@@ -47,7 +47,7 @@ class SuiteConfig(QuestionContainer, Enum):
                 "tempo_no2_tropo",
                 "tropomi_s5p_no2_tropo",
             ]),
-            qd.clean_patterns(['*.nc4', '*.txt', 'logfile.*.out']),
+            qd.clean_patterns(['*.txt', 'logfile.*.out']),
         ]
     )
 

src/swell/suites/compare/eva/comparison_increment-geos_cf.yaml

@@ -0,0 +1,104 @@
+datasets:
+
+- group: increment
+  type: LatLon
+  filename: {{increment_file_path_1}}
+  name: experiment_increment_1
+  variables: [NO2, lat, lon]
+
+- group: increment
+  type: LatLon
+  filename: {{increment_file_path_2}}
+  name: experiment_increment_2
+  variables: [NO2, lat, lon]
+
+graphics:
+
+  plotting_backend: Emcpy
+  figure_list:
+
+  #map plot for NO2 increment (near surface)
+  - batch figure:
+      variables: [NO2]
+    figure:
+      figure size: [60,30]
+      layout: [3,1]
+      title: 'NO2 Increment from JEDI'
+      output name: '{{cycle_dir}}/eva/increment/map_plots/${variable}/inc_${variable}_surface.png'
+      tight_layout: true 
+    plots:
+      - mapping:
+          projection: plcarr
+          domain: global
+        add_map_features: ['coastline']
+        add_colorbar:
+          label: NO2 Increment
+        add_grid:
+        add_title: '{{experiment_tag_1}}'
+        layers:
+        - type: MapGridded
+          longitude:
+            variable: experiment_increment_1::increment::lon
+          latitude:
+            variable: experiment_increment_1::increment::lat
+          data:
+            variable: experiment_increment_1::increment::NO2
+            slices: '[71,...]'
+          label: "{{experiment_tag_1}} NO2 increment (surface level)"
+          colorbar: true
+          cmap: 'bwr'
+          vmin: -1e-10
+          vmax: 1e-10
+
+      - mapping:
+          projection: plcarr
+          domain: global
+        add_map_features: ['coastline']
+        add_colorbar:
+          label: NO2 Increment
+        add_grid:
+        add_title: '{{experiment_tag_2}}'
+        layers:
+        - type: MapGridded
+          longitude:
+            variable: experiment_increment_2::increment::lon
+          latitude:
+            variable: experiment_increment_2::increment::lat
+          data:
+            variable: experiment_increment_2::increment::NO2
+            slices: '[71,...]'
+          label: "{{experiment_tag_2}} NO2 increment (surface level)"
+          colorbar: true
+          cmap: 'bwr'
+          vmin: -1e-10
+          vmax: 1e-10
+
+      - mapping:
+          projection: plcarr
+          domain: global
+        add_map_features: ['coastline']
+        add_colorbar:
+          label: NO2 Increment
+        add_grid:
+        add_title: '{{experiment_tag_1}} - {{experiment_tag_2}}'
+        layers:
+        - type: MapGridded
+          longitude:
+            variable: experiment_increment_1::increment::lon
+          latitude:
+            variable: experiment_increment_1::increment::lat
+          data:
+            variable: experiment_increment_1::increment::NO2_diff
+            slices: '[71,...]'
+          label: "{{experiment_tag_1}} NO2 increment diff (surface level)"
+          colorbar: true
+          cmap: 'bwr'
+          vmin: -1e-11
+          vmax: 1e-11
+
+transforms:
+- equals: experiment_increment_1::increment::NO2-experiment_increment_2::increment::NO2
+  for:
+    variable: NO2
+  new name: experiment_increment_1::increment::NO2_diff
+  transform: arithmetic

src/swell/suites/compare/eva/comparison_jedi_log-geos_cf.yaml

@@ -0,0 +1,110 @@
+datasets:
+
+- type: JediLog
+  collection_name: JediLogTest_1
+  jedi_log_to_parse: '{{cycle_dir_1}}/jedi_variational_log.log'
+  data_to_parse:
+    convergence: true
+
+- type: JediLog
+  collection_name: JediLogTest_2
+  jedi_log_to_parse: '{{cycle_dir_2}}/jedi_variational_log.log'
+  data_to_parse:
+    convergence: true
+
+transforms:
+- transform: arithmetic
+  new name: JediLogTest_1::convergence::${variable}_log
+  equals: log(JediLogTest_1::convergence::${variable})
+  for:
+    variable: [residual_norm, norm_reduction]
+
+- transform: arithmetic
+  new name: JediLogTest_2::convergence::${variable}_log
+  equals: log(JediLogTest_2::convergence::${variable})
+  for:
+    variable: [residual_norm, norm_reduction]
+
+graphics:
+
+  plotting_backend: Emcpy
+  figure_list:
+
+  - figure:
+      layout: [3,1]
+      figure size: [12,10]
+      title: 'Residual Norm and Norm Reduction Plots'
+      output name: '{{cycle_dir}}/eva/jedi_log/convergence/residual_norm_reduction.png'
+    plots:
+      - add_xlabel: 'Total inner iteration number'
+        add_ylabel: 'Residual norm'
+        add_legend:
+        layers:
+        - type: LinePlot
+          x:
+            variable: JediLogTest_1::convergence::total_iteration
+          y:
+            variable: JediLogTest_1::convergence::residual_norm
+          color: 'black'
+          label: '{{experiment_tag_1}} Residual norm'
+        - type: LinePlot
+          x:
+            variable: JediLogTest_2::convergence::total_iteration
+          y:
+            variable: JediLogTest_2::convergence::residual_norm
+          color: 'red'
+          label: '{{experiment_tag_2}} Residual norm'
+
+      - add_xlabel: 'Total inner iteration number'
+        add_ylabel: 'Log(norm reduction)'
+        add_legend: 
+        layers:
+        - type: LinePlot
+          x:
+            variable: JediLogTest_1::convergence::total_iteration
+          y:
+            variable: JediLogTest_1::convergence::norm_reduction
+          color: 'blue'
+          label: '{{experiment_tag_1}} Norm reduction'
+
+        - type: LinePlot
+          x:
+            variable: JediLogTest_2::convergence::total_iteration
+          y:
+            variable: JediLogTest_2::convergence::norm_reduction
+          color: 'green'
+          label: '{{experiment_tag_2}} Norm reduction'
+
+      - add_xlabel: 'Total inner iteration number'
+        add_ylabel: 'Log(reduction)'
+        add_legend:
+        layers:
+        - type: LinePlot
+          x:
+            variable: JediLogTest_1::convergence::total_iteration
+          y:
+            variable: JediLogTest_1::convergence::residual_norm_log
+          color: 'black'
+          label: '{{experiment_tag_1}} Log(residual norm)'
+        - type: LinePlot
+          x:
+            variable: JediLogTest_2::convergence::total_iteration
+          y:
+            variable: JediLogTest_2::convergence::residual_norm_log
+          color: 'red'
+          label: '{{experiment_tag_2}} Log(residual norm)'
+
+        - type: LinePlot
+          x:
+            variable: JediLogTest_1::convergence::total_iteration
+          y:
+            variable: JediLogTest_1::convergence::norm_reduction_log
+          color: 'blue'
+          label: '{{experiment_tag_1}} Log norm reduction'
+        - type: LinePlot
+          x:
+            variable: JediLogTest_2::convergence::total_iteration
+          y:
+            variable: JediLogTest_2::convergence::norm_reduction_log
+          color: 'green'
+          label: '{{experiment_tag_2}} Log norm reduction'