Sink 2d #431

wangguan1995 · 2023-07-18T11:36:36Z

PR types

New features, Bug fixes

PR changes

ppsci/constraint/integral_constraint.py : add the function of integral plane translation
ppsci/constraint/interior_constraint.py : remove sdf pop.
ppsci/equation/pde/advection_diffusion.py : add advection-diffusion equation
ppsci/equation/pde/grad_normal.py : add normal gradients equation for adiabatic boundary condition.
ppsci/equation/pde/navier_stokes.py: Bug fix for dynamic viscosity, add sympy expression for momentum_x and _y.
ppsci/equation/pde/turbulence_zero_eq.py : add zero equation model for turbulence flow.
ppsci/geometry/csg.py : Bug fix for sampling points, add sdf function.
ppsci/geometry/geometry.py: Add sdf gradient function, add geometry union, add boundary area(weight) calculation
ppsci/geometry/geometry_2d.py: Bug fix for rectangle, add approximate area calculation, add 2d channel geometry for channel flow(sdf sample area normal, etc), add line geometry(sdf sample area normal, etc).
ppsci/metric/l2_rel.py : Bug fix for scalar weight.
ppsci/solver/eval.py : add eval summation for multi validators and write to *.csv file for better records.
ppsci/solver/solver.py : Bug fix for no "keep_batch" attributes.
ppsci/utils/expression.py: Perfection of forward and cover the case without validator loss.
ppsci/utils/paddle_printer.py: Add paddle printer for recursive derivation of equations and substitute with sdf_derivatives.
ppsci/utils/reader.py: Perfection for covering steady-state cases, add input patch for sdf, sdf derivatives, area and normal.

Describe

Add first heat transfer case of 3-fins 2D sink (Advection-Diffusion).
Complement and add traits like sdf, geometry, sampling, geometry bool, sdf derivative, symbol function, etc.
Important Bug fix for N-S equation.
New equations: GradNormal, AdvectionDiffusion, ZeroEquation.
Doc will be submit in next PR.

paddle-bot · 2023-07-18T11:36:41Z

Thanks for your contribution!

HydrogenSulfate · 2023-07-21T06:23:52Z

examples/bracket/bracket.py

这个文件先不改

HydrogenSulfate · 2023-07-21T06:24:07Z

examples/sink/2d_advection/heat_sink.py

+    OUTPUT_DIR = (
+        "./output" if not args.output_dir else args.output_dir
+    )


去掉括号

文件夹名字：output_heat_sink

HydrogenSulfate · 2023-07-21T06:24:53Z

examples/sink/2d_advection/heat_sink.py

+        "./output" if not args.output_dir else args.output_dir
+    )
+    logger.init_logger("ppsci", f"{OUTPUT_DIR}/train.log", "info")
+    shuffle = True


不必要的shuffle变量，删掉

HydrogenSulfate · 2023-07-21T06:25:58Z

examples/sink/2d_advection/heat_sink.py

+        heat_sink = heat_sink + fin
+
+    geo = channel - heat_sink
+


删掉冗余换行

HydrogenSulfate · 2023-07-21T06:26:45Z

examples/sink/2d_advection/heat_sink.py

+    equation = ppsci.utils.misc.Prettydefaultdict()
+    equation["ZeroEquation"] = ppsci.equation.ZeroEquation(0.01, max_distance)
+    equation["NavierStokes"] = ppsci.equation.NavierStokes(equation["ZeroEquation"].expr, 1.0, 2, False, True)
+    equation["AdvectionDiffusion"] = ppsci.equation.AdvectionDiffusion("c", diffusivity, 1.0, 0, 2, False)
+    equation["GradNormal"] = ppsci.equation.GradNormal(grad_var="c", dim=2, time=False)
+    equation["NormalDotVec"] = ppsci.equation.NormalDotVec(("u", "v"))


不需要使用 Prettydefaultdict

equation = { "ZeroEquation": ppsci.equation.ZeroEquation(0.01, max_distance), ... }

HydrogenSulfate · 2023-07-21T09:25:00Z

ppsci/geometry/geometry.py

@@ -63,6 +63,20 @@ def uniform_points(self, n: int, boundary=True):
        )
        return self.random_points(n)

+    def sdf_func(self, points: np.ndarray) -> np.ndarray:
+        pass


raise NotImplementedError("Geometry.sdf_func is not implemented")

需要去掉sdf_func基类，通过hasattr判断sdf是否计算

HydrogenSulfate · 2023-07-21T10:01:09Z

ppsci/geometry/geometry.py

@@ -95,14 +109,33 @@ def sample_interior(self, n, random="pseudo", criteria=None, evenly=False):
                    "please check correctness of geometry and given creteria."
                )

-        # if sdf_func added, return x_dict and sdf_dict, else, only return the x_dict
+        # if sdf_fun/sdf_grad/area added,
+        # return x_dict and sdf_dict/sdf_grad_dict/area_dict, else, only return the x_dict
        if hasattr(self, "sdf_func"):


现在几何都有sdf_func，可以删掉这个判断

不是所有的几何都有sdf_func, 如果不判断，会有部分CI挂掉

HydrogenSulfate · 2023-07-21T10:01:26Z

ppsci/geometry/geometry.py

        if hasattr(self, "sdf_func"):
            sdf = -self.sdf_func(x)
            sdf_dict = misc.convert_to_dict(sdf, ("sdf",))
        else:
            sdf_dict = {}
+
+        if hasattr(self, "sdf_gradient"):
+            print("sdf_grad")


删除print

HydrogenSulfate · 2023-07-21T11:35:49Z

ppsci/geometry/geometry.py

+    def sdf_func(self, points: np.ndarray) -> np.ndarray:
+        pass
+
+    def sdf_gradient(self, points, delta=(0.0001,)) -> np.ndarray:


-> Dict[str, np.ndarray]

HydrogenSulfate · 2023-07-21T11:35:55Z

ppsci/geometry/geometry.py

+
+    def sdf_gradient(self, points, delta=(0.0001,)) -> np.ndarray:
+        delta = delta * self.ndim
+        sdf_grad = misc.Prettydefaultdict()


普通字典就行

HydrogenSulfate · 2023-07-21T11:55:00Z

ppsci/geometry/geometry.py

+        if hasattr(self, "sdf_gradient"):
+            sdf_grad_dict = self.sdf_gradient(x)
+        else:
+            sdf_grad_dict = {}


删掉判断

暂时无法删除判断，不是所有几何都需要sdf_gradient

HydrogenSulfate · 2023-07-21T12:07:49Z

ppsci/geometry/geometry.py

+        if self.ndim == 2:
+            if (criteria is not None) and (misc.typename(self) == "Line"):
+                area = self.approx_area(criteria)
+            elif criteria is None:
+                area = self.perimeter
+            else:
+                raise NotImplementedError("self.approx_area is not implemented")
+            area_dict = {"area": np.full_like(next(iter(x_dict.values())), area / n)}
+            return {**x_dict, **normal_dict, **area_dict}


if isinstance(self, ...): .... elif isinstance(self, ...): ....

HydrogenSulfate · 2023-07-21T12:10:05Z

ppsci/geometry/geometry_2d.py

            np.linalg.norm(np.maximum(dist_from_center, 0), axis=1)
            + np.minimum(np.max(dist_from_center, axis=1), 0)
        ).reshape(-1, 1)

+    def approx_area(self, criteria=None, approx_nr=10000, random="pseudo"):


_approximate_area

HydrogenSulfate · 2023-07-21T12:11:44Z

ppsci/geometry/geometry_2d.py

+    """Class for channel geometry (no bounding curves in x-direction for sdf calculation)
+
+    Args:
+        xmin (Tuple[float, float]): Bottom left corner point, [x0, y0].


HydrogenSulfate · 2023-07-21T12:12:10Z

ppsci/geometry/geometry_2d.py

+        >>> geom = ppsci.geometry.channel((0.0, 0.0), (1.0, 1.0))
+    """
+
+    def __init__(self, xmin, xmax):


加上 type hint

HydrogenSulfate · 2023-07-21T12:57:01Z

ppsci/utils/reader.py

+        csv_name (str): str type, prefix of the csv file name.
+        epoch_id (int): int type, the current epoch id.
+        name (str): str type, the name of the data to be written.
+        data (dict):  type, the data to be written, with string keys and numeric values.


Dict[str, float]

HydrogenSulfate · 2023-07-21T12:58:57Z

ppsci/utils/reader.py


    Returns:
        Dict[str, np.ndarray]: Input coordinates dict, label coordinates dict
    """
    input_dict = {var: [] for var in input_keys}
-    label_dict = {var: [] for var in label_keys}
+    label_dict = {} if label_keys is None else {var: [] for var in label_keys}


HydrogenSulfate · 2023-07-21T12:59:18Z

ppsci/utils/reader.py

    for index in time_index:
-        file = filename_without_timeid + f"{index}.vtu"
+        if "t" in input_dict:
+            file = filename_without_timeid + f"{index}.vtu"


os.path.join

HydrogenSulfate · 2023-07-21T12:59:34Z

ppsci/utils/reader.py

@@ -153,6 +194,12 @@ def load_vtk_file(
                    mesh.points[:, i].reshape(n, 1).astype("float32")
                )
                i += 1
+
+        for key in input_dict_patch:
+            input_dict_patch[key].append(np.array(mesh.point_data[key], "float32"))


np.asarray

?

HydrogenSulfate · 2023-07-21T13:00:51Z

ppsci/validate/sup_validator.py

@@ -61,7 +61,7 @@ class SupervisedValidator(base.Validator):
    def __init__(
        self,
        dataloader_cfg: Dict[str, Any],
-        loss: loss.Loss,
+        loss: Optional[loss.Loss] = None,


… into sink_2d

wangguan1995 added 15 commits June 20, 2023 12:35

align input

442aba8

forward aligned, 10 epochs almost aligned

7948c28

use paddle to save net params

dc57ecb

10 epochs alignment

b9c33fa

metric alignment successfully

d34a413

mydata works!

a3be679

clean commit

1e207e6

clean commit code

31073b7

update comment

fbe1534

clean and reformat

c0e55dd

clean

9472136

clean code

613315d

clean code

1eec90c

fix bracket and comment

08f3630

code clean

d187310

wangguan1995 and others added 7 commits July 19, 2023 11:47

Merge branch 'develop' into sink_2d

0471444

bug fix

b7e0041

pre commit check

b4aa24d

del one debug line

a347c4b

code clean

1cda5cf

code clean

ef7b73c

code clean

08b656b

HydrogenSulfate requested changes Jul 21, 2023

View reviewed changes

wangguan1995 added 5 commits July 28, 2023 12:40

fix by reviews

42dd6cb

fix by reviews

1d61e79

fix by reviews

e8b5616

Merge branch 'develop' of https://github.com/PaddlePaddle/PaddleScience…

fa18c31

… into sink_2d

bug fix visualizer

2a7ce51

Merge branch 'develop' into sink_2d

5bead0f

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sink 2d #431

Sink 2d #431

wangguan1995 commented Jul 18, 2023

paddle-bot bot commented Jul 18, 2023

HydrogenSulfate Jul 21, 2023

HydrogenSulfate Jul 21, 2023

HydrogenSulfate Jul 21, 2023

HydrogenSulfate Jul 21, 2023

HydrogenSulfate Jul 21, 2023

HydrogenSulfate Jul 21, 2023

wangguan1995 Sep 4, 2023

HydrogenSulfate Jul 21, 2023

wangguan1995 Sep 4, 2023

HydrogenSulfate Jul 21, 2023

HydrogenSulfate Jul 21, 2023

HydrogenSulfate Jul 21, 2023

HydrogenSulfate Jul 21, 2023

wangguan1995 Sep 4, 2023

HydrogenSulfate Jul 21, 2023

HydrogenSulfate Jul 21, 2023

HydrogenSulfate Jul 21, 2023

HydrogenSulfate Jul 21, 2023

HydrogenSulfate Jul 21, 2023

HydrogenSulfate Jul 21, 2023

HydrogenSulfate Jul 21, 2023

HydrogenSulfate Jul 21, 2023

wangguan1995 Jul 28, 2023

HydrogenSulfate Jul 21, 2023

Sink 2d #431

Are you sure you want to change the base?

Sink 2d #431

Conversation

wangguan1995 commented Jul 18, 2023

PR types

PR changes

Describe

paddle-bot bot commented Jul 18, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment