Merge branch 'develop' into feature/insitu-concat

NOAA-EMC · Feb 21, 2025 · 89a056e · 89a056e
2 parents 2efb0c3 + f91938b
commit 89a056e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/bundle/CMakeLists.txt b/bundle/CMakeLists.txt
@@ -35,6 +35,7 @@ set( ENABLE_MPI ON CACHE BOOL "Compile with MPI" )
 option(BUILD_GDASBUNDLE "Build GDAS Bundle" ON)
 option(CLONE_JCSDADATA "Clone JCSDA test data repositories" OFF)
 option(WORKFLOW_TESTS "Include global-workflow dependent tests" OFF)
+option(BUILD_REGRID_STATES "Build regrid states land DA utility" ON)
 
 # Depend path for non-ecbuild packages
 set(DEPEND_LIB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/Depends)

diff --git a/sorc/da-utils b/sorc/da-utils
diff --git a/sorc/jcb b/sorc/jcb
+4 −1		CMakeLists.txt
+1 −0		README
+3 −0		bundle/CMakeLists.txt
+3 −1		src/CMakeLists.txt
+8 −3		src/ioda-stats/iodastats.h
+1 −0		src/regridStates/CMakeLists.txt
+100 −79		src/regridStates/grids_IO.F90
+113 −94		src/regridStates/regridStates.F90
+3 −2		.github/workflows/basic_testing.yaml
+1 −0		.gitignore
+5 −0		README.md
+14 −0		jcb_client_init.py
+2 −0		src/jcb/__init__.py
+2 −2		src/jcb/configuration/apps/README.md
+255 −0		src/jcb/observation_chronicle/conv_chronicle.py
+81 −6		src/jcb/observation_chronicle/observation_chronicle.py
+5 −2		src/jcb/renderer.py
+8 −0		src/jcb/utilities/testing.py
+0 −127		test/client_integration/gdas-atmosphere-templates.yaml
+0 −111		test/client_integration/gdas-marine-templates.yaml
+1 −0		test/client_integration/test_client_requirements.py
+130 −0		test/observation_chronicles/test_conv_processing.py