Bubble net #478
Merged
Bubble net #478
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks for your contribution! |
HydrogenSulfate
requested changes
Aug 11, 2023
examples/bubble/bubble.py
Outdated
| v_out = -jacobian(psi_y, x) | ||
| return {"u": u_out, "v": v_out} | ||
|
|
||
| model_psi.register_input_transform(transform_in) |
examples/bubble/bubble.py
Outdated
| geom["time_rect"], | ||
| { | ||
| "dataset": "IterableNamedArrayDataset", | ||
| "batch_size": 228595, |
There was a problem hiding this comment.
使用 IterableNamedArrayDataset 作为dataset，不需要指定batchsize
examples/bubble/bubble.py
Outdated
| ppsci.loss.MSELoss("mean"), | ||
| name="EQ", | ||
| ) | ||
| # set constraint |
examples/bubble/bubble.py
Outdated
Comment on lines
143
to
151
| eta_mse_validator = ppsci.validate.SupervisedValidator( | ||
| valida_dataloader_cfg, | ||
| ppsci.loss.MSELoss("mean"), | ||
| metric={"MSE": ppsci.metric.MSE()}, | ||
| name="eta_mse", | ||
| ) | ||
| validator = { | ||
| eta_mse_validator.name: eta_mse_validator, | ||
| } |
There was a problem hiding this comment.
删除eta_前缀，这个案例跟eta无关
examples/bubble/bubble.py
Outdated
| eta_mse_validator.name: eta_mse_validator, | ||
| } | ||
|
|
||
| visu_mat = geom["time_rect_eval"].sample_interior(300 * 100 * 126, evenly=True) |
There was a problem hiding this comment.
300、100、126用变量代替，否则用不知道这些数字是什么意思，如126可以用len(timestamps) - 1代替
examples/bubble/bubble.py
Outdated
Comment on lines
155
to
164
| datafile = "maxmin.mat" | ||
| data = scipy.io.loadmat(datafile) | ||
| u_max = data["u_max"][0][0] | ||
| u_min = data["u_min"][0][0] | ||
| v_max = data["v_max"][0][0] | ||
| v_min = data["v_min"][0][0] | ||
| p_max = data["p_max"][0][0] | ||
| p_min = data["p_min"][0][0] | ||
| phil_max = data["phil_max"][0][0] | ||
| phil_min = data["phil_min"][0][0] |
There was a problem hiding this comment.
这里的8个量如果只是浮点数，不需要存放在.mat里面吧，或者具体说明一下是怎么计算得到的
examples/bubble/bubble.py
Outdated
| "p": lambda d: d["p"] * (p_max - p_min) + p_min, | ||
| "phil": lambda d: d["phil"], | ||
| }, | ||
| num_timestamps=126, |
There was a problem hiding this comment.
同理，不要写数字，用变量代替，否则其他代码更改后，这里需要同步进行更改
HydrogenSulfate
requested changes
Aug 14, 2023
examples/bubble/bubble.py
Outdated
| # set random seed for reproducibility | ||
| ppsci.utils.misc.set_random_seed(42) | ||
| # set output directory | ||
| OUTPUT_DIR = "./output_bubble_pinns_p" if not args.output_dir else args.output_dir |
examples/bubble/bubble.py
Outdated
Comment on lines
38
to
40
| model_psi = ppsci.arch.MLP(("x", "y", "t"), ("psi",), 9, 30, "tanh") | ||
| model_p = ppsci.arch.MLP(("x", "y", "t"), ("p",), 9, 30, "tanh") | ||
| model_phil = ppsci.arch.MLP(("x", "y", "t"), ("phil",), 9, 30, "tanh") |
There was a problem hiding this comment.
顺序全部改成 ("t", "x", "y")
examples/bubble/bubble.py
Outdated
| "dataset": { | ||
| "name": "MatDataset", | ||
| "file_path": DATASET_PATH, | ||
| "input_keys": ("x", "t", "y"), |
There was a problem hiding this comment.
顺序改成 ("t", "x", "y")
examples/bubble/bubble.py
Outdated
Comment on lines
156
to
163
| u_max = data["u_max"][0][0] | ||
| u_min = data["u_min"][0][0] | ||
| v_max = data["v_max"][0][0] | ||
| v_min = data["v_min"][0][0] | ||
| p_max = data["p_max"][0][0] | ||
| p_min = data["p_min"][0][0] | ||
| phil_max = data["phil_max"][0][0] | ||
| phil_min = data["phil_min"][0][0] |
There was a problem hiding this comment.
8个浮点数直接写在代码里，不需要从外部文件读入进来
HydrogenSulfate
requested changes
Aug 14, 2023
examples/bubble/bubble.py
Outdated
Comment on lines
46
to
48
| u_out = jacobian(psi_y, y) | ||
| v_out = -jacobian(psi_y, x) | ||
| return {"u": u_out, "v": v_out} |
HydrogenSulfate
requested changes
Aug 15, 2023
examples/bubble/bubble.py
Outdated
Comment on lines
49
to
74
| P_star = p_norm # N x T | ||
| Phil_star = data["phil"] # N x T | ||
| t_star = data["t"] # T x 1 | ||
| X_star = data["X"] # N x 2 | ||
|
|
||
| N = X_star.shape[0] | ||
| T = t_star.shape[0] | ||
|
|
||
| # Rearrange Data | ||
| XX = np.tile(X_star[:, 0:1], (1, T)) # N x T | ||
| YY = np.tile(X_star[:, 1:2], (1, T)) # N x T | ||
| TT = np.tile(t_star, (1, N)).T # N x T | ||
|
|
||
| UU = u_star # U_star[:,0,:] # N x T | ||
| VV = v_star # U_star[:,1,:] # N x T | ||
| PP = P_star # N x T | ||
| Phil = Phil_star # N x T | ||
|
|
||
| x = XX.flatten()[:, None] # NT x 1 | ||
| y = YY.flatten()[:, None] # NT x 1 | ||
| t = TT.flatten()[:, None] # NT x 1 | ||
|
|
||
| u = UU.flatten()[:, None] # NT x 1 | ||
| v = VV.flatten()[:, None] # NT x 1 | ||
| p = PP.flatten()[:, None] # NT x 1 | ||
| phil = Phil.flatten()[:, None] # NT x 1 |
examples/bubble/bubble.py
Outdated
| N = X_star.shape[0] | ||
| T = t_star.shape[0] | ||
|
|
||
| # Rearrange Data |
examples/bubble/bubble.py
Outdated
| train_data["p"] = p[idx, :] | ||
| train_data["phil"] = phil[idx, :] | ||
| scipy.io.savemat("bubble_train.mat", train_data) | ||
| # valid Data |
examples/bubble/bubble.py
Outdated
Comment on lines
88
to
99
| test_data = dict() | ||
| test_data["x"] = x | ||
| test_data["y"] = y | ||
| test_data["t"] = t | ||
| test_data["u"] = u | ||
| test_data["v"] = v | ||
| test_data["p"] = p | ||
| test_data["phil"] = phil | ||
| scipy.io.savemat("bubble_valid.mat", test_data) | ||
|
|
||
| DATASET_PATH = "bubble_train.mat" | ||
| DATASET_PATH_VALID = "bubble_test.mat" | ||
| DATASET_PATH_VALID = "bubble_valid.mat" |
There was a problem hiding this comment.
测试数据生成好后，在内存中可以直接用NamedArrayDataset读取，不需要保存到磁盘再通过MatDataset读取
huohuohuohuohuo123
pushed a commit
to huohuohuohuohuo123/PaddleScience
that referenced
this pull request
Aug 12, 2024
* add bubble datafile test=develop * add bubble code test=develop * add bubble code test=develop * add bubble code test=develop * add bubble code * add bubble data * add bubble code * delete mat file * delete mat file * bubble code * delete mat file * add some modify * add some modifications * add some modifications * add some modifications * add some modifications
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR types
One of New features
PR changes
One of Docs
Describe
single bubble flow