Draft: Resolve "Add an example from Jan Diederik" (!98) · Merge requests · AGS_public / pythermogis

Conflict: This file was modified in the source branch, but removed in the target branch. Ask someone with write access to resolve it.

src/pythermogis/doublet_simulation/deterministic_doublet.py

+1 −1

Changes for src/pythermogis/doublet_simulation/deterministic_doublet.py: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ def validate_input(reservoir_properties: xr.Dataset):
		# check all necessary variables are present
		missing_variables = []
		for variable in ["thickness", "porosity", "ntg", "depth"]:
		if variable not in reservoir_properties:
		if variable not in reservoir_properties and variable not in reservoir_properties.dims:
		missing_variables.append(variable)

		if len(missing_variables) > 0:

Conflict: This file was modified in both the source and target branches. Ask someone with write access to resolve it.

+295 −56

File changed.

Preview size limit exceeded, changes collapsed.