Merge branch 'develop' into feature/lowres-b

NOAA-EMC · Jan 22, 2025 · 5fbcd12 · 5fbcd12
2 parents 5fe890c + 785a508
commit 5fbcd12
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -159,7 +159,6 @@ install*/
 /fv3-jedi-lm
 /gsibec
 /gsw
-/icepack
 /ioda
 /ioda-data
 /iodaconv

diff --git a/.gitmodules b/.gitmodules
@@ -45,10 +45,6 @@
   path = sorc/fv3-jedi
   url = https://github.com/jcsda/fv3-jedi.git
   branch = develop
-[submodule "sorc/icepack"]
-  path = sorc/icepack
-  url = https://github.com/JCSDA-internal/Icepack.git
-  branch = feature/ecbuild-new
 [submodule "sorc/soca"]
   path = sorc/soca
   url = https://github.com/jcsda-internal/soca.git

diff --git a/bundle/CMakeLists.txt b/bundle/CMakeLists.txt
@@ -111,11 +111,6 @@ if(BUILD_GDASBUNDLE)
   ecbuild_bundle( PROJECT fv3-jedi SOURCE "../sorc/fv3-jedi" )
 
 # SOCA associated repositories
-# TODO: Move the Icepack fork to EMC github
-  set(BUILD_ICEPACK "ON" CACHE STRING "Build the icepack library")
-  if ( BUILD_ICEPACK )
-    ecbuild_bundle( PROJECT icepack SOURCE "../sorc/icepack" )
-  endif()
   ecbuild_bundle( PROJECT soca SOURCE "../sorc/soca" )
 
   # Build JEDI/DA or other peripherals

diff --git a/sorc/fv3-jedi b/sorc/fv3-jedi
diff --git a/sorc/icepack b/sorc/icepack
diff --git a/sorc/ioda b/sorc/ioda
diff --git a/sorc/oops b/sorc/oops
diff --git a/sorc/saber b/sorc/saber
diff --git a/sorc/soca b/sorc/soca
diff --git a/sorc/ufo b/sorc/ufo
+2 −1		src/fv3jedi/FieldMetadata/fields_metadata_mod.f90
+3 −2		src/fv3jedi/Utilities/fv3jedi_constants_mod.f90
+2 −1		test/CMakeLists.txt
+27 −0		test/testinput/hyb-3dvar_gfs.yaml
+53 −43		test/testoutput/hyb-3dvar_gfs.ref
+0 −2		src/CMakeLists.txt
+1 −2		src/oops/base/GetValuePerts.h
+5 −7		src/oops/base/GetValuePosts.h
+4 −6		src/oops/base/GetValueTLADs.h
+0 −47		src/oops/base/LinearVariableChangeParametersBase.h
+1 −0		src/oops/base/Observer.h
+0 −28		src/oops/base/VariableChangeParametersBase.h
+0 −27		src/oops/interface/LinearVariableChange.h
+0 −18		src/oops/interface/VariableChange.h
+5 −19		src/oops/runs/ConvertIncrement.h
+2 −15		src/oops/runs/ConvertState.h
+1 −4		src/test/interface/GetValues.h
+0 −15		src/test/interface/LinearVariableChange.h
+0 −15		src/test/interface/VariableChange.h
+1 −1		src/saber/bump/BUMPParameters.h
+2 −2		src/saber/bump/tools_atlas.fypp
+12 −10		src/saber/bump/type_cmat.fypp
+19 −1		src/saber/bump/type_geom.fypp
+10 −2		src/saber/bump/type_nam.fypp
+108 −4		src/saber/bump/type_nicas.fypp
+8 −8		src/saber/bump/type_nicas_blk.fypp
+38 −14		src/saber/bump/type_nicas_cmp.fypp
+2 −0		src/saber/bump/type_var.fypp
+0 −0		test/testdeps/error_covariance_training_bump_nicas_11.txt
+64 −0		test/testinput/error_covariance_training_bump_nicas_11.yaml
+1 −0		test/testlist/saber_test_tier1.txt
+58 −0		test/testref/error_covariance_training_bump_nicas_11.ref
+5 −2		.gitmodules
+2 −4		CMakeLists.txt
+0 −5		bundle/CMakeLists.txt
+10 −0		external/README.md
+36 −0		external/icepack/CMakeLists.txt
+1 −0		external/icepack/Icepack
+38 −0		external/icepack/icepack_files.cmake
+8 −5		external/mom6/CMakeLists.txt
+0 −0		external/mom6/MOM6
+0 −0		external/mom6/mom6_files.cmake
+1 −4		src/soca/CMakeLists.txt
+2 −5		src/soca/VariableChange/CMakeLists.txt
+10 −12		test/CMakeLists.txt
+1 −0		test/testinput/convertstate_soca2cice.yml
+2 −0		.github/workflows/ci.yml
+2 −0		src/ufo/filters/CMakeLists.txt
+62 −1		src/ufo/filters/QCmanager.cc
+2 −1		src/ufo/filters/VariableTransformParametersBase.h
+20 −13		src/ufo/filters/actions/ROobserrInflation.cc
+11 −3		src/ufo/filters/actions/ROobserrInflation.h
+6 −4		src/ufo/operators/crtm/ufo_crtm_utils_mod.F90
+0 −2		src/ufo/operators/gnssro/QC/CMakeLists.txt
+1 −1		src/ufo/operators/gnssro/utils/gnssro_mod_obserror.F90
+2 −2		src/ufo/operators/rttov/ObsRadianceRTTOV.cc
+10 −1		src/ufo/operators/rttov/ObsRadianceRTTOVParameters.h
+2 −1		src/ufo/operators/rttov/ufo_radiancerttov_mod.F90
+1 −1		src/ufo/operators/rttov/ufo_radiancerttov_tlad_mod.F90
+130 −24		src/ufo/operators/rttov/ufo_radiancerttov_utils_mod.F90
+16 −17		src/ufo/variabletransforms/Cal_HeightFromPressure.cc
+4 −20		src/ufo/variabletransforms/Cal_PressureFromHeight.cc
+13 −4		src/ufo/variabletransforms/Cal_SatBrightnessTempFromRad.cc
+9 −0		src/ufo/variabletransforms/Cal_SatRadianceFromScaledRadiance.cc
+31 −4		test/CMakeLists.txt
+66 −0		test/testinput/unit_tests/filters/iasi_rttov_ops_qc_rttovonedvarcheck.yaml
+1 −1		test/testinput/unit_tests/predictors/CMakeLists.txt
+73 −0		test/testinput/unit_tests/predictors/aircraft_bc_mpi.yaml
+3 −4		test/testinput/unit_tests/variabletransforms/CMakeLists.txt
+27 −0		test/testinput/unit_tests/variabletransforms/variabletransforms_SondeHeightFromPressure.yaml
+24 −0		test/testinput/unit_tests/variabletransforms/variabletransforms_SondePressureFromHeight.yaml
+25 −1		test/testinput/unit_tests/variabletransforms/variabletransforms_SondePressureFromHeightICAO.yaml
+63 −0		test/testinput/unit_tests/variabletransforms/variabletransforms_btfromradiance.yaml