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.

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

GEOPY-1524: Add forward validation of CNN picks #26

Merged
merged 20 commits into from
Jul 10, 2024

Conversation

domfournier
Copy link
Contributor

@domfournier domfournier commented Jun 19, 2024

GEOPY-1524 - Add forward validation of CNN picks

@github-actions github-actions bot changed the title Geopy 1524 GEOPY-1524: Add forward validation of CNN picks Jun 19, 2024
@domfournier domfournier changed the base branch from develop to release/0.1.0 June 19, 2024 19:46
# Conflicts:
#	environments/py-3.10-linux-64-dev.conda.lock.yml
#	environments/py-3.10-linux-64.conda.lock.yml
#	environments/py-3.10-win-64-dev.conda.lock.yml
#	environments/py-3.10-win-64.conda.lock.yml
#	plate_simulation/simulations/__init__.py
#	plate_simulation/simulations/params.py
#	py-3.10.conda-lock.yml
#	pyproject.toml
#	tests/runtest/driver_test.py
# Conflicts:
#	environments/py-3.10-linux-64-dev.conda.lock.yml
#	environments/py-3.10-linux-64.conda.lock.yml
#	environments/py-3.10-win-64-dev.conda.lock.yml
#	environments/py-3.10-win-64.conda.lock.yml
#	py-3.10.conda-lock.yml
#	pyproject.toml
@domfournier domfournier changed the base branch from release/0.1.0 to release/0.1.1 June 19, 2024 20:51
@domfournier domfournier changed the base branch from release/0.1.1 to release/0.1.0 June 19, 2024 21:04
@domfournier domfournier changed the base branch from release/0.1.0 to release/0.1.1 July 10, 2024 15:19
# Conflicts:
#	tests/models/__init__.py
#	tests/runtest/__init__.py
# Conflicts:
#	environments/py-3.10-linux-64-dev.conda.lock.yml
#	environments/py-3.10-linux-64.conda.lock.yml
#	environments/py-3.10-win-64-dev.conda.lock.yml
#	environments/py-3.10-win-64.conda.lock.yml
#	py-3.10.conda-lock.yml
#	pyproject.toml
@domfournier domfournier requested a review from benk-mira July 10, 2024 17:06
Copy link
Contributor

@benk-mira benk-mira left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you need to modify driver/make_model to pass conductivities instead of resistivites since you removed the reciprocal conversions from the params class.

@@ -69,11 +69,6 @@ class PlateParams(BaseModel):
reference_surface: str = "topography"
reference_type: str = "mean"

@field_validator("plate", mode="before")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where are you doing the conversion to account for removing these? If they're resistivities in the ui.json, and remain resistivities in the params classes, then the driver needs to flip them, but I don't see that change.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Happens in series on the whole model.

@domfournier domfournier merged commit 507b111 into release/0.1.1 Jul 10, 2024
5 checks passed
@domfournier domfournier deleted the GEOPY-1524 branch July 10, 2024 17:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants