Merge branch 'develop' into feature/geocloud

Author: PJLevensMO

.github/workflows/ci.yml

@@ -75,7 +75,7 @@ jobs:
             --entrypoint=/usr/local/src/${REPO}/${PR}/build-and-test \
             --workdir=/usr/local/src/${REPO}/${PR} \
             --volume ${PWD}/${PR}:/usr/local/src/${REPO}/${PR} \
-            'jcsda/docker-gnu-openmpi-dev:latest'
+            'jcsda/docker-gnu-openmpi-dev:skylab-v8'
 
   build2:
     if: |

deps/CMakeLists.txt

@@ -23,10 +23,7 @@ ${CMAKE_Fortran_DEBUG_FLAGS}"
   )
 elseif ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "Intel")
   set(OPS_DEFAULT_Fortran_FLAGS "\
--warn all \
--warn errors \
--warn notruncated_source \
--warn nointerfaces \
+-warn alignments,declarations,errors,general,ignore_loc,nointerfaces,notruncated_source,shape,stderrors,uncalled,unused,usage \
 -implicitnone \
 -traceback \
 -integer-size 64 \

deps/ops/CMakeLists.txt

@@ -20,7 +20,6 @@ set(OPS_SOURCE_FILES
   code/OpsMod_AirQuality/OpsMod_AirQuality.f90
   code/OpsMod_Argument/OpsMod_Argument.f90
   code/OpsMod_CXInfo/OpsMod_CXInfo.f90
-  code/OpsMod_Control/OpsMod_Control.f90
   code/OpsMod_DateTime/OpsMod_DateTime.f90
   code/OpsMod_GatherSpread/OpsMod_GatherSpread.F90
   code/OpsMod_HorizontalInterp/OpsMod_HorizontalInterp.f90
@@ -88,24 +87,11 @@ set(OPS_SOURCE_FILES
   stubs/OpsMod_Varobs/OpsMod_Varobs.f90
   stubs/Ops_SatRad_Info/OpsMod_SatRad_RTmodel.f90
   stubs/Ops_SatRad_SetUp/OpsMod_SatRad_SetUp.f90
+  stubs/OpsMod_Control/OpsMod_Control.f90
 )
 
-# Intel inserts lines in the source during pre-processing that contain the source file path, if the pathname
-# is long enough it can take the source line to more than 132 characters and trigger a compile warning.
-# If -warn errors is on this creates an invalid compile failure, so suppress this warning for these files to allow
-# compilation to proceed.
-if ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "Intel")
-  set_source_files_properties(public/GenMod_Platform/GenMod_Platform.F90 PROPERTIES COMPILE_FLAGS "-warn noerrors")
-  set_source_files_properties(public/GenMod_Core/GenMod_Core.F90 PROPERTIES COMPILE_FLAGS "-warn noerrors")
-  set_source_files_properties(public/GenMod_Control/GenMod_Setup.F90 PROPERTIES COMPILE_FLAGS "-warn noerrors")
-  set_source_files_properties(public/Ops_Constants/GenMod_MiscUMScienceConstants.f90 PROPERTIES COMPILE_FLAGS "-warn noerrors")
-  set_source_files_properties(code/GenMod_ModelIO/GenMod_ModelIO.F90 PROPERTIES COMPILE_FLAGS "-warn noerrors")
-  set_source_files_properties(code/OpsMod_GatherSpread/OpsMod_GatherSpread.F90 PROPERTIES COMPILE_FLAGS "-warn noerrors")
-  set_source_files_properties(code/OpsProg_Utils/OpsProg_PrintCXFile.F90 PROPERTIES COMPILE_FLAGS "-warn noerrors")
-endif()
-
 # Collect the list of source directories (which will be added to the include path).
-foreach (file ${OPS_SOURCE_FILES})
+foreach(file ${OPS_SOURCE_FILES})
   get_filename_component(dir "${file}" DIRECTORY)
   list(APPEND OPS_SOURCE_DIRS "${dir}")
 endforeach()
@@ -142,10 +128,8 @@ target_compile_definitions(ops PRIVATE
   _LARGEFILE_SOURCE
 )
 
-if ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "Intel")
-  target_compile_definitions(ops PRIVATE 
-    IFORT_ALLOCATABLE_CHARACTER_BUG
-  )
+if("${CMAKE_Fortran_COMPILER_ID}" MATCHES "Intel")
+  target_compile_definitions(ops PRIVATE IFORT_ALLOCATABLE_CHARACTER_BUG)
 endif()
 
 target_link_libraries(ops
@@ -192,10 +176,8 @@ target_compile_definitions(ops_serial PRIVATE
   _LARGEFILE_SOURCE
 )
 
-if ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "Intel")
-  target_compile_definitions(ops_serial PRIVATE
-    IFORT_ALLOCATABLE_CHARACTER_BUG
-  )
+if("${CMAKE_Fortran_COMPILER_ID}" MATCHES "Intel")
+  target_compile_definitions(ops_serial PRIVATE IFORT_ALLOCATABLE_CHARACTER_BUG)
 endif()
 
 target_link_libraries(ops_serial

deps/ops/stubs/OpsMod_CXGenerate/Ops_GetDefaultCxFields.inc

@@ -120,6 +120,12 @@ SELECT CASE (ObsGroup)
                        StashItem_SeaIce,StashItem_orog,StashItem_qcl,            &
                        StashItem_p,StashItem_p_Surface,StashCode_u10,            &
                        StashCode_v10,StashCode_t2,StashCode_rh2,StashCode_pmsl/)
+  CASE (ObsGroupFCIASR, ObsGroupFCIClr)
+    CxFields(1:15) = (/StashItem_theta,StashItem_q,StashItem_qcf,StashItem_SST,  &
+                       StashItem_SeaIce,StashItem_orog,StashItem_qcl,            &
+                       StashItem_p,StashItem_p_Surface,StashCode_u10,            &
+                       StashCode_v10,StashCode_t2,StashCode_rh2,StashCode_pmsl,  &
+                       StashItem_Cloud_Bulk/)
   CASE (ObsGroupMWRI)
     CxFields(1:14) = (/StashItem_theta,StashItem_q,StashItem_qcf,StashItem_SST, &
                        StashItem_SeaIce,StashItem_orog,StashItem_qcl,           &

…sMod_Control/OpsFn_ModelRuntoModelId.inc …sMod_Control/OpsFn_ModelRuntoModelId.incdeps/ops/code/OpsMod_Control/OpsFn_ModelRuntoModelId.inc renamed to deps/ops/stubs/OpsMod_Control/OpsFn_ModelRuntoModelId.inc deps/ops/code/OpsMod_Control/OpsFn_ModelRuntoModelId.inc renamed to deps/ops/stubs/OpsMod_Control/OpsFn_ModelRuntoModelId.inc

@@ -67,6 +67,8 @@ Using(ObsGroupAIRS) = ops_env_is_true ("OPS_AIRS")
 Using(ObsGroupIASI) = ops_env_is_true ("OPS_IASI")
 Using(ObsGroupSEVIRIClr) = ops_env_is_true ("OPS_SEVIRICLR")
 Using(ObsGroupSEVIRIASR) = ops_env_is_true ("OPS_SEVIRIASR")
+Using(ObsGroupFCIClr) = ops_env_is_true ("OPS_FCICLR")
+Using(ObsGroupFCIASR) = ops_env_is_true ("OPS_FCIASR")
 Using(ObsGroupMVIRIClr) = ops_env_is_true ("OPS_MVIRICLR")
 Using(ObsGroupGOESImClr) = ops_env_is_true ("OPS_GOESIMCLR")
 Using(ObsGroupCOMSMIClr) = ops_env_is_true ("OPS_COMSMICLR")
@@ -102,6 +104,7 @@ Using(ObsGroupHIRAS) = ops_env_is_true ("OPS_HIRAS")
 Using(ObsGroupOceanWinds) = ops_env_is_true ("OPS_OCEANWINDS")
 Using(ObsGroupGIIRSLW) = ops_env_is_true ("OPS_GIIRSLW")
 Using(ObsGroupGIIRSMW) = ops_env_is_true ("OPS_GIIRSMW")
+Using(ObsGroupMTGIRS) = ops_env_is_true ("OPS_MTGIRS")
 
 ALLOCATE (obs_group_list(COUNT (using)))
 obs_group_list = IMDI