Skip to content
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.

Sign up for GitHub

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

Jump to bottom

GEOPY-989 #595

Merged
merged 3 commits into from
Aug 10, 2023
Merged

GEOPY-989 #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a08836
Update write_default_uijson to fix files written without forward_u_js…
benk-mira Aug 3, 2023
bc2630f
Merge branch 'develop' into GEOPY-989
benk-mira Aug 10, 2023
6f664f6
remove forward/inversion_ui_json
benk-mira Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 0 additions & 34 deletions geoapps/inversion/electricals/direct_current/pseudo_three_dimensions/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,40 +136,6 @@
"distributed_workers": None,
}

inversion_ui_json = {
"potential_channel_bool": True,
}

forward_ui_json = {
"data_object": {
"main": True,
"group": "Survey",
"label": "Object",
"meshType": "{275ecee9-9c24-4378-bf94-65f3c5fbe163}",
"value": None,
},
"line_object": {
"association": ["Cell", "Vertex"],
"dataType": "Referenced",
"group": "Survey",
"main": True,
"label": "Line ID",
"parent": "data_object",
"value": None,
},
"starting_model": {
"association": "Cell",
"dataType": "Float",
"group": "Mesh and models",
"main": True,
"isValue": False,
"parent": "mesh",
"label": "Conductivity (S/m)",
"property": None,
"value": 1e-3,
},
}

default_ui_json = {
"title": "Direct Current (DC) 3D Inversion",
"icon": "PotentialElectrode",
Expand Down
4 changes: 0 additions & 4 deletions geoapps/inversion/electricals/direct_current/pseudo_three_dimensions/params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@
from geoapps.inversion.electricals.direct_current.pseudo_three_dimensions.constants import (
default_ui_json,
forward_defaults,
forward_ui_json,
inversion_defaults,
inversion_ui_json,
validations,
)

Expand All @@ -30,9 +28,7 @@ class DirectCurrentPseudo3DParams(InversionBaseParams):
def __init__(self, input_file=None, forward_only=False, **kwargs):
self._default_ui_json = deepcopy(default_ui_json)
self._forward_defaults = deepcopy(forward_defaults)
self._forward_ui_json = deepcopy(forward_ui_json)
self._inversion_defaults = deepcopy(inversion_defaults)
self._inversion_ui_json = deepcopy(inversion_ui_json)
self._inversion_type = "direct current 3d"
self._validations = validations
self._potential_channel_bool = None
Expand Down
32 changes: 0 additions & 32 deletions geoapps/inversion/electricals/direct_current/three_dimensions/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,38 +117,6 @@
"distributed_workers": None,
}

inversion_ui_json = {
"potential_channel_bool": True,
}

forward_ui_json = {
"data_object": {
"main": True,
"group": "Survey",
"label": "Object",
"meshType": "{275ecee9-9c24-4378-bf94-65f3c5fbe163}",
"value": None,
},
"z_from_topo": {
"group": "Survey",
"main": True,
"label": "Surface survey",
"tooltip": "Uncheck if borehole data is present",
"value": True,
},
"starting_model": {
"association": ["Cell", "Vertex"],
"dataType": "Float",
"group": "Mesh and models",
"main": True,
"isValue": False,
"parent": "mesh",
"label": "Conductivity (S/m)",
"property": None,
"value": 1e-1,
},
}

default_ui_json = {
"title": "Direct Current (DC) 3D Inversion",
"documentation": "https://geoapps.readthedocs.io/en/stable/content/applications/dcip_inversion.html",
Expand Down
4 changes: 0 additions & 4 deletions geoapps/inversion/electricals/direct_current/three_dimensions/params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
from .constants import (
default_ui_json,
forward_defaults,
forward_ui_json,
inversion_defaults,
inversion_ui_json,
validations,
)

Expand All @@ -31,9 +29,7 @@ class DirectCurrent3DParams(InversionBaseParams):
def __init__(self, input_file=None, forward_only=False, **kwargs):
self._default_ui_json = deepcopy(default_ui_json)
self._forward_defaults = deepcopy(forward_defaults)
self._forward_ui_json = deepcopy(forward_ui_json)
self._inversion_defaults = deepcopy(inversion_defaults)
self._inversion_ui_json = deepcopy(inversion_ui_json)
self._inversion_type = "direct current 3d"
self._validations = validations
self._potential_channel_bool = None
Expand Down
50 changes: 1 addition & 49 deletions geoapps/inversion/electricals/direct_current/two_dimensions/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,54 +130,6 @@
"gradient_type": "total",
}

inversion_ui_json = {
"potential_channel_bool": True,
}

forward_ui_json = {
"starting_model": {
"association": "Cell",
"dataType": "Float",
"group": "Mesh and models",
"main": True,
"isValue": False,
"parent": "mesh",
"label": "Conductivity (S/m)",
"property": None,
"value": 1e-3,
},
"data_object": {
"main": True,
"group": "Survey",
"label": "Object",
"meshType": "{275ecee9-9c24-4378-bf94-65f3c5fbe163}",
"value": None,
},
"z_from_topo": {
"group": "Survey",
"main": True,
"label": "Surface survey",
"tooltip": "Uncheck if borehole data is present",
"value": True,
},
"line_object": {
"association": ["Cell", "Vertex"],
"dataType": "Referenced",
"group": "Survey",
"main": True,
"label": "Line ID",
"parent": "data_object",
"value": None,
},
"line_id": {
"group": "Survey",
"main": True,
"min": 1,
"label": "Line number",
"value": 1,
},
}

default_ui_json = {
"title": "Direct Current (DC) 2D Inversion",
"icon": "PotentialElectrode",
Expand Down Expand Up @@ -218,7 +170,7 @@
"dataType": "Float",
"group": "Data",
"main": True,
"label": "DC data (V/I)",
"label": "Potential (V/I)",
"tooltip": "Potential: voltage normalized by current",
"parent": "data_object",
"value": None,
Expand Down
4 changes: 0 additions & 4 deletions geoapps/inversion/electricals/direct_current/two_dimensions/params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@
from .constants import (
default_ui_json,
forward_defaults,
forward_ui_json,
inversion_defaults,
inversion_ui_json,
validations,
)

Expand All @@ -30,9 +28,7 @@ class DirectCurrent2DParams(Base2DParams):
def __init__(self, input_file=None, forward_only=False, **kwargs):
self._default_ui_json = deepcopy(default_ui_json)
self._forward_defaults = deepcopy(forward_defaults)
self._forward_ui_json = deepcopy(forward_ui_json)
self._inversion_defaults = deepcopy(inversion_defaults)
self._inversion_ui_json = deepcopy(inversion_ui_json)
self._inversion_type = "direct current 2d"
self._validations = validations
self._potential_channel_bool = None
Expand Down
35 changes: 0 additions & 35 deletions geoapps/inversion/electricals/induced_polarization/pseudo_three_dimensions/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,41 +138,6 @@
"distributed_workers": None,
}

inversion_ui_json = {
"chargeability_channel_bool": True,
}

forward_ui_json = {
"data_object": {
"main": True,
"group": "Survey",
"label": "Object",
"meshType": "{275ecee9-9c24-4378-bf94-65f3c5fbe163}",
"value": None,
},
"line_object": {
"association": ["Cell", "Vertex"],
"dataType": "Referenced",
"group": "Survey",
"main": True,
"label": "Line ID",
"parent": "data_object",
"value": None,
},
"line_id": 1,
"starting_model": {
"association": "Cell",
"dataType": "Float",
"group": "Mesh and models",
"main": True,
"isValue": False,
"parent": "mesh",
"label": "Chargeability (V/V)",
"property": None,
"value": 1e-3,
},
}

default_ui_json = {
"title": "Induced Polarization (IP) 3D Inversion",
"icon": "PotentialElectrode",
Expand Down
4 changes: 0 additions & 4 deletions geoapps/inversion/electricals/induced_polarization/pseudo_three_dimensions/params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@
from geoapps.inversion.electricals.induced_polarization.pseudo_three_dimensions.constants import (
default_ui_json,
forward_defaults,
forward_ui_json,
inversion_defaults,
inversion_ui_json,
validations,
)

Expand All @@ -30,9 +28,7 @@ class InducedPolarizationPseudo3DParams(InversionBaseParams):
def __init__(self, input_file=None, forward_only=False, **kwargs):
self._default_ui_json = deepcopy(default_ui_json)
self._forward_defaults = deepcopy(forward_defaults)
self._forward_ui_json = deepcopy(forward_ui_json)
self._inversion_defaults = deepcopy(inversion_defaults)
self._inversion_ui_json = deepcopy(inversion_ui_json)
self._inversion_type = "induced polarization pseudo 3d"
self._validations = validations
self._potential_channel_bool = None
Expand Down
52 changes: 0 additions & 52 deletions geoapps/inversion/electricals/induced_polarization/three_dimensions/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,59 +118,7 @@
"conda_environment": "geoapps",
"distributed_workers": None,
}
inversion_ui_json = {
"chargeability_channel_bool": True,
}

forward_ui_json = {
"data_object": {
"main": True,
"group": "Survey",
"label": "Object",
"meshType": "{275ecee9-9c24-4378-bf94-65f3c5fbe163}",
"value": None,
},
"z_from_topo": {
"group": "Survey",
"main": True,
"label": "Surface survey",
"tooltip": "Uncheck if borehole data is present",
"value": True,
},
"chargeability_channel": {
"association": ["Cell", "Vertex"],
"dataType": "Float",
"group": "Survey",
"main": True,
"label": "Chargeability (V/V)",
"parent": "data_object",
"value": None,
},
"chargeability_uncertainty": {
"association": ["Cell", "Vertex"],
"dataType": "Float",
"group": "Survey",
"main": True,
"isValue": True,
"label": "Uncertainty",
"parent": "data_object",
"property": None,
"value": 1.0,
},
"starting_model": {
"association": "Cell",
"dataType": "Float",
"group": "Mesh and models",
"main": True,
"isValue": False,
"parent": "mesh",
"label": "Chargeability (V/V)",
"property": None,
"min": 0.0,
"max": 10000.0,
"value": 0.0,
},
}
default_ui_json = {
"title": "Induced Polarization (IP) 3D Inversion",
"documentation": "https://geoapps.readthedocs.io/en/stable/content/applications/dcip_inversion.html",
Expand Down
4 changes: 0 additions & 4 deletions geoapps/inversion/electricals/induced_polarization/three_dimensions/params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
from .constants import (
default_ui_json,
forward_defaults,
forward_ui_json,
inversion_defaults,
inversion_ui_json,
validations,
)

Expand All @@ -36,9 +34,7 @@ class InducedPolarization3DParams(InversionBaseParams):
def __init__(self, input_file=None, forward_only=False, **kwargs):
self._default_ui_json = deepcopy(default_ui_json)
self._forward_defaults = deepcopy(forward_defaults)
self._forward_ui_json = deepcopy(forward_ui_json)
self._inversion_defaults = deepcopy(inversion_defaults)
self._inversion_ui_json = deepcopy(inversion_ui_json)
self._inversion_type = "induced polarization 3d"
self._validations = validations
self._chargeability_channel_bool = None
Expand Down
Loading
Loading