Feautre/add geosadas test

src/swell/tasks/build_jedi.py

@@ -41,13 +41,16 @@ def execute(self):
                 bundles = []
                 for model_component in model_components:
                     # Open the metadata config for interface
-                    meta = self.jedi_rendering.render_interface_meta()
+                    self.jedi_rendering.add_key('npx_proc', 1)
+                    self.jedi_rendering.add_key('npy_proc', 1)
+                    self.jedi_rendering.add_key('total_processors', 1)
+                    meta = self.jedi_rendering.render_interface_meta(model_component)
                     bundles.append(meta['jedi_interface'])
             else:
-                bundles_default = get_bundles()
+                bundles = get_bundles()
 
             # Generate the build dictionary
-            jedi_bundle_dict = set_jedi_bundle_config(self.config.bundles(bundles_default),
+            jedi_bundle_dict = set_jedi_bundle_config(self.config.bundles(bundles),
                                                       jedi_bundle_source_path,
                                                       jedi_bundle_build_path, 24)
 

src/swell/tasks/clone_jedi.py

@@ -48,13 +48,16 @@ def execute(self):
                 bundles = []
                 for model_component in model_components:
                     # Open the metadata config for interface
-                    meta = self.jedi_rendering.render_interface_meta()
+                    self.jedi_rendering.add_key('npx_proc', '1')
+                    self.jedi_rendering.add_key('npy_proc', '1')
+                    self.jedi_rendering.add_key('total_processors', '1')
+                    meta = self.jedi_rendering.render_interface_meta(model_component)
                     bundles.append(meta['jedi_interface'])
             else:
-                bundles_default = get_bundles()
+                bundles = get_bundles()
 
             # Generate the build dictionary
-            jedi_bundle_dict = set_jedi_bundle_config(self.config.bundles(bundles_default),
+            jedi_bundle_dict = set_jedi_bundle_config(self.config.bundles(bundles),
                                                       jedi_bundle_source_path,
                                                       jedi_bundle_build_path)
 

src/swell/test/suite_tests/geosadas-stable_build.yaml

@@ -5,11 +5,43 @@ bundles: REMOVE
 model_components: ['geos_atmosphere']
 models:
   geos_atmosphere:
+    horizontal_resolution: '13'
     observations:
-    - sondes
+    - aircraft
+    - airs_aqua
+    - amsr2_gcom-w1
+    - amsua_aqua
+    - amsua_metop-b
+    - amsua_metop-c
+    - amsua_n15
+    - amsua_n18
     - amsua_n19
+    - atms_n20
+    - atms_npp
+    - avhrr3_metop-b
+    - avhrr3_n18
+    - avhrr3_n19
+    - cris-fsr_n20
+    - cris-fsr_npp
+    - gmi_gpm
+    #- gps
+    - iasi_metop-b
+    - iasi_metop-c
+    - mhs_metop-b
+    - mhs_metop-c
+    - mhs_n19
+    - mls55_aura
+    - omi_aura
+    - ompsnm_npp
+    #- pibal
+    - satwind
+    - scatwind
+    - sfcship
+    - sfc
+    #- sondes
+    - ssmis_f17
     produce_geovals: false
     window_type: 3D
     gradient_norm_reduction: 1e-6
     number_of_iterations:
-    - 50
+    - 5

src/swell/test/suite_tests/hofx-stable_build.yaml

@@ -32,9 +32,10 @@ models:
     - mls55_aura
     - omi_aura
     - ompsnm_npp
+    #- pibal
     - satwind
     - scatwind
-    #- sfcship
-    #- sfc
+    - sfcship
+    - sfc
     #- sondes
     - ssmis_f17

src/swell/utilities/build.py

@@ -62,6 +62,10 @@ def set_jedi_bundle_config(bundles, path_to_source, path_to_build, cores_to_use_
     jedi_bundle_config['clone_options']['bundles'] = bundles
     jedi_bundle_config['clone_options']['path_to_source'] = path_to_source
 
+    # Add GSIbec as extra repo
+    if 'fv3-jedi' in bundles:
+        jedi_bundle_config['clone_options']['extra_repos'] = ['gsibec']
+
     # Set the configure stage options
     jedi_bundle_config['configure_options']['path_to_build'] = path_to_build