Feature/pcastell/viirs updates

components.yaml

@@ -35,27 +35,27 @@ NCEP_Shared:
 GMAO_Shared:
   local: ./src/Shared/@GMAO_Shared
   remote: ../GMAO_Shared.git
-  tag: v5.42.3
+  tag: v5.42.4
   sparse: ./config/GMAO_Shared.sparse
   develop: main
 
 GMAOpyobs:
   local: ./src/Shared/@GMAO_Shared/@GMAO_pyobs
   remote: ../GMAOpyobs.git
-  tag: v1.0.6.1
+  tag: v1.6.0
   develop: develop
 
 AeroML:
   local: ./src/Shared/@AeroML
   remote: ../AeroML.git
-  tag: v5.42.0
+  tag: v1.5.0
   develop: develop
   sparse: ./config/AeroML.sparse
 
 GEOS_Util:
   local: ./src/Shared/@GMAO_Shared/@GEOS_Util
   remote: ../GEOS_Util.git
-  tag: v5.42.0
+  tag: v5.42.1
   develop: main
 
 GMAO_perllib:
@@ -92,13 +92,13 @@ GEOSana_GridComp:
 mksi:
    local: ./src/Components/@GEOSana_GridComp/GEOSaana_GridComp/GSI_GridComp/@mksi
    remote: ../GEOS_mksi.git
-   tag: v5.42.8
+   tag: v5.43.1
    develop: develop
 
 GEOSgcm_GridComp:
   local: ./src/Components/@GEOSgcm_GridComp
   remote: ../GEOSgcm_GridComp.git
-  tag: v2.7.0.1
+  tag: v2.7.0.2
   sparse: ./config/GEOSgcm_GridComp.sparse
   develop: develop
 
@@ -251,7 +251,7 @@ umwm:
 GEOSgcm_App:
   local: ./src/Applications/@GEOSgcm_App
   remote: ../GEOSgcm_App.git
-  tag: v2.3.8.7
+  tag: v2.3.8.8
   develop: develop
 
 Ocean-LETKF:

src/Applications/GAAS_App/CMakeLists.txt

@@ -18,24 +18,18 @@ target_link_libraries(${this} PRIVATE OpenMP::OpenMP_Fortran)
 ecbuild_add_executable(TARGET ana_aod.x SOURCES ana_aod.F LIBS ${this} GMAO_gfio_r4 Chem_Base Chem_Shared) 
 ecbuild_add_executable(TARGET mpana_aod.x SOURCES mpana_aod.F90 LIBS ${this} GMAO_gfio_r4 Chem_Base Chem_Shared) 
 
-set(pythonscripts modis_l2a.py mxd04_l2a.py avhrr_l2a.py patmosx_l2a.py aod_data.py)
+set(pythonscripts aod_data.py)
 install(PROGRAMS ${pythonscripts} get_aero_obs.csh run_gaas_ana.csh DESTINATION bin)
 
-install(
-   FILES mxd04_nnr.py avhrr_nnr.py
-   DESTINATION lib/Python
-   )
-
 if (EXTENDED_SOURCE)
   set_target_properties (${this} PROPERTIES COMPILE_FLAGS ${EXTENDED_SOURCE})
   set_target_properties (ana_aod.x PROPERTIES COMPILE_FLAGS ${EXTENDED_SOURCE})
 endif()
 
 file(GLOB rc_files *.rc)
-file(GLOB pcf_files *.pcf)
 file(GLOB tmpl_files *.tmpl)
 
 install (
-   FILES ${rc_files} ${pcf_files} ${tmpl_files}
+   FILES ${rc_files} ${tmpl_files}
    DESTINATION etc
    )

src/Applications/GAAS_App/ana.rc.tmpl

@@ -37,9 +37,13 @@ ODS_files::
 #___AQUA___${FVWORK}/nnr_003.MYD04_L2a.ocean.%y4%m2%d2_%h200z.ods
 #___AQUA___${FVWORK}/nnr_003.MYD04_L2a.deep.%y4%m2%d2_%h200z.ods
 
-#___NOAA20___${FVWORK}/nnr_001.NOAA20_L2a.dt_land.%y4%m2%d2_%h200z.ods
-#___NOAA20___${FVWORK}/nnr_001.NOAA20_L2a.dt_ocean.%y4%m2%d2_%h200z.ods
-#___NOAA20___${FVWORK}/nnr_001.NOAA20_L2a.db_deep.%y4%m2%d2_%h200z.ods
+#___NOAA20DT___${FVWORK}/nnr_001.NOAA20_L2a.dt_land.%y4%m2%d2_%h200z.ods
+#___NOAA20DT___${FVWORK}/nnr_001.NOAA20_L2a.dt_ocean.%y4%m2%d2_%h200z.ods
+#___NOAA20DB___${FVWORK}/nnr_001.NOAA20_L2a.db_deep.%y4%m2%d2_%h200z.ods
+
+#___NOAA20DT_NRT___${FVWORK}/${EXPID}.NOAA20_L2a.dt_land.%y4%m2%d2_%h200z.ods
+#___NOAA20DT_NRT___${FVWORK}/${EXPID}.NOAA20_L2a.dt_ocean.%y4%m2%d2_%h200z.ods
+#___NOAA20DB_NRT___${FVWORK}/${EXPID}.NOAA20_L2a.db_deep.%y4%m2%d2_%h200z.ods
 
 
 #___MISR___${FVWORK}/misr_F12_0022.bright_tc8.obs.%y4%m2%d2.ods

src/Applications/GAAS_App/ana_aod.j.tmpl

@@ -28,6 +28,7 @@ endif
 #------------------------------
 setenv PATMOSX        >>>PATMOSX<<<
 setenv MODIS_L2_HDF   >>>MODIS_L2_HDF<<<
+setenv VIIRS_L2_HDF   >>>VIIRS_L2_HDF<<<
 
 setenv AODWORK        >>>AODWORK<<<
 setenv FVWORK         >>>FVWORK<<<
@@ -42,13 +43,15 @@ setenv nymd           >>>NYMD<<<
 cd $AODWORK
 ls
 
-setenv PYTHONPATH $FVROOT/lib/Python:$FVROOT/lib/Python/pyobs:$FVROOT/lib/Python/pyods
+setenv PYTHONPATH $FVROOT/lib/Python:$FVROOT/lib/Python/pyobs:$FVROOT/lib/Python/pyods:$FVROOT/lib/Python/pyabc
 setenv PSAS_NUM_MPI 1 # $NCPUS_AOD
 
 set aod_modis_pcf = $AODWORK/modis_l2a.pcf
 set aod_avhrr_pcf = $AODWORK/avhrr_l2a.pcf
+set aod_viirs_pcf = $AODWORK/viirs_l2a.pcf
 cat $aod_modis_pcf
 cat $aod_avhrr_pcf
+cat $aod_viirs_pcf
 cat $AODWORK/ana.rc
 
 set ANAAODX = `which ana_aod.x`
@@ -113,6 +116,12 @@ foreach time_offset ( 000000 030000 )
    # run aod_l2a.py
    #---------------
    @ errcnt = 0
+   if ($VIIRS_L2_HDF) then
+      set isotime = "${yyyy}-${mm}-${dd}T${hh}:00:00"
+      viirs_l2a.py $aod_viirs_pcf $isotime
+      @ errcnt = $errcnt + $status
+   endif
+
    if ($MODIS_L2_HDF) then
       set isotime = "${yyyy}-${mm}-${dd}T${hh}:00:00"
       modis_l2a.py $aod_modis_pcf $isotime