Skip to content

Commit

Permalink
save
Browse files Browse the repository at this point in the history
  • Loading branch information
xincjin-NOAA committed Jun 4, 2024
1 parent 9434d60 commit 923353b
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 21 deletions.
2 changes: 1 addition & 1 deletion sorc/femps
2 changes: 1 addition & 1 deletion sorc/fv3-jedi
Submodule fv3-jedi updated 57 files
+2 −0 CI/CMakeLists.txt
+2 −0 CI/CMakeLists_nightly.txt
+4 −0 CI/buildspec_clang.yml
+4 −0 CI/buildspec_gnu.yml
+4 −0 CI/buildspec_intel.yml
+4 −0 CI/buildspec_intel_nightly.yml
+3 −2 CMakeLists.txt
+1 −1 README.md
+0 −18 cmake/fv3jedi_extra_macros.cmake
+1 −1 src/fv3jedi/Geometry/Geometry.cc
+1 −2 src/fv3jedi/Geometry/GeometryParameters.h
+0 −88 src/fv3jedi/Geometry/TimeInvariantFieldsHelpers.cc
+4 −0 src/fv3jedi/Geometry/TimeInvariantFieldsHelpers.h
+12 −24 src/fv3jedi/Geometry/fv3jedi_geom_mod.f90
+26 −42 src/fv3jedi/IO/CubeSphereHistory/fv3jedi_io_cube_sphere_history_mod.f90
+0 −12 src/fv3jedi/LinearVariableChange/Model2GeoVaLs/fv3jedi_lvc_model2geovals_mod.f90
+1 −2 src/fv3jedi/Model/ufs/ModelUFS.cc
+0 −2 src/fv3jedi/Model/ufs/ModelUFS.h
+2 −2 src/fv3jedi/Model/ufs/ModelUFS.interface.h
+3 −6 src/fv3jedi/Model/ufs/fv3jedi_ufs_interface_mod.F90
+52 −17 src/fv3jedi/Model/ufs/fv3jedi_ufs_mod.F90
+0 −1 src/fv3jedi/State/State.cc
+0 −2 src/fv3jedi/State/State.h
+43 −62 src/fv3jedi/VariableChange/Utils/surface_variables_mod.f90
+0 −6 src/mains/CMakeLists.txt
+0 −19 src/mains/fv3jediEnsGETKF.cc
+62 −40 test/CMakeLists.txt
+0 −1 test/Data/fieldmetadata/gfs-history.yaml
+0 −57 test/Data/fieldmetadata/gfs-restart-surface-masks.yaml
+1 −1 test/Data/gsibec/geos_gsi_global_72x46x72.nml
+1 −1 test/Data/gsibec/gfs_gsi_global_192x96x127.nml
+1 −3 test/setup-c48.sh
+0 −127 test/testinput/3dvar_snow.yaml
+0 −5 test/testinput/ensemble_ufs_forecast.yaml
+26 −0 test/testinput/ensfc_ufs.yaml
+2 −2 test/testinput/forecast_ufs_1.yaml
+2 −2 test/testinput/forecast_ufs_2.yaml
+3 −2 test/testinput/forecast_ufs_c48_warmstart.yaml
+123 −0 test/testinput/hofx_gfs_aero_aodluts.yaml
+0 −67 test/testinput/hofx_nomodel_amsua_fov.yaml
+116 −0 test/testinput/hyb-3dvar_gfs_aero.yaml
+0 −1 test/testinput/hyb-4denvar_geos_sondes_c12.yaml
+4 −5 test/testinput/hyb-fgat_gfs_aero.yaml
+2 −8 test/testinput/linearvariablechange_geos.yaml
+1 −1 test/testinput/model_ufs_c48_warmstart.yaml
+12 −12 test/testoutput/3dvar_gfs_sondes.ref
+0 −17 test/testoutput/3dvar_snow.ref
+20 −20 test/testoutput/4dvar_geos_aero.ref
+5 −5 test/testoutput/dirac_geos_gsi_global.ref
+5 −5 test/testoutput/dirac_gfs_gsi_global.ref
+11 −0 test/testoutput/ensmeanvariance_geos.ref
+12 −0 test/testoutput/ensmeanvariance_gfs.ref
+58 −0 test/testoutput/hofx_gfs_aero_aodluts.ref
+0 −31 test/testoutput/hofx_nomodel_amsua_fov.ref
+9 −9 test/testoutput/hyb-3dvar_geos_sondes_c12.ref
+31 −0 test/testoutput/hyb-3dvar_gfs_aero.ref
+23 −23 test/testoutput/hyb-fgat_gfs_aero.ref
2 changes: 1 addition & 1 deletion sorc/fv3-jedi-lm
2 changes: 1 addition & 1 deletion sorc/ioda
Submodule ioda updated 95 files
+0 −3 .pycodestyle
+3 −6 CMakeLists.txt
+0 −1 share/ioda/yaml/iodatest_odb_oceansound.yaml
+0 −1 share/ioda/yaml/iodatest_odb_oceansound_truncate_profiles.yaml
+0 −1 share/ioda/yaml/iodatest_odb_sonde.yaml
+0 −1 share/ioda/yaml/iodatest_odb_sonde_history.yaml
+0 −1 share/ioda/yaml/iodatest_odb_sonde_mixed.yaml
+0 −1 share/ioda/yaml/iodatest_odb_sonde_time_displacement.yaml
+0 −1 share/ioda/yaml/iodatest_odb_sonde_truncate_profiles.yaml
+0 −1 share/ioda/yaml/iodatest_odb_sonde_write.yaml
+0 −1 share/ioda/yaml/iodatest_odb_sonde_write_mixed.yaml
+0 −1 share/ioda/yaml/iodatest_odb_surface.yaml
+0 −1 share/ioda/yaml/iodatest_odb_surfacesst.yaml
+0 −2 share/ioda/yaml/odb_oceansound_name_map.yaml
+0 −2 share/ioda/yaml/odb_sonde_name_map.yaml
+0 −2 share/ioda/yaml/odb_surface_name_map.yaml
+0 −2 share/ioda/yaml/odb_surfacesst_name_map.yaml
+0 −2 src/CMakeLists.txt
+0 −3 src/ObsDataIoParameters.h
+3 −3 src/ObsSpace.cc
+8 −1 src/ObsSpace.h
+1 −1 src/ObsSpaceParameters.h
+6 −2 src/core/IodaUtils.cc
+0 −2 src/core/IodaUtils.h
+0 −13 src/engines/Examples/Basic/02-Attributes.cpp
+8 −25 src/engines/Examples/Basic/03-VariablesIntro.cpp
+1 −1 src/engines/ioda/CMakeLists.txt
+10 −10 src/engines/ioda/fortran/ioda_attribute_mod.f90
+4 −4 src/engines/ioda/fortran/ioda_dimensions_mod.f90
+8 −8 src/engines/ioda/fortran/ioda_has_attributes_mod.f90
+21 −21 src/engines/ioda/fortran/ioda_has_variables_mod.f90
+1 −1 src/engines/ioda/fortran/ioda_variable_creation_parameters_mod.f90
+12 −12 src/engines/ioda/fortran/ioda_variable_mod.f90
+2 −2 src/engines/ioda/include/ioda/C/ioda_attribute_c.hpp
+1 −1 src/engines/ioda/include/ioda/C/ioda_has_attributes_c.hpp
+4 −4 src/engines/ioda/include/ioda/C/ioda_has_variables_c.hpp
+2 −2 src/engines/ioda/include/ioda/C/ioda_variable_creation_parameters_c.hpp
+0 −30 src/engines/ioda/include/ioda/Engines/EngineUtils.h
+0 −1 src/engines/ioda/include/ioda/Exception.h
+4 −14 src/engines/ioda/include/ioda/Variables/VarUtils.h
+7 −2 src/engines/ioda/src/ioda/C/ioda_attribute_c.cpp
+10 −1 src/engines/ioda/src/ioda/C/ioda_has_attributes_c.cpp
+17 −2 src/engines/ioda/src/ioda/C/ioda_has_variables_c.cpp
+6 −1 src/engines/ioda/src/ioda/C/ioda_variable_creation_parameters_c.cpp
+12 −66 src/engines/ioda/src/ioda/Engines/EngineUtils.cpp
+1 −62 src/engines/ioda/src/ioda/Engines/HH/HH-util.cpp
+0 −5 src/engines/ioda/src/ioda/Engines/HH/HH/HH-util.h
+18 −20 src/engines/ioda/src/ioda/Engines/ODC/ODC.cpp
+0 −3 src/engines/ioda/src/ioda/Engines/ODC/OdbQueryParameters.h
+8 −55 src/engines/ioda/src/ioda/Engines/ObsStore/Attributes.cpp
+0 −39 src/engines/ioda/src/ioda/Engines/ObsStore/Type.cpp
+0 −7 src/engines/ioda/src/ioda/Engines/ObsStore/Type.hpp
+8 −53 src/engines/ioda/src/ioda/Engines/ObsStore/Variables.cpp
+3 −3 src/engines/ioda/src/ioda/Engines/ReadScriptFile.cpp
+0 −8 src/engines/ioda/src/ioda/Exception.cpp
+17 −19 src/engines/ioda/src/ioda/VarUtils.cpp
+13 −36 src/ioPool/IoPoolBase.cpp
+5 −28 src/ioPool/IoPoolBase.h
+10 −14 src/ioPool/IoPoolParameters.h
+4 −51 src/ioPool/ReaderPoolBase.cpp
+2 −44 src/ioPool/ReaderPoolBase.h
+457 −773 src/ioPool/ReaderPoolUtils.cpp
+142 −110 src/ioPool/ReaderPoolUtils.h
+0 −158 src/ioPool/ReaderPrepInputFiles.cpp
+0 −71 src/ioPool/ReaderPrepInputFiles.h
+169 −390 src/ioPool/ReaderSinglePool.cpp
+20 −16 src/ioPool/ReaderSinglePool.h
+70 −38 src/ioPool/ReaderSinglePoolAllTasks.cpp
+3 −5 src/ioPool/ReaderSinglePoolAllTasks.h
+20 −4 src/ioPool/WriterSinglePool.cpp
+1 −5 src/mains/CMakeLists.txt
+0 −19 src/mains/buildInputFileSet.cc
+0 −92 src/mains/buildInputFileSet.h
+0 −1 src/python/CMakeLists.txt
+0 −32 src/python/pyiodautils/CMakeLists.txt
+0 −0 src/python/pyiodautils/__init__.py
+0 −248 src/python/pyiodautils/file_merge.py
+9 −180 test/CMakeLists.txt
+1 −6 test/ioda/IoPoolFactory.h
+0 −1 test/python/CMakeLists.txt
+0 −36 test/python/pyiodautils/CMakeLists.txt
+0 −24 test/python/pyiodautils/test_file_merge_concat_method.py
+0 −19 test/testinput/iodatest_build_amsua_n19_file_set.yaml
+0 −19 test/testinput/iodatest_build_amsua_n19_file_set_mpi7.yaml
+0 −18 test/testinput/iodatest_build_gnssro_file_set.yaml
+0 −18 test/testinput/iodatest_build_gnssro_file_set_mpi7.yaml
+0 −18 test/testinput/iodatest_build_sondes_file_set.yaml
+0 −18 test/testinput/iodatest_build_sondes_file_set_mpi7.yaml
+0 −3 test/testinput/iodatest_io_pool_factory.yaml
+0 −1 test/testinput/iodatest_odb_surface_with_query.yaml
+0 −54 test/testinput/iodatest_time_io_reader_pool_ext_file_prep.yaml
+0 −54 test/testinput/iodatest_time_io_reader_pool_ext_file_prep_mpi7.yaml
+4 −4 test/testinput/iodatest_time_io_script.yaml
+0 −1 tools/CMakeLists.txt
+0 −10 tools/ioda_pylint.sh
2 changes: 1 addition & 1 deletion sorc/oops
Submodule oops updated 67 files
+1 −1 CMakeLists.txt
+16 −69 cmake/backtrace_deps.cmake
+1 −3 l95/src/lorenz95/ObservationL95.cc
+4 −5 l95/src/lorenz95/ObservationL95.h
+2 −4 l95/src/lorenz95/ObservationTLAD.cc
+3 −6 l95/src/lorenz95/ObservationTLAD.h
+2 −2 qg/model/ObsDataQG.h
+4 −5 qg/model/ObsOpBaseQG.h
+5 −8 qg/model/ObsOpBaseTLAD.h
+1 −2 qg/model/ObsOperatorQG.cc
+1 −5 qg/model/ObsOperatorQG.h
+4 −6 qg/model/ObsOperatorTLAD.cc
+2 −9 qg/model/ObsOperatorTLAD.h
+1 −2 qg/model/ObsStreamQG.cc
+2 −4 qg/model/ObsStreamQG.h
+2 −2 qg/model/ObsStreamTLAD.cc
+4 −6 qg/model/ObsStreamTLAD.h
+2 −2 qg/model/ObsVecQG.h
+1 −2 qg/model/ObsWSpeedQG.cc
+1 −3 qg/model/ObsWSpeedQG.h
+2 −4 qg/model/ObsWSpeedTLAD.cc
+2 −4 qg/model/ObsWSpeedTLAD.h
+1 −2 qg/model/ObsWindQG.cc
+1 −3 qg/model/ObsWindQG.h
+2 −4 qg/model/ObsWindTLAD.cc
+2 −5 qg/model/ObsWindTLAD.h
+3 −3 qg/test/testinput/eda_3dfgat_with_member_template.yaml
+8 −8 qg/test/testinput/eda_3dvar_control_pert.yaml
+10 −13 qg/test/testinput/eda_4dvar_control_pert.yaml
+17 −17 qg/test/testoutput/eda_4dvar_control_pert.test
+2 −14 src/CMakeLists.txt
+6 −32 src/oops/assimilation/CostPert.h
+4 −4 src/oops/base/FieldSet3D.cc
+1 −2 src/oops/base/FieldSet3D.h
+7 −34 src/oops/base/GeometryData.cc
+2 −2 src/oops/base/GeometryData.h
+9 −9 src/oops/base/LatLonGridWriter.h
+0 −3 src/oops/base/ObsOperatorBase.h
+2 −8 src/oops/base/ObsOperatorPert.h
+3 −2 src/oops/base/Observer.h
+4 −6 src/oops/base/ObserverTLAD.h
+1 −1 src/oops/generic/AtlasInterpolator.cc
+4 −4 src/oops/generic/GlobalInterpolator.cc
+4 −4 src/oops/generic/GlobalTemplatedInterpolator.h
+1 −1 src/oops/generic/UnstructuredInterpolator.cc
+8 −17 src/oops/interface/LinearObsOperator.h
+1 −2 src/oops/interface/ObsDataVector_head.h
+4 −11 src/oops/interface/ObsOperator.h
+14 −22 src/oops/runs/ControlPert.h
+16 −14 src/oops/runs/ConvertIncrement.h
+10 −15 src/oops/runs/EnsMeanAndVariance.h
+0 −3 src/oops/runs/Run.cc
+19 −152 src/oops/util/FieldSetHelpers.cc
+0 −21 src/oops/util/FieldSetHelpers.h
+1 −1 src/oops/util/FieldSetOperations.cc
+4 −58 src/oops/util/FunctionSpaceHelpers.cc
+0 −12 src/oops/util/FunctionSpaceHelpers.h
+0 −43 src/oops/util/Stacktrace.cc
+0 −39 src/oops/util/Stacktrace.h
+6 −2 src/oops/util/signal_trap.cc
+2 −27 src/test/interface/Increment.h
+14 −29 src/test/interface/LinearObsOperator.h
+0 −4 src/test/interface/ObsLocalization.h
+4 −8 src/test/interface/ObsOperator.h
+2 −2 src/test/interface/State.h
+7 −7 src/test/util/FieldSetHelpersAndOperations.h
+0 −19 src/test/util/Stacktrace.cc
2 changes: 1 addition & 1 deletion sorc/saber
Submodule saber updated 143 files
2 changes: 1 addition & 1 deletion sorc/soca
Submodule soca updated 187 files
2 changes: 1 addition & 1 deletion sorc/ufo
Submodule ufo updated 267 files
2 changes: 1 addition & 1 deletion sorc/vader
Submodule vader updated 45 files
+1 −13 src/CMakeLists.txt
+113 −22 src/mo/common_varchange.cc
+6 −0 src/mo/common_varchange.h
+3 −1 src/mo/constants.h
+0 −340 src/mo/dlsvpW_lookup.h
+0 −340 src/mo/dlsvp_lookup.h
+0 −465 src/mo/eval_dry_air_density.cc
+4 −20 src/mo/eval_dry_air_density.h
+50 −43 src/mo/eval_sat_vapour_pressure.cc
+9 −18 src/mo/eval_sat_vapour_pressure.h
+29 −0 src/mo/functions.cc
+28 −1 src/mo/functions.h
+0 −25 src/mo/lookups.h
+0 −339 src/mo/svpW_lookup.h
+45 −2 src/mo/svp_interface.F90
+0 −341 src/mo/svp_lookup.h
+1 −2 src/vader/DefaultCookbook.h
+2 −10 src/vader/recipes/AirTemperature.h
+2 −8 src/vader/recipes/AirTemperature_A.cc
+20 −47 src/vader/recipes/DryAirDensityLevelsMinusOne.h
+0 −114 src/vader/recipes/DryAirDensityLevelsMinusOne_C.cc
+0 −45 src/vader/recipes/SaturationSpecificHumidity.h
+0 −71 src/vader/recipes/SaturationSpecificHumidity_A.cc
+0 −46 src/vader/recipes/SaturationVaporPressure.h
+0 −69 src/vader/recipes/SaturationVaporPressure_A.cc
+0 −46 src/vader/recipes/TotalRelativeHumidity.h
+0 −82 src/vader/recipes/TotalRelativeHumidity_A.cc
+0 −36 test/CMakeLists.txt
+3 −0 test/testdata/AirTemperature_A.nc
+0 −3 test/testdata/dry_air_density_levels_minus_one_C.nc
+2 −2 test/testdata/gauss_state_F12.nc
+2 −0 test/testinput/recipe_AirPressureExtendedUpByOne_A.yaml
+1 −1 test/testinput/recipe_AirTemperature_A.yaml
+1 −1 test/testinput/recipe_CloudIceMixingRatio_A.yaml
+0 −7 test/testinput/recipe_DryAirDensityLevelsMinusOne_C.yaml
+0 −7 test/testinput/recipe_SaturationSpecificHumidity_A.yaml
+0 −7 test/testinput/recipe_SaturationVaporPressure_A.yaml
+0 −7 test/testinput/recipe_TotalRelativeHumidity_A.yaml
+0 −1 test/testinput/recipe_uwind_at_10m_A.yaml
+0 −1 test/testinput/recipe_vwind_at_10m_A.yaml
+2 −5 test/testinput/vader_AirTemperature_A.yaml
+0 −11 test/testinput/vader_DryAirDensityLevelsMinusOne_C.yaml
+2 −31 test/vader/Recipe.h
+0 −184 test/vader/mo/CheckLookupTables.h
+0 −15 test/vader/mo/TestCheckLookupTables.cc
21 changes: 11 additions & 10 deletions ush/ioda/bufr2ioda/bufr2ioda_ssmis.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,15 @@ def __init__(self, *args, **kwargs):
self.update_config(config_json)
self.yaml_config = ssmis_yaml

def re_map_variable(self):

for sat_id in self.sat_ids:
logger.info(f'Converting for {sat_id}, ...')
ta = self.get_container_variable('variables', 'brightnessTemperature', sat_id)
tb = self.apply_corr(ta)
self.replace_container_variable('variables', 'brightnessTemperature', tb, sat_id)

def apply_corr(self, ta):
ta = ta * 100
return ta

if __name__ == '__main__':
parser = argparse.ArgumentParser()
parser.add_argument('-v', '--verbose', help='print debug logging information',
action='store_true')
args = parser.parse_args()
log_level = 'DEBUG' if args.verbose else 'INFO'
logger = Logger(os.path.basename(__file__), level=log_level)
converter = Bufr2IodaSsmis(config)
converter.execute()
logger.info('--Finished--')
3 changes: 3 additions & 0 deletions ush/ioda/bufr2ioda/combine_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ def get_container_variable(self, group, variable, sat_id):
def replace_container_variable(self, group, variable, var, sat_id):
self.container.replace(group + '/' + variable, var, [sat_id, ])

def add_container_variable(self, group, variable, var, sat_id):
self.container.replace(group + '/' + variable, var, [sat_id, ])

def get_yaml_file(self):
return self.config['yaml_file']

Expand Down

0 comments on commit 923353b

Please sign in to comment.