TNO Intern

Commit 2416ad30 authored by jjflorian's avatar jjflorian
Browse files

rm weird vectorize method

parent ac46c25c
Loading
Loading
Loading
Loading
Loading
+4 −7
Original line number Diff line number Diff line
@@ -162,10 +162,6 @@ def compute_results_for_aquifer(

        return tuple(result) if result is not None else tuple(np.nan for _ in output_names)

    vectorized_calc = np.vectorize(
        cell_calculation, otypes=[np.float64] * len(output_names)
    )

    # TODO: loop over pvalues and save grids with pvalue noted
    # TODO: Maybe save the results as datasets iso dataarrays, and have p value be a dim?

@@ -221,10 +217,10 @@ def compute_results_for_aquifer(
        aquifer_ds[v] = aquifer_ds[v].where(hc_mask)

    results = xr.apply_ufunc(
        vectorized_calc,
        cell_calculation,
        x_coord,
        y_coord,
        1.0E30,
        1.0e30,
        aquifer_ds["thickness"],
        aquifer_ds["transmissivity"],
        aquifer_ds["transmissivity_with_ntg"],
@@ -232,8 +228,9 @@ def compute_results_for_aquifer(
        aquifer_ds["depth"],
        aquifer_ds["porosity"],
        aquifer_ds["temperature"],
        input_core_dims=[[]] * 10,
        output_core_dims=[[] for _ in output_names],
        vectorize=False,
        vectorize=True,
        dask="parallelized",
        output_dtypes=[np.float64] * len(output_names),
    )