Various Compiler Warnings and Spacing Issues #10
Conversation
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
…rgy source, temperature, etc. Still need to add heat transfer between phases. MAST now gets source from particles. Need to check energy equation.
Example MAST cases from Olivier's develop branch
Compute various terms that are useful for visualization
Starting to create ability to choose different drag models
Terms in Tenneti should all be multiplied by extra fVF
Separate where/when viz arrays are computed in MAST
Added option to interpolate temperature to particle. Also made drag model public.
Drag correction was being canceled out
Need to specify drag model in HIT LPT initialization
Attempting to initialize fluidized bed but there's something wrong with the grid.
remove garbage file
Working on fluidized bed example. Started adding ability to do implicit filtering of projected terms. Still need to interpolate fluid stress to particle location. Case does not run using 3 or 4 procs in x, but runs with 1, 3, and 5...
Updates to fluidized bed input
We should ignore makefiles. Doesn't seem to be working though....
Still working on it
Added vectors to particle mesh following Max's suggestions
Added a diagonal solver class, taken from old NGA. Haven't yet tested. Will test on implicit filter in lpt class
The diagonal solver compiles and computes things but it is not working yet. haven't yet switched to the abstract linear solver
Added injection routine. This allows for particles to be injected randomly within a circular region. Special care is taken to avoid overlap if collisions are used. Also added separate coeff of restitution for walls. The example case injects particles with diameters sampled from a random lognormal distribution.
Keep track of number of particles added and removed each timestep
Particles leave the domain if they are too soft. Lowering Tcol helps
I think there was a bug in how Olivier implemented the spring stiffness. Updated version is consistent with old NGA and (I think) is the correct version
Added CFLs to LPT, if collisions are used this prevents particles to move more than 1/10 their diameter, otherwise they cannot move more than dx
More progress porting old LPT stuff into lpt_class. Particles now have angular velocity and tangential collisions. By default friction coeff is set to 0, if it is given a value larger than 0 then torque due to collisions is accounted for. Also started making progress to account for lift and fluid torque due to drag. This requires interpolating fluid vorticity.
small cleanup
commit 7a005e1 Author: Olivier Desjardins <[email protected]> Date: Sat Feb 11 09:32:32 2023 -0500 Added an optional variable to allow or not VF=zero commit a82838a Author: Olivier Desjardins <[email protected]> Date: Sat Feb 11 09:07:18 2023 -0500 Finished implementation of sharp VF calculation from Gib commit 08d1de1 Author: Olivier Desjardins <[email protected]> Date: Fri Feb 10 16:09:41 2023 -0500 1- Added (but commented) a rho/rho_avg rescaling of pressure jump 2- Added (but didn't quite finish) a sharp VF calculation from Gib 3- Switched falling_drop_ib case to an ELVIRA reconstruction commit 0943439 Author: Olivier Desjardins <[email protected]> Date: Thu Feb 9 18:14:09 2023 -0500 Reverting the squaring of Cs for the dynamic smago model commit 3d43243 Author: Olivier Desjardins <[email protected]> Date: Thu Feb 9 17:44:27 2023 -0500 This makes the drop-ib impact test 3D commit 8440aa1 Author: Olivier Desjardins <[email protected]> Date: Thu Feb 9 17:31:06 2023 -0500 New class ibconfig which extends config. Implemented standard normal vector calculation, and Bigot's VF expression. Drop impact on curved surface seems to work well. Also absorbed SGS model typo correction from UMich. commit 73cc558 Author: Olivier Desjardins <[email protected]> Date: Thu Feb 9 14:14:41 2023 -0500 New falling drop with IB case, exposed locator function type (thanks Jack!) commit b261de5 Author: Olivier Desjardins <[email protected]> Date: Wed Feb 8 16:01:25 2023 -0500 Absorbed Jesse's changes with lpt cfl and collision flag. commit 0bca3e8 Author: Olivier Desjardins <[email protected]> Date: Tue Feb 7 23:19:41 2023 -0500 Added IB-particle collision from Jesse. Switched all solvers (except MAST!) to new linsol class. ALMOST ALL EXAMPLES WILL NEED TO BE UPDATED! commit 26b4fe2 Author: Olivier Desjardins <[email protected]> Date: Tue Feb 7 22:29:02 2023 -0500 Switched fourier3d to c2c... commit 19ae451 Author: Olivier Desjardins <[email protected]> Date: Tue Feb 7 22:09:34 2023 -0500 Commit what I think is the cleanest implementation of r2r fftw solver - but that requires another strategy for building the operator commit a9becb0 Author: Olivier Desjardins <[email protected]> Date: Tue Feb 7 16:22:59 2023 -0500 p3dfft is also removed as decomposition strategy commit 31219ce Author: Olivier Desjardins <[email protected]> Date: Tue Feb 7 16:16:07 2023 -0500 May not be working yet - this commit removes p3dfft altogether, replaces it with our in-house fourier solver. commit ff795e1 Author: Olivier Desjardins <[email protected]> Date: Tue Feb 7 09:49:15 2023 -0500 Started adding a multiphase_pipe case. Started adding back in-house fourier solver. Fixed bug with hit. commit ec57c3a Author: Olivier Desjardins <[email protected]> Date: Mon Feb 6 13:41:15 2023 -0500 Proper non-dimensionalization of the swirl injection case commit 49d5325 Author: Olivier Desjardins <[email protected]> Date: Mon Feb 6 13:17:20 2023 -0500 Moved library directory specification to my .zshrc to remove all reference to 'desjardi'... commit 7937d14 Author: Olivier Desjardins <[email protected]> Date: Mon Feb 6 10:59:56 2023 -0500 Adding a swirl atomizer test case. commit c70dd8b Author: Olivier Desjardins <[email protected]> Date: Sun Feb 5 21:51:08 2023 -0500 Particles with id=0 do not modify the flow and are not advanced. They're just kinda... there. commit 305694c Author: Olivier Desjardins <[email protected]> Date: Sun Feb 5 21:35:21 2023 -0500 Removed shock-particle case, it's not ready. commit 4bf8f61 Author: Olivier Desjardins <[email protected]> Date: Sun Feb 5 21:34:04 2023 -0500 Updated shit_p routines to make use of newly defined integration tools and fluid_vol variable. commit af17f44 Author: Olivier Desjardins <[email protected]> Date: Sun Feb 5 20:01:42 2023 -0500 Absorded range of modifications from Jesse's repository. Most important is the use of p3dfft for fourier-based linear solvers. commit f962bc2 Author: Olivier Desjardins <[email protected]> Date: Fri Feb 3 17:17:33 2023 -0500 Clean-up ib_pipe to make it a proper pipe flow LES. Cleaned up Vreman's sgs model. commit 6c4766c Author: Olivier Desjardins <[email protected]> Date: Fri Feb 3 14:19:32 2023 -0500 Slight clean-up of the turbulent ib_pipe case. commit bf6f539 Author: Olivier Desjardins <[email protected]> Date: Thu Feb 2 22:57:49 2023 -0500 ib_pipe modified to absorb Jesse's changes, and pushed to turbulent conditions. commit d789220 Author: Olivier Desjardins <[email protected]> Date: Thu Feb 2 14:56:07 2023 -0500 Small changes to falling_drop, added new ib_drop case. commit 1ceb7d2 Author: Olivier Desjardins <[email protected]> Date: Wed Feb 1 10:41:13 2023 -0500 Reindent df_class. Need to think about role of rho here for two-phase flows.
HIT updates
faster cvg
remove unused var
vdjet case now running with scalar transport and simple equation of state.
Added a (2D) turbidity current case. Need to add SGS model. Also need to include lift and added mass due to low density ratio.
output less frequently
use correct file name
Added SGS model to turbidity case
Add walls at left and right (closed tank)
Clipped Neumann is more stable.
Freeze the fluid and sub-iterate on particles. Also restrict fluid dt using viscous CFL. Turned off SGS model for now, it was causing the viscous timestep to get way too small.
Added a slip BC (Neumann+no penetration)
Use free-sliip BC
Define target MFR based on bulk velocity in the absence of particles
Sub-iterate particles at each fluid timestep. Monitor lpt timestep size.
Oops! Need to account for collisions with walls
Probably not needed but explicitly set no-slip
Better sub-iterator and monitor lp_dt
Create restart directory once during initialization to avoid issues on clusters
Cosmetic
Added Aaron's implementation of computing PTKE and pseudo-turbulent Reynolds stress. Need to think carefully how best to take divergence of this and send to fluid.
get_PTKE returns optional (cell-centered) source terms for div of pseudo Reynolds stress. Needed to create interpolation operators in LPT to do this.
…committed hard tabs, unused variables, or implicit typecasting. lpt_class.f90 was left as is, as most compiler warnings in this file relate to the evolving nature of that class.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
Fixed several compiler warnings, most of which related to previously committed hard tabs, unused variables, or implicit typecasting.
lpt_class.f90was left as is, as most compiler warnings in that file relate to the evolving nature of that class.