Skip to content

Commit

Permalink
resolve conflict(s)
Browse files Browse the repository at this point in the history
  • Loading branch information
@apchoiCMD
apchoiCMD committed Nov 13, 2024
1 parent 59c8fac commit f696d74
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion parm/jcb-algorithms
Submodule jcb-algorithms updated 3 files
+87 −0 .github/workflows/run_jcb_basic_testing.yaml
+2 −2 3dfgat.yaml.j2
+2 −2 3dvar.yaml.j2
2 changes: 1 addition & 1 deletion parm/jcb-gdas
Submodule jcb-gdas updated 42 files
+33 −0 .github/workflows/run_jcb_basic_testing.yaml
+48 −0 algorithm/aero/aero_convert_background.yaml.j2
+81 −0 algorithm/aero/aero_gen_bmatrix_diagb.yaml.j2
+48 −0 algorithm/aero/aero_gen_bmatrix_diffusion.yaml.j2
+10 −0 algorithm/atmosphere/atm_bias_staging.yaml.j2
+8 −0 algorithm/atmosphere/atm_obs_staging.yaml.j2
+37 −0 algorithm/marine/soca_diagb.yaml.j2
+98 −0 algorithm/marine/soca_ensb.yaml.j2
+37 −0 algorithm/marine/soca_ensweights.yaml.j2
+5 −0 algorithm/marine/soca_gridgen.yaml.j2
+37 −0 algorithm/marine/soca_parameters_diffusion_hz.yaml.j2
+34 −0 algorithm/marine/soca_parameters_diffusion_vt.yaml.j2
+23 −0 algorithm/marine/soca_setcorscales.yaml.j2
+13 −0 algorithm/marine/soca_vtscales.yaml.j2
+1 −0 model/aero/aero_3dfgat_outer_loop_1.yaml.j2
+1 −0 model/aero/aero_3dfgat_outer_loop_2.yaml.j2
+17 −0 model/aero/aero_3dvar_outer_loop_1.yaml.j2
+17 −0 model/aero/aero_3dvar_outer_loop_2.yaml.j2
+10 −0 model/aero/aero_background.yaml.j2
+33 −0 model/aero/aero_background_error_static_diffusion.yaml.j2
+23 −0 model/aero/aero_final_increment_cubed_sphere.yaml.j2
+18 −0 model/aero/aero_final_increment_gaussian.yaml.j2
+0 −0 model/aero/aero_geometry.yaml.j2
+11 −0 model/aero/aero_geometry_background.yaml.j2
+13 −0 model/aero/aero_model_pseudo.yaml.j2
+22 −45 model/marine/marine_background_error_hybrid_diffusion_diffusion.yaml.j2
+29 −0 observation_chronicle/atmosphere/abi_g16.yaml
+29 −0 observation_chronicle/atmosphere/abi_g17.yaml
+0 −0 observation_chronicle/atmosphere/iasi_metop-a.yaml
+0 −0 observation_chronicle/atmosphere/iasi_metop-b.yaml
+63 −0 observations/aero/viirs_n20_aod.yaml.j2
+63 −0 observations/aero/viirs_n21_aod.yaml.j2
+63 −0 observations/aero/viirs_npp_aod.yaml.j2
+31 −89 observations/atmosphere-lgetkf/iasi_metop-a.yaml.j2
+31 −89 observations/atmosphere-lgetkf/iasi_metop-b.yaml.j2
+474 −0 observations/atmosphere/abi_g16.yaml.j2
+474 −0 observations/atmosphere/abi_g17.yaml.j2
+31 −90 observations/atmosphere/iasi_metop-a.yaml.j2
+31 −90 observations/atmosphere/iasi_metop-b.yaml.j2
+0 −542 observations/marine/insitu_profile_argo.yaml.j2
+136 −0 test/client_integration/gdas-atmosphere-templates.yaml
+113 −0 test/client_integration/gdas-marine-templates.yaml
2 changes: 1 addition & 1 deletion sorc/fv3-jedi
Submodule fv3-jedi updated 10 files
+1 −24 src/fv3jedi/IO/FV3Restart/fv3jedi_io_fms2_mod.f90
+1 −1 test/Data/fv3files/fmsmpp.nml
+1 −1 test/Data/fv3files/input_geos_c12.nml
+1 −1 test/Data/fv3files/input_geos_c12_p12.nml
+1 −1 test/Data/fv3files/input_geos_c24.nml
+1 −1 test/Data/fv3files/input_gfs_c12.nml
+1 −1 test/Data/fv3files/input_gfs_c12_p12.nml
+1 −1 test/Data/fv3files/input_gfs_c12_z64_1x1.nml
+1 −1 test/Data/fv3files/input_gfs_c24.nml
+1 −1 test/Data/fv3files/input_gfs_c24_p12.nml
2 changes: 1 addition & 1 deletion sorc/saber
Submodule saber updated 88 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
+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 f696d74

Please sign in to comment.