Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev #73

Merged
merged 3 commits into from
Nov 22, 2024
Merged

Dev #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afc0e61
fix(export): :bug: call to `ogs_export` in `demo`
djmaxus Nov 22, 2024
89603c5
chore: :wrench: vscode settings
djmaxus Nov 22, 2024
fca0ec4
fix(export): :children_crossing: `ogs_export`: update input args to a…
djmaxus Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
matlab.mat

out/

# Created by https://www.toptal.com/developers/gitignore/api/matlab,microsoftoffice,latex
# Edit at https://www.toptal.com/developers/gitignore?templates=matlab,microsoftoffice,latex

Expand Down
10 changes: 8 additions & 2 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,14 @@
"Krevor",
"upscaling"
],
"cSpell.enableFiletypes": [
"cSpell.enabledFiletypes": [
"markdown"
],
"cSpell.language": "en-GB"
"cSpell.language": "en-GB",
"conventionalCommits.scopes": [
"release-please",
"plot",
"matlab",
"export"
]
}
2 changes: 1 addition & 1 deletion demo.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
%% OGS inputs generation

% run in background
export_fut = parfeval(backgroundPool,@ogs_export,0,grid,mask,strata_trapped);
export_fut = parfeval(backgroundPool,@ogs_export,0,grid,strata_trapped);

%% helpers

Expand Down
8 changes: 6 additions & 2 deletions ogs_export.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
function [] = ogs_export(G, strata_trapped, output_prefix)
function [] = ogs_export(G, strata_trapped, output_folder)
arguments
G (1,1) struct
strata_trapped (1,1) struct
output_prefix char = 'model/gen/'
output_folder char = 'out'
end

mkdir(output_folder);

output_prefix = append(output_folder,'/');

write_mappings(output_prefix,G,strata_trapped.permeability ./ milli ./ darcy(),strata_trapped.idx);

generate_sfn(...
Expand Down