Merge branch 'feature/move_jcb' into feature/rename_atm

* feature/move_jcb:
  Addition of "Convert to Structured Grid" to gdas (#1167)
  use gsibec tags/1.2.1 (#1164)
  Remove N21 from the aero obs list  (#1160)
  Add jcb and update jcb repos to remove submodules
  add jcb to gdasapp submods

.gitmodules

@@ -77,6 +77,10 @@
   path = sorc/fms
   url = https://github.com/jcsda/fms.git
   branch = release-stable
+[submodule "sorc/jcb"]
+  path = sorc/jcb
+  url = https://github.com/noaa-emc/jcb.git
+  branch = develop
 [submodule "parm/jcb-gdas"]
   path = parm/jcb-gdas
   url = https://github.com/noaa-emc/jcb-gdas

mains/gdas.cc

@@ -14,6 +14,7 @@
 #include "ufo/instantiateObsFilterFactory.h"
 #include "ufo/ObsTraits.h"
 
+#include "oops/runs/ConvertToStructuredGrid.h"
 #include "oops/runs/ConvertState.h"
 #include "oops/runs/HofX4D.h"
 #include "oops/runs/LocalEnsembleDA.h"
@@ -52,6 +53,9 @@ int runApp(int argc, char** argv, const std::string traits, const std::string ap
   // Define a map from app names to lambda functions that create unique_ptr to Applications
   std::map<std::string, std::function<std::unique_ptr<oops::Application>()>> apps;
 
+  apps["converttostructuredgrid"] = []() {
+      return std::make_unique<oops::ConvertToStructuredGrid<Traits>>();
+  };	
   apps["convertstate"] = []() {
       return std::make_unique<oops::ConvertState<Traits>>();
   };
@@ -96,6 +100,7 @@ int main(int argc,  char ** argv) {
   // Check that the application is recognized
   // ----------------------------------------
   const std::set<std::string> validApps = {
+    "converttostructuredgrid",
     "convertstate",
     "hofx4d",
     "localensembleda",

parm/aero/obs/lists/gdas_aero.yaml.j2

@@ -2,5 +2,4 @@ observers:
 {% filter indent(width=2) %}
 {% include 'aero/obs/config/viirs_n20_aod.yaml.j2' %}
 {% include 'aero/obs/config/viirs_npp_aod.yaml.j2' %}
-{% include 'aero/obs/config/viirs_n21_aod.yaml.j2' %}
 {% endfilter %}