Skip to content

Commit

Permalink
Merge branch 'develop' into feature/gaea-c6
Browse files Browse the repository at this point in the history
  • Loading branch information
@CoryMartin-NOAA
CoryMartin-NOAA authored Oct 11, 2024
2 parents eb43777 + 496b624 commit 99546af
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion sorc/oops
Submodule oops updated 6 files
+7 −7 qg/test/testinput/gen_hybrid_linear_model_coeffs_pseudo.yaml
+7 −7 qg/test/testinput/gen_hybrid_linear_model_coeffs_pseudo_multimodel_multigeometry.yaml
+3 −1 src/oops/assimilation/GETKFSolver.h
+3 −1 src/oops/assimilation/LocalEnsembleSolver.h
+222 −12 src/oops/generic/PseudoModel.h
+6 −4 src/test/util/ArrayUtil.h
2 changes: 1 addition & 1 deletion sorc/saber
Submodule saber updated 89 files
+4 −6 src/saber/bump/type_geom.fypp
+2 −2 src/saber/bump/type_gsi.fypp
+1 −1 src/saber/bump/type_vbal.fypp
+24 −27 src/saber/gsi/covariance/gsi_covariance_mod.f90
+5 −5 src/saber/spectralb/GaussUVToGP.cc
+3 −3 src/saber/vader/DryAirDensity.h
+8 −5 src/saber/vader/HpHexnerToPExner.cc
+3 −3 src/saber/vader/HpHexnerToPExner.h
+1 −1 src/saber/vader/HydroBal.h
+16 −14 src/saber/vader/MoistIncrOpParameters.h
+2 −2 src/saber/vader/MoistureControl.cc
+3 −3 src/saber/vader/MoistureControl.h
+8 −4 src/saber/vader/WriteVariances.cc
+2 −2 test/testdata/gauss_state.nc
+7 −7 test/testinput/convertstate_lam.yaml
+7 −7 test/testinput/dirac_bump_7.yaml
+13 −13 test/testinput/dirac_fastlam-fftw_1.yaml
+13 −13 test/testinput/dirac_fastlam-fftw_2.yaml
+13 −13 test/testinput/dirac_fastlam_1.yaml
+4 −4 test/testinput/dirac_fastlam_2.yaml
+13 −13 test/testinput/dirac_fastlam_3.yaml
+13 −13 test/testinput/dirac_fastlam_4.yaml
+3 −3 test/testinput/dirac_fastlam_5.yaml
+13 −13 test/testinput/dirac_fastlam_6.yaml
+13 −13 test/testinput/dirac_fastlam_8.yaml
+13 −13 test/testinput/dirac_fastlam_9.yaml
+2 −2 test/testinput/dirac_gsi_geos_global.yaml
+2 −2 test/testinput/dirac_gsi_geos_global_opt_1.yaml
+2 −2 test/testinput/dirac_gsi_geos_global_opt_2.yaml
+2 −2 test/testinput/dirac_gsi_geos_global_opt_3.yaml
+2 −2 test/testinput/dirac_gsi_gfs_global.yaml
+3 −3 test/testinput/dirac_spectralb_duplicate_variables.yaml
+12 −12 test/testinput/dirac_spectralb_gauss_vader_1.yaml
+13 −13 test/testinput/dirac_spectralb_gauss_vader_2.yaml
+12 −12 test/testinput/dirac_spectralb_gauss_vader_3.yaml
+13 −13 test/testinput/dirac_spectralb_gauss_vader_4.yaml
+12 −12 test/testinput/dirac_spectralb_gauss_vader_5.yaml
+4 −4 test/testinput/dirac_vertproj.yaml
+13 −13 test/testinput/dirac_write_fields.yaml
+4 −4 test/testinput/error_covariance_training_bump_hdiag-nicas_2.yaml
+4 −4 test/testinput/error_covariance_training_bump_hdiag-nicas_4.yaml
+3 −3 test/testinput/error_covariance_training_bump_hdiag_1.yaml
+2 −2 test/testinput/error_covariance_training_bump_hdiag_2.yaml
+4 −4 test/testinput/error_covariance_training_bump_hdiag_4.yaml
+4 −4 test/testinput/error_covariance_training_bump_nicas_6.yaml
+3 −3 test/testinput/error_covariance_training_bump_stddev_6.yaml
+4 −4 test/testinput/error_covariance_training_bump_vbal_7.yaml
+14 −14 test/testinput/error_covariance_training_spectralb_mio.yaml
+4 −4 test/testinput/randomization_bump_nicas_L10L2.yaml
+4 −4 test/testinput/randomization_bump_nicas_L10L2T18.yaml
+4 −4 test/testinput/randomization_bump_nicas_L12L2.yaml
+5 −5 test/testinput/randomization_bump_nicas_lam_1.yaml
+4 −4 test/testinput/randomization_bump_nicas_lam_2.yaml
+12 −12 test/testinput/randomization_sqrtspectralb_2.yaml
+8 −8 test/testref/convertstate_lam.ref
+2 −2 test/testref/dirac_bump_7.ref
+2 −2 test/testref/dirac_fastlam-fftw_1.ref
+2 −2 test/testref/dirac_fastlam-fftw_2.ref
+2 −2 test/testref/dirac_fastlam_1.ref
+2 −2 test/testref/dirac_fastlam_2.ref
+2 −2 test/testref/dirac_fastlam_3.ref
+2 −2 test/testref/dirac_fastlam_4.ref
+2 −2 test/testref/dirac_fastlam_5.ref
+2 −2 test/testref/dirac_fastlam_6.ref
+2 −2 test/testref/dirac_fastlam_8.ref
+2 −2 test/testref/dirac_fastlam_9.ref
+2 −2 test/testref/dirac_gsi_geos_global.ref
+2 −2 test/testref/dirac_gsi_geos_global_opt_1.ref
+2 −2 test/testref/dirac_gsi_geos_global_opt_2.ref
+2 −2 test/testref/dirac_gsi_geos_global_opt_3.ref
+2 −2 test/testref/dirac_gsi_gfs_global.ref
+4 −4 test/testref/dirac_spectralb_duplicate_variables.ref
+4 −4 test/testref/dirac_spectralb_gauss_vader_1.ref
+4 −4 test/testref/dirac_spectralb_gauss_vader_2.ref
+6 −6 test/testref/dirac_spectralb_gauss_vader_3.ref
+4 −4 test/testref/dirac_spectralb_gauss_vader_4.ref
+4 −4 test/testref/dirac_spectralb_gauss_vader_5.ref
+4 −4 test/testref/dirac_vertproj.ref
+178 −178 test/testref/dirac_write_fields.ref
+26 −26 test/testref/error_covariance_training_bump_hdiag_1.ref
+1 −1 test/testref/error_covariance_training_bump_hdiag_2.ref
+25 −25 test/testref/error_covariance_training_bump_hdiag_4.ref
+1 −1 test/testref/error_covariance_training_bump_vbal_7.ref
+25 −25 test/testref/randomization_bump_nicas_L10L2.ref
+25 −25 test/testref/randomization_bump_nicas_L10L2T18.ref
+25 −25 test/testref/randomization_bump_nicas_L12L2.ref
+1 −1 test/testref/randomization_bump_nicas_lam_1.ref
+2 −2 test/testref/randomization_bump_nicas_lam_2.ref
+2 −2 test/testref/randomization_sqrtspectralb_2.ref

0 comments on commit 99546af

Please sign in to comment.