-
Notifications
You must be signed in to change notification settings - Fork 105
Extend initial conditions from 1D to 2D and 2D to 3D #844
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.
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
Open
DimAdam-01
wants to merge
30
commits into
MFlowCode:master
Choose a base branch
from
DimAdam-01:2/3D_Extend_IC
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
bcaaa35
Chemistry Bug Fixes
DimAdam-01 4833d7b
Chemistry Bug Fixes
DimAdam-01 c8e7f9f
Format
DimAdam-01 652d0fa
Testing-Changes-In-CodeGenerator-For-Pyrometheus
DimAdam-01 e63683a
Merge branch 'MFlowCode:master' into my_new_branch
DimAdam-01 cc20ee9
Extend Frontier Run Time
DimAdam-01 b720ecc
Debugggg
DimAdam-01 1182c2c
Small Changes
DimAdam-01 24a324c
Lodi for Multicomponent
DimAdam-01 b02547e
Merge
DimAdam-01 308d919
Merge_2
DimAdam-01 b58a29f
Small stuff
DimAdam-01 1ba9082
Small stuff
DimAdam-01 415598a
lkele
DimAdam-01 8a04716
Small Changes
DimAdam-01 de149bd
Small Changes v2
DimAdam-01 7739f59
Small Stuff
DimAdam-01 7e61509
Formatting
DimAdam-01 d55b19e
Improvements
DimAdam-01 ec14e77
Minor Changes
DimAdam-01 d14900c
Formatting
DimAdam-01 0342538
Changes in hardcoded fpp description
DimAdam-01 31822b8
Changes in Hardcoded implemention
DimAdam-01 f7d279b
...
DimAdam-01 fe78533
Merge branch 'master' into 2/3D_Extend_IC
sbryngelson 651ddf9
Merge branch 'MFlowCode:master' into 2/3D_Extend_IC
DimAdam-01 f5dad3c
Update HardcodedIC includes, add ExtrusionHardcodedIC.fpp, modify m_p…
DimAdam-01 bf9ea7d
Resolve merge conflict in m_patches.fpp
DimAdam-01 5b30ddf
Hardcoded Extrusion
DimAdam-01 fd4aca9
Small Bugs
DimAdam-01 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
!> @brief Deallocate and reset variables used for IC extrusion. | ||
!> | ||
!> @details | ||
!> Deallocates: | ||
!> - stored_values(:,:,:). | ||
!> - x_coords(:). | ||
!> - y_coords(:). | ||
!> | ||
!> Resets: | ||
!> - files_loaded => .false. | ||
!> - index_x, index_y, global_offset_x => 0. | ||
!> | ||
!> (Note: The corresponding loader macro reads | ||
!> `prim.<variable>.00.<timestep>.dat` files—pattern controlled by `zeros_default`— | ||
!> from `examples/Case_File/D`.) | ||
|
||
#:def HardcodedDimensionsExtrusion() | ||
integer :: xRows, yRows, nRows, iix, iiy | ||
integer :: f, iter, ios, ios2, unit, unit2, idx, idy, index_x, index_y, jump, line_count, ycount | ||
real(wp) :: x_len, x_step, y_len, y_step | ||
real(wp) :: dummy_x, dummy_y, dummy_z, x0, y0 | ||
integer :: global_offset_x, global_offset_y ! MPI subdomain offset | ||
real(wp) :: delta_x, delta_y | ||
character(len=100), dimension(sys_size) :: fileNames ! Arrays to store all data from files | ||
character(len=200) :: errmsg | ||
real(wp), allocatable :: stored_values(:, :, :) | ||
real(wp), allocatable :: x_coords(:), y_coords(:) | ||
logical :: files_loaded = .false. | ||
real(wp) :: domain_xstart, domain_xend, domain_ystart, domain_yend | ||
character(len=*), parameter :: init_dir = "/home/YourDirectory" ! For example /home/MFC/examples/1D_Shock/D/ | ||
character(len=20) :: file_num_str ! For storing the file number as a string | ||
character(len=20) :: zeros_part ! For the trailing zeros part | ||
character(len=6), parameter :: zeros_default = "00000" ! Default zeros (can be changed) | ||
#:enddef | ||
|
||
#:def HardcodedDellacation() | ||
if (allocated(stored_values)) then | ||
deallocate (stored_values) | ||
deallocate (x_coords) | ||
end if | ||
|
||
if (allocated(y_coords)) then | ||
deallocate (y_coords) | ||
end if | ||
#:enddef |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure if this works with other hardcoded ICs? ask @wilfonba