-
Notifications
You must be signed in to change notification settings - Fork 2
GEOPY-2508: Update GravityUIJson with new data forms #332
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: develop
Are you sure you want to change the base?
Conversation
# Conflicts: # docs/intro.md # package.rst # simpeg_drivers-assets/__init__.py # simpeg_drivers/__init__.py # simpeg_drivers/components/__init__.py # simpeg_drivers/components/data.py # simpeg_drivers/components/factories/__init__.py # simpeg_drivers/components/factories/abstract_factory.py # simpeg_drivers/components/factories/directives_factory.py # simpeg_drivers/components/factories/entity_factory.py # simpeg_drivers/components/factories/misfit_factory.py # simpeg_drivers/components/factories/receiver_factory.py # simpeg_drivers/components/factories/simpeg_factory.py # simpeg_drivers/components/factories/simulation_factory.py # simpeg_drivers/components/factories/source_factory.py # simpeg_drivers/components/factories/survey_factory.py # simpeg_drivers/components/locations.py # simpeg_drivers/components/meshes.py # simpeg_drivers/components/models.py # simpeg_drivers/components/topography.py # simpeg_drivers/components/windows.py # simpeg_drivers/depth_of_investigation/__init__.py # simpeg_drivers/depth_of_investigation/sensitivity_cutoff/__init__.py # simpeg_drivers/depth_of_investigation/sensitivity_cutoff/driver.py # simpeg_drivers/depth_of_investigation/sensitivity_cutoff/options.py # simpeg_drivers/driver.py # simpeg_drivers/electricals/__init__.py # simpeg_drivers/electricals/direct_current/__init__.py # simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/driver.py # simpeg_drivers/electricals/direct_current/pseudo_three_dimensions/options.py # simpeg_drivers/electricals/direct_current/three_dimensions/__init__.py # simpeg_drivers/electricals/direct_current/three_dimensions/driver.py # simpeg_drivers/electricals/direct_current/three_dimensions/options.py # simpeg_drivers/electricals/direct_current/two_dimensions/__init__.py # simpeg_drivers/electricals/direct_current/two_dimensions/driver.py # simpeg_drivers/electricals/direct_current/two_dimensions/options.py # simpeg_drivers/electricals/driver.py # simpeg_drivers/electricals/induced_polarization/__init__.py # simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/driver.py # simpeg_drivers/electricals/induced_polarization/pseudo_three_dimensions/options.py # simpeg_drivers/electricals/induced_polarization/three_dimensions/__init__.py # simpeg_drivers/electricals/induced_polarization/three_dimensions/driver.py # simpeg_drivers/electricals/induced_polarization/three_dimensions/options.py # simpeg_drivers/electricals/induced_polarization/two_dimensions/__init__.py # simpeg_drivers/electricals/induced_polarization/two_dimensions/driver.py # simpeg_drivers/electricals/induced_polarization/two_dimensions/options.py # simpeg_drivers/electricals/options.py # simpeg_drivers/electromagnetics/__init__.py # simpeg_drivers/electromagnetics/base_1d_driver.py # simpeg_drivers/electromagnetics/base_1d_options.py # simpeg_drivers/electromagnetics/frequency_domain/__init__.py # simpeg_drivers/electromagnetics/frequency_domain/driver.py # simpeg_drivers/electromagnetics/frequency_domain/options.py # simpeg_drivers/electromagnetics/frequency_domain_1d/__init__.py # simpeg_drivers/electromagnetics/frequency_domain_1d/driver.py # simpeg_drivers/electromagnetics/frequency_domain_1d/options.py # simpeg_drivers/electromagnetics/time_domain/__init__.py # simpeg_drivers/electromagnetics/time_domain/driver.py # simpeg_drivers/electromagnetics/time_domain/options.py # simpeg_drivers/electromagnetics/time_domain_1d/__init__.py # simpeg_drivers/electromagnetics/time_domain_1d/driver.py # simpeg_drivers/electromagnetics/time_domain_1d/options.py # simpeg_drivers/joint/__init__.py # simpeg_drivers/joint/driver.py # simpeg_drivers/joint/joint_cross_gradient/__init__.py # simpeg_drivers/joint/joint_cross_gradient/driver.py # simpeg_drivers/joint/joint_cross_gradient/options.py # simpeg_drivers/joint/joint_petrophysics/__init__.py # simpeg_drivers/joint/joint_petrophysics/driver.py # simpeg_drivers/joint/joint_petrophysics/options.py # simpeg_drivers/joint/joint_surveys/__init__.py # simpeg_drivers/joint/joint_surveys/driver.py # simpeg_drivers/joint/joint_surveys/options.py # simpeg_drivers/joint/options.py # simpeg_drivers/line_sweep/__init__.py # simpeg_drivers/line_sweep/driver.py # simpeg_drivers/natural_sources/__init__.py # simpeg_drivers/natural_sources/magnetotellurics/__init__.py # simpeg_drivers/natural_sources/magnetotellurics/driver.py # simpeg_drivers/natural_sources/magnetotellurics/options.py # simpeg_drivers/natural_sources/tipper/__init__.py # simpeg_drivers/natural_sources/tipper/driver.py # simpeg_drivers/natural_sources/tipper/options.py # simpeg_drivers/options.py # simpeg_drivers/plate_simulation/__init__.py # simpeg_drivers/plate_simulation/driver.py # simpeg_drivers/plate_simulation/models/__init__.py # simpeg_drivers/plate_simulation/models/events.py # simpeg_drivers/plate_simulation/models/options.py # simpeg_drivers/plate_simulation/models/parametric.py # simpeg_drivers/plate_simulation/models/series.py # simpeg_drivers/plate_simulation/options.py # simpeg_drivers/plate_simulation/sweep/__init__.py # simpeg_drivers/plate_simulation/sweep/driver.py # simpeg_drivers/plate_simulation/sweep/options.py # simpeg_drivers/plate_simulation/sweep/uijson.py # simpeg_drivers/plate_simulation/uijson.py # simpeg_drivers/potential_fields/__init__.py # simpeg_drivers/potential_fields/gravity/__init__.py # simpeg_drivers/potential_fields/gravity/driver.py # simpeg_drivers/potential_fields/gravity/options.py # simpeg_drivers/potential_fields/gravity/uijson.py # simpeg_drivers/potential_fields/magnetic_scalar/__init__.py # simpeg_drivers/potential_fields/magnetic_scalar/driver.py # simpeg_drivers/potential_fields/magnetic_scalar/options.py # simpeg_drivers/potential_fields/magnetic_vector/__init__.py # simpeg_drivers/potential_fields/magnetic_vector/driver.py # simpeg_drivers/potential_fields/magnetic_vector/options.py # simpeg_drivers/uijson.py # simpeg_drivers/utils/__init__.py # simpeg_drivers/utils/meshes.py # simpeg_drivers/utils/nested.py # simpeg_drivers/utils/regularization.py # simpeg_drivers/utils/surveys.py # simpeg_drivers/utils/synthetics/__init__.py # simpeg_drivers/utils/synthetics/driver.py # simpeg_drivers/utils/synthetics/meshes/__init__.py # simpeg_drivers/utils/synthetics/meshes/factory.py # simpeg_drivers/utils/synthetics/meshes/octrees.py # simpeg_drivers/utils/synthetics/meshes/tensors.py # simpeg_drivers/utils/synthetics/models.py # simpeg_drivers/utils/synthetics/options.py # simpeg_drivers/utils/synthetics/surveys/__init__.py # simpeg_drivers/utils/synthetics/surveys/dcip.py # simpeg_drivers/utils/synthetics/surveys/factory.py # simpeg_drivers/utils/synthetics/surveys/frequency_domain/__init__.py # simpeg_drivers/utils/synthetics/surveys/frequency_domain/fdem.py # simpeg_drivers/utils/synthetics/surveys/layout.py # simpeg_drivers/utils/synthetics/surveys/natural_sources/__init__.py # simpeg_drivers/utils/synthetics/surveys/natural_sources/magnetotellurics.py # simpeg_drivers/utils/synthetics/surveys/natural_sources/tipper.py # simpeg_drivers/utils/synthetics/surveys/time_domain/__init__.py # simpeg_drivers/utils/synthetics/surveys/time_domain/airborne_tdem.py # simpeg_drivers/utils/synthetics/surveys/time_domain/ground_tdem.py # simpeg_drivers/utils/synthetics/topography.py # simpeg_drivers/utils/tile_estimate.py # simpeg_drivers/utils/utils.py # tests/__init__.py # tests/assets_path_test.py # tests/conftest.py # tests/data_test.py # tests/depth_of_investivation_tests/sensitivity_cutoff_test.py # tests/driver_test.py # tests/locations_test.py # tests/meshes_test.py # tests/models_test.py # tests/plate_simulation/__init__.py # tests/plate_simulation/models/__init__.py # tests/plate_simulation/models/events_test.py # tests/plate_simulation/models/params_test.py # tests/plate_simulation/models/plates_test.py # tests/plate_simulation/models/series_test.py # tests/plate_simulation/runtest/__init__.py # tests/plate_simulation/runtest/driver_test.py # tests/plate_simulation/runtest/gravity_test.py # tests/plate_simulation/runtest/sweep_test.py # tests/run_tests/__init__.py # tests/run_tests/driver_2d_rotated_gradients_test.py # tests/run_tests/driver_airborne_fem_1d_test.py # tests/run_tests/driver_airborne_tem_1d_test.py # tests/run_tests/driver_airborne_tem_test.py # tests/run_tests/driver_dc_2d_test.py # tests/run_tests/driver_dc_b2d_rotated_gradients_test.py # tests/run_tests/driver_dc_b2d_test.py # tests/run_tests/driver_dc_test.py # tests/run_tests/driver_fem_test.py # tests/run_tests/driver_grav_test.py # tests/run_tests/driver_ground_tem_test.py # tests/run_tests/driver_ip_2d_test.py # tests/run_tests/driver_ip_b2d_test.py # tests/run_tests/driver_ip_test.py # tests/run_tests/driver_joint_cross_gradient_test.py # tests/run_tests/driver_joint_pgi_homogeneous_test.py # tests/run_tests/driver_joint_surveys_test.py # tests/run_tests/driver_mag_automesh_test.py # tests/run_tests/driver_mag_test.py # tests/run_tests/driver_mt_test.py # tests/run_tests/driver_mvi_test.py # tests/run_tests/driver_rotated_gradients_test.py # tests/run_tests/driver_tile_estimator_test.py # tests/run_tests/driver_tipper_test.py # tests/run_tests/sensitivity_cutoff_test.py # tests/topography_test.py # tests/uijson_test.py # tests/utils/__init__.py # tests/utils/targets.py # tests/utils_meshes_test.py # tests/utils_regularization_test.py # tests/utils_surveys_test.py # tests/validations_test.py # tests/version_test.py
tests/uijson_test.py
Outdated
| params_data_nobraces[param] = field_data_nobraces | ||
|
|
||
| assert uijson_data == params_data_nobraces | ||
| # params_data_nobraces = {} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Clean out
domfournier
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is going to be a bit of a trickle down here, but you will need to bump geoh5py to develop, as well as geoapps-utils. Grid-apps will complain, which we need to fix also. So for now just let grid-apps use main
GEOPY-2508 - Add multi-select data form type