Revert "Merge branch 'master' of https://github.com/PlasmaControl/DES… (#1678)

Author: dpanici

desc/compute/_geometry.py

@@ -1049,100 +1049,6 @@ def _fieldline_length(data, transforms, profiles, **kwargs):
     return data
 
 
-@register_compute_fun(
-    name="test term1",
-    label="\\int_{\\zeta_{\\mathrm{min}}}^{\\zeta_{\\mathrm{max}}}"
-    " \\frac{d\\zeta}{\\lvert B \\rvert^2}",
-    units="m / T",
-    units_long="Meter / tesla",
-    description="(Mean) proper length of field line(s)",
-    dim=1,
-    params=[],
-    transforms={"grid": []},
-    profiles=[],
-    coordinates="r",
-    data=["|B|^2", "sqrt(g)_Clebsch"],
-    resolution_requirement="z",
-    source_grid_requirement={"coordinates": "raz", "is_meshgrid": True},
-)
-def _test_term1(data, transforms, profiles, **kwargs):
-    grid = transforms["grid"].source_grid
-    data["test term1"] = grid.expand(
-        jnp.abs(
-            simpson(
-                y=grid.meshgrid_reshape(
-                    1 / (data["sqrt(g)_Clebsch"] * data["|B|^2"]), "raz"
-                ),
-                x=grid.compress(grid.nodes[:, 2], surface_label="zeta"),
-                axis=-1,
-            ).mean(axis=-1)
-        )
-    )
-    return data
-
-
-@register_compute_fun(
-    name="test term2",
-    label="\\int_{\\zeta_{\\mathrm{min}}}^{\\zeta_{\\mathrm{max}}}"
-    " \\frac{d\\zeta}{\\lvert \\nabla \\rho \\rvert^2}",
-    units="m / T",
-    units_long="Meter / tesla",
-    description="(Mean) proper length of field line(s)",
-    dim=1,
-    params=[],
-    transforms={"grid": []},
-    profiles=[],
-    coordinates="r",
-    data=["|grad(rho)|", "sqrt(g)_Clebsch"],
-    resolution_requirement="z",
-    source_grid_requirement={"coordinates": "raz", "is_meshgrid": True},
-)
-def _test_term2(data, transforms, profiles, **kwargs):
-    grid = transforms["grid"].source_grid
-    data["test term2"] = grid.expand(
-        jnp.abs(
-            simpson(
-                y=grid.meshgrid_reshape(
-                    1 / (data["sqrt(g)_Clebsch"] * data["|grad(rho)|"] ** 2), "raz"
-                ),
-                x=grid.compress(grid.nodes[:, 2], surface_label="zeta"),
-                axis=-1,
-            ).mean(axis=-1)
-        )
-    )
-    return data
-
-
-@register_compute_fun(
-    name="test term3",
-    label="\\int_{\\zeta_{\\mathrm{min}}}^{\\zeta_{\\mathrm{max}}}"
-    " \\frac{d\\zeta}{\\lvert \\nabla \\rho \\rvert^2}",
-    units="m / T",
-    units_long="Meter / tesla",
-    description="(Mean) proper length of field line(s)",
-    dim=1,
-    params=[],
-    transforms={"grid": []},
-    profiles=[],
-    coordinates="r",
-    data=["sqrt(g)_Clebsch"],
-    resolution_requirement="z",
-    source_grid_requirement={"coordinates": "raz", "is_meshgrid": True},
-)
-def _test_term3(data, transforms, profiles, **kwargs):
-    grid = transforms["grid"].source_grid
-    data["test term3"] = grid.expand(
-        jnp.abs(
-            simpson(
-                y=grid.meshgrid_reshape(1 / (data["sqrt(g)_Clebsch"]), "raz"),
-                x=grid.compress(grid.nodes[:, 2], surface_label="zeta"),
-                axis=-1,
-            ).mean(axis=-1)
-        )
-    )
-    return data
-
-
 @register_compute_fun(
     name="fieldline length/volume",
     label="\\int_{\\zeta_{\\mathrm{min}}}^{\\zeta_{\\mathrm{max}}}"

desc/compute/_metric.py

@@ -1828,84 +1828,6 @@ def _gradrho_norm_fsa(params, transforms, profiles, data, **kwargs):
     return data
 
 
-@register_compute_fun(
-    name="<1>",  # same as S(r) / V_r(r)
-    label="\\langle \\vert \\nabla \\rho \\vert \\rangle",
-    units="m^{-1}",
-    units_long="inverse meters",
-    description="Magnitude of contravariant radial basis vector, flux surface average",
-    dim=1,
-    params=[],
-    transforms={"grid": []},
-    profiles=[],
-    coordinates="r",
-    data=["sqrt(g)"],
-    axis_limit_data=["sqrt(g)_r"],
-    resolution_requirement="tz",
-)
-def _1_norm_fsa(params, transforms, profiles, data, **kwargs):
-    data["<1>"] = surface_averages(
-        transforms["grid"],
-        jnp.ones_like(data["sqrt(g)"]),
-        sqrt_g=transforms["grid"].replace_at_axis(
-            data["sqrt(g)"], lambda: data["sqrt(g)_r"], copy=True
-        ),
-    )
-    return data
-
-
-@register_compute_fun(
-    name="<1/|B|^2>",  # same as S(r) / V_r(r)
-    label="\\langle \\vert \\nabla \\rho \\vert \\rangle",
-    units="m^{-1}",
-    units_long="inverse meters",
-    description="Magnitude of contravariant radial basis vector, flux surface average",
-    dim=1,
-    params=[],
-    transforms={"grid": []},
-    profiles=[],
-    coordinates="r",
-    data=["|B|^2", "sqrt(g)"],
-    axis_limit_data=["sqrt(g)_r"],
-    resolution_requirement="tz",
-)
-def _1_over_B2_norm_fsa(params, transforms, profiles, data, **kwargs):
-    data["<1/|B|^2>"] = surface_averages(
-        transforms["grid"],
-        1 / data["|B|^2"],
-        sqrt_g=transforms["grid"].replace_at_axis(
-            data["sqrt(g)"], lambda: data["sqrt(g)_r"], copy=True
-        ),
-    )
-    return data
-
-
-@register_compute_fun(
-    name="<1/|grad(rho)|^2>",  # same as S(r) / V_r(r)
-    label="\\langle \\vert \\nabla \\rho \\vert \\rangle",
-    units="m^{-1}",
-    units_long="inverse meters",
-    description="Magnitude of contravariant radial basis vector, flux surface average",
-    dim=1,
-    params=[],
-    transforms={"grid": []},
-    profiles=[],
-    coordinates="r",
-    data=["|grad(rho)|", "sqrt(g)"],
-    axis_limit_data=["sqrt(g)_r"],
-    resolution_requirement="tz",
-)
-def _1_over_gradrho2_norm_fsa(params, transforms, profiles, data, **kwargs):
-    data["<1/|grad(rho)|^2>"] = surface_averages(
-        transforms["grid"],
-        1 / data["|grad(rho)|"] ^ 2,
-        sqrt_g=transforms["grid"].replace_at_axis(
-            data["sqrt(g)"], lambda: data["sqrt(g)_r"], copy=True
-        ),
-    )
-    return data
-
-
 @register_compute_fun(
     name="|grad(psi)|",
     label="|\\nabla\\psi|",