Directory CCA/Components/Arches/TurbulenceModels/

Total Files:
29
Deleted Files:
2
Lines of Code:
2460

[root]/CCA/Components/Arches/TurbulenceModels

Lines of Code

CCA/Components/Arches/TurbulenceModels/ Lines of Code

Developers

Author Changes Lines of Code Lines per Change
Totals 198 (100.0%) 7761 (100.0%) 39.1
bisaac 32 (16.2%) 3869 (49.9%) 120.9
ohdiazi 65 (32.8%) 2765 (35.6%) 42.5
jthornoc 98 (49.5%) 953 (12.3%) 9.7
zhouminmin 2 (1.0%) 169 (2.2%) 84.5
dav 1 (0.5%) 5 (0.1%) 5.0

Most Recent Commits

jthornoc 2018-12-10 15:20 Rev.: 59046

Fixing a bug with the computesWithScratchGhost when a multistep
integrator is used.

0 lines of code changed in 2 files:

  • CCA/Components/Arches/TurbulenceModels: TurbulenceModelFactory.cc (changed)
jthornoc 2018-12-07 11:04 Rev.: 59029

Removing the epsilon parameter from the input spec. The value is a
mysterious, but magical 3.

0 lines of code changed in 2 files:

  • CCA/Components/Arches/TurbulenceModels: DSmaMMML.h (new)
jthornoc 2018-12-07 11:04 Rev.: 59027

This enables the use of the Kokkos turb. closures in the production code
per the recent commits.

0 lines of code changed in 12 files:

  • CCA/Components/Arches/TurbulenceModels: DSFT.cc (new), DSFTv2.cc (changed), SGSsigma.cc (new), Smagorinsky.cc (new), Smagorinsky.h (changed), WALE.cc (changed)
jthornoc 2018-12-07 11:03 Rev.: 59026

Correcting naming for the strain rate mag.

150 lines of code changed in 13 files:

  • CCA/Components/Arches/TurbulenceModels: DSFT.cc (+11 -7), DSFT.h (+8 -3), DSmaCs.h (+12 -6), DSmaMMML.h (+44 -29), SGSsigma.cc (+4 -1), TurbulenceModelFactory.cc (+29 -25), WALE.cc (+4 -1), WallConstSmag.cc (+26 -6), WallConstSmag.h (new)
jthornoc 2018-12-07 11:03 Rev.: 59025

Cleaning up the Wale model. There is still much to be done...

35 lines of code changed in 4 files:

  • CCA/Components/Arches/TurbulenceModels: WALE.cc (+13 -32), WALE.h (+5 -5), WallConstSmag.cc (+17 -19)
jthornoc 2018-12-07 11:03 Rev.: 59024

This fixes the CQMOM naming issues.

7 lines of code changed in 1 file:

  • CCA/Components/Arches/TurbulenceModels: WALE.cc (+7 -7)
jthornoc 2018-12-07 11:03 Rev.: 59018

* Introducing a default velocity name to clean up the naming convention. Should probably extend this to other variables.

* Small cleanup in the UnweightVariable code. Passing some information via the constructor, removing some naming convention assumptions.

6 lines of code changed in 1 file:

  • CCA/Components/Arches/TurbulenceModels: DSFT.cc (+6 -6)
jthornoc 2018-11-16 15:37 Rev.: 58934

Warnings.

6 lines of code changed in 2 files:

  • CCA/Components/Arches/TurbulenceModels: DSFT.cc (+2 -2), DSmaCs.h (+4 -4)
jthornoc 2018-11-16 12:07 Rev.: 58927

The computesWithScratchGhost required some extra error checking to
ensure that, in the packed case, a computes and requires on the same
variable was resolved properly.

28 lines of code changed in 1 file:

  • CCA/Components/Arches/TurbulenceModels: TurbulenceModelFactory.cc (+28 -40)
jthornoc 2018-11-16 12:07 Rev.: 58924

Removing temporary variable option for portability reasons.

234 lines of code changed in 9 files:

  • CCA/Components/Arches/TurbulenceModels: DSFT.cc (+85 -91), DSFT.h (+2 -2), DSmaCs.h (+6 -8), DSmaMMML.h (+98 -98), DSmaMMMLv2.h (+31 -31), TurbulenceModelFactory.cc (+12 -52), sub.mk (-3)
ohdiazi 2018-10-08 15:07 Rev.: 58777

Adding name_factory for Turbulence factory

3 lines of code changed in 1 file:

  • CCA/Components/Arches/TurbulenceModels: TurbulenceModelFactory.cc (+3 -2)
ohdiazi 2018-10-08 15:07 Rev.: 58773

1. Neumann BC was comment out for normal direction in staggered variables.
2. Changing ghost cells to zero for drhodt
3. Correcting range for add gradient
4. BC for enforce p=0, sign is -1
5. Correcting First interior cell. This BC will be moved to Boundary Functors
6. Adding initialization for mu_sgc and mu_turb.

2 lines of code changed in 1 file:

  • CCA/Components/Arches/TurbulenceModels: DSmaCs.h (+2)
ohdiazi 2018-10-08 15:07 Rev.: 58768

Wall stress model

392 lines of code changed in 2 files:

  • CCA/Components/Arches/TurbulenceModels: WallConstSmag.cc (+322), WallConstSmag.h (+70)
ohdiazi 2018-10-08 15:06 Rev.: 58767

Adding wall const model in KokkosSolver

11 lines of code changed in 4 files:

  • CCA/Components/Arches/TurbulenceModels: TurbulenceModelFactory.cc (+7), TurbulenceModelFactory.h (+3), sub.mk (+1)
jthornoc 2018-09-19 17:32 Rev.: 58689

Cleanup of variable names and converting to DOUT for debug stream.

233 lines of code changed in 28 files:

  • CCA/Components/Arches/TurbulenceModels: DSFT.cc (+30 -30), DSFT.h (+4 -4), DSFTv2.cc (+24 -24), DSFTv2.h (new), DSmaCs.h (+9 -9), DSmaCsv2.h (new), DSmaMMML.h (+60 -60), DSmaMMMLv2.h (+57 -57), FractalUD.cc (+2 -2), FractalUD.h (new), MultifractalSGS.cc (+4 -4), MultifractalSGS.h (new), SGSforTransport.cc (+4 -4), SGSforTransport.h (new), SGSsigma.cc (+1 -1), SGSsigma.h (new), Smagorinsky.h (+4 -4), WALE.cc (+1 -1), WALE.h (+4 -4)
jthornoc 2018-08-29 11:04 Rev.: 58562

Fixing several warnings in Arches. Should not change answers.

240 lines of code changed in 18 files:

  • CCA/Components/Arches/TurbulenceModels: DSFT.cc (+37 -35), DSFT.h (+4 -4), DSFTv2.cc (+10 -9), DSFTv2.h (+4 -4), DSmaCs.h (+15 -15), DSmaCsv2.h (+11 -11), DSmaMMML.h (+10 -9), DSmaMMMLv2.h (+5 -5), DynamicSmagorinskyHelper.cc (new 15), DynamicSmagorinskyHelper.h (+75 -84), FractalUD.cc (+3 -3), MultifractalSGS.cc (+12 -11), SGSforTransport.cc (+10 -9), SGSforTransport.h (+2 -2), SGSsigma.cc (+19 -19), WALE.cc (+6 -6), sub.mk (+2 -1)
bisaac 2018-07-20 14:28 Rev.: 58442

Remaining changes to get nles working on the 64x64x64 test case. No impact on rt.

23 lines of code changed in 4 files:

  • CCA/Components/Arches/TurbulenceModels: FractalUD.h (-6), MultifractalSGS.cc (+22 -131), MultifractalSGS.h (+1 -21), TurbulenceModelFactory.cc (-5)
bisaac 2018-07-19 11:08 Rev.: 58437

Updated coefficients for fourth order deriviative in NLES model. This wont impact RT.

1 lines of code changed in 1 file:

  • CCA/Components/Arches/TurbulenceModels: MultifractalSGS.h (+1 -2)
bisaac 2018-07-17 16:05 Rev.: 58431

Removed a redundant nles task and clean up some old comments.

10 lines of code changed in 9 files:

  • CCA/Components/Arches/TurbulenceModels: FilterStress.cc (del), FilterStress.h (del), FractalUD.cc (-42), MultifractalSGS.cc (+2 -267), MultifractalSGS.h (-30), SGSforTransport.cc (+8 -97), SGSforTransport.h (-1), TurbulenceModelFactory.cc (-11), sub.mk (-1)
bisaac 2018-07-17 14:43 Rev.: 58430

Fixed indentation in NLES code. No impact on regression tests.

1424 lines of code changed in 6 files:

  • CCA/Components/Arches/TurbulenceModels: FilterStress.cc (new 238), FilterStress.h (new 85), MultifractalSGS.cc (+682 -682), MultifractalSGS.h (+164 -164), SGSforTransport.cc (+215 -215), SGSforTransport.h (+40 -40)
bisaac 2018-06-20 16:54 Rev.: 58337

This commit adds all of Minmins work on the nles model. No impact on regression tests.

2403 lines of code changed in 10 files:

  • CCA/Components/Arches/TurbulenceModels: FilterStress.cc (+292), FilterStress.h (+129), FractalUD.cc (+422), FractalUD.h (+117), MultifractalSGS.cc (+811), MultifractalSGS.h (+226), SGSforTransport.cc (+251), SGSforTransport.h (+73), TurbulenceModelFactory.cc (+78), sub.mk (+4)
dav 2018-04-25 15:35 Rev.: 58189


This commit brings the PIDX data I/O branch (named: pidx_xml) back into the trunk.
All PIDX data I/O is, by default, turned off. To use PIDX you have to configure
against the PIDX library (either installing manually and pointing at it, or using
the --with-pidx flag (not 100% certain that this works at the moment)), and you must
set <DataArchiver type="PIDX"> (as opposed to the default which is type="UDA") in
the .ups input file.


Other caveats:

- Particles are not (currently?) supported in PIDX so any simulation that has a
particle data type will fail (most will print an error that PIDX does not
support them, but it seems some just die).

- Simulations that have overlapping patches (this may just be AMR type
sims) (eg: multibox_rmcrt_coal_1L) can save (slightly different) results.
In the multibox_rmcrt_coal_1L, we saw (only) a handful of differences like this:
((A 1 vs a 0 in a couple of locations) Also note that the UDA itself compared
successfully, but the checkpoint underneath it did not...)

DIFFERENCE [int 36, 5, 0] Time: 0.0003106658 Level: 0 Patch1: 0 Patch2: 0 Material: 0 Variable: areaFractionFX
multibox_RMCRT_coal_1L.uda/checkpoints goldStandard/.../multibox_RMCRT_coal_1L.uda/checkpoints
1 0

- "#if HAVE_PIDX" is used inconsistently through a number of files. Some PIDX stuff is #if'd out, while other code
is left in and compiles, it is just not used.

- There are a lot of cleanups that can and should take place wrt the PIDX integration.
While the code passes all the local RT tests (with the exception of particle tests),
I don't believe it has been run at large scale (though it should work) on a BGQ or Quartz@llnl.

Summary of changes: (Note, see pidx_xml branch commits if you want more information.)

M CCA/Ports/ApplicationInterface.h
M CCA/Components/Application/ApplicationCommon.h

- Added the ability to record (and retrieve) the number for the last regrid time step.

M CCA/Components/DataArchiver/DataArchiver.h
M CCA/Components/DataArchiver/DataArchiver.cc

- When saving as PIDX, only create/output timestep.xml on the initial (I/O) time step that occurs after the regrid.
- Fixes that allow PIDX to save correctly (and efficiently) in parallel. If you are ever trying
to trace this back, read the comments from the commit logs for the "pidx_xml" branch.
- Remove createPIDX_dirs() as it was commented out and Sid tells me that PIDX creats its own dirs and we don't need this.
- Lot of white space fixes.

M CCA/Components/Examples/RMCRT_Test.cc
M CCA/Components/PostProcessUda/PostProcess.cc

- The DataArchive (DA) queryVariables() function now also returns the number of materials for each variable.
- "else" and "else if" should be on a separate line to make it easier to read.

M CCA/Components/Models/Radiation/RMCRT/RayGPU.cc

- Differentiate the output between the GPU and non-GPU reports so the viewer knows explicitly whether the GPU code was run.

M CCA/Components/Schedulers/OnDemandDataWarehouse.h
M CCA/Components/Schedulers/OnDemandDataWarehouse.cc

- Cosmetics: Line up variables, use more than 80 chars per line, white space.
Add in comments denoting default param values.

M CCA/Components/Schedulers/SchedulerCommon.cc

- Cosmetics.

M CCA/Components/SimulationController/AMRSimulationController.cc

- Cosmetics: Use more white space, 80+ chars per line for better readability, etc.

M CCA/Ports/PIDXOutputContext.h

- const'ify some params.
- checkReturnCode() is a static function so mark it so.

M CCA/Ports/PIDXOutputContext.cc

- White spacee. Code alignment for readability.

M Core/DataArchive/DataArchive.h
M Core/DataArchive/DataArchive.cc

- Add in PIDX functions. Note, queryPIDXSerial() is used (currently) by standalone codes (eg: puda).
Its purpose is to wrap the setupQueryPIDX()/queryPIDX() calls that have been added to
allow PIDX to truly run in parallel. At some point it would be good to update puda/compare_uda/etc
to run in parallel...
- See previous comments from PIDX branch for more details on the PIDX communicators that are necessary
to transfer data as some data does not live on all cores and thus can't use the golbal comm.

- Rename a few functions (queryAndSetParticlePositionName()) to be more accurate as to what they do.

- There are still a number of hacks in this code that need to be addressed (eg: var_materials map).

M Core/Geometry/IntVector.h

- Mostly cosmetics...
White space for readability.
Place 1-line functions in .h on one line to make it easier to see all provided functions.

M Core/Grid/Grid.cc

- White space, variable alignment for readability.

M Core/Grid/Level.h
M Core/Grid/Level.cc

- White space, coding standard (return type on its own line).
- Fix logic error in computeVariableExtents() that did not handle periodic boundaries correctly.
This fix was suggested as probably the correct way to do it by Todd... seems to pass tests and did fix
the issue (PIDX saving a particular something or other) that led me to it.

M Core/Grid/Patch.cc

- Place "else" on its own line for readability.

M Core/Grid/Variables/GridVariable.h

- Added emitPIDX().
- Opening "{" for functions in .h files goes on same line.

M Core/Grid/Variables/GridVariableBase.h
M Core/Grid/Variables/GridVariableBase.cc

- Organize #includes.
- White space, line up vars, etc for better readability.
- Return type on its own line.

M Core/Grid/Variables/ParticleData.h

- #include ParticleSubset.h for particleIndex.

M Core/Grid/Variables/ParticleSubset.h

- Cosmetic white space.

M Core/Grid/Variables/ParticleVariable.h

- White space, variable line up, etc.
- Added emitPIDX() function for particles. Note, particles do not fully work yet (on PIDX side).
And thus, this function hasn't really been tested.

M Core/Grid/Variables/ParticleVariableBase.h
M Core/Grid/Variables/ParticleVariableBase.cc
M Core/Grid/Variables/PerPatchBase.h
M Core/Grid/Variables/PerPatchBase.cc
M Core/Grid/Variables/ReductionVariableBase.h
M Core/Grid/Variables/ReductionVariableBase.cc

- Cosmetic white space. Coding standards. Etc.

M Core/Grid/Variables/Variable.h
M Core/Grid/Variables/Variable.cc

- Organize #includes.
- Use "const" on params that are const.
- Cosmetic white space, etc.

M Core/Grid/Variables/VarnameMatlPatch.h

- Pass non-changing strings by const reference (instead of copying them).
- White space for readability.

M Core/ProblemSpec/ProblemSpec.cc

- Line up vars, white space.

M R_Tester/helpers/compare_dat_files.pl

- Strip "/" from end of uda names.
- Clean up output to make it more readable (Todd I hope this doesn't break some of your scripts...)

M R_Tester/helpers/compare_dats

- White space.

M R_Tester/helpers/runSusTests.py

- Fix typo.

M StandAlone/compare_uda.cc

- White space.
- Line up vars.
- Coding standard.
- Line up case statement for better readability.
- 0 => nullptr
- query() now returns if the var was found (because PIDX has a list of all variables the simulation starts with
and the vars may not actually exist in the UDA.
- var => var_name (as it is actually the name, and not the var).
- Use 80+ columns.

M StandAlone/partvarRange.cco
M StandAlone/selectpart.cc
M StandAlone/tools/compute_Lnorm_udas.cc
M StandAlone/tools/dumpfields/dumpfields.cc
M StandAlone/tools/extractors/extractF.cc
M StandAlone/tools/extractors/extractS.cc
M StandAlone/tools/extractors/extractV.cc
M StandAlone/tools/extractors/faceextract.cc
M StandAlone/tools/extractors/lineextract.cc
M StandAlone/tools/extractors/partextract.cc
M StandAlone/tools/extractors/particle2tiff.cc
M StandAlone/tools/extractors/timeextract.cc
M StandAlone/tools/puda/AA_MMS.cc
M StandAlone/tools/puda/ER_MMS.cc
M StandAlone/tools/puda/GV_MMS.cc
M StandAlone/tools/puda/ICE_momentum.cc
M StandAlone/tools/puda/PIC.cc
M StandAlone/tools/puda/POL.cc
M StandAlone/tools/puda/asci.cc
M StandAlone/tools/puda/jacquie.cc
M StandAlone/tools/puda/jim1.cc
M StandAlone/tools/puda/jim2.cc
M StandAlone/tools/puda/jim3.cc
M StandAlone/tools/puda/pressure.cc
M StandAlone/tools/puda/puda.cc
M VisIt/interfaces/archiveInterface.cc

- queryVariables() now returns number of materials.

M StandAlone/tools/puda/varsummary.h
M StandAlone/tools/puda/varsummary.cc

- Swat some evil endls.

M build_scripts/build_pidx.sh

- FYI... Not sure if changing PIDX_TAG to "master" actually works...

M buildbot_try.sh

- Added a number of comments about use of this script.
- Fixed some typos.
- Spread command to multiple lines for readability.

5 lines of code changed in 1 file:

  • CCA/Components/Arches/TurbulenceModels: DynamicSmagorinskyHelper.h (+5 -8)
ohdiazi 2018-04-19 09:43 Rev.: 58169

turb viscosity at extra cell, fixing ups file

1 lines of code changed in 1 file:

  • CCA/Components/Arches/TurbulenceModels: WALE.cc (+1)
jthornoc 2018-04-13 06:32 Rev.: 58082

Passing arches down to the task factories.

3 lines of code changed in 2 files:

  • CCA/Components/Arches/TurbulenceModels: TurbulenceModelFactory.cc (+2 -1), TurbulenceModelFactory.h (+1 -1)
ohdiazi 2018-03-23 13:17 Rev.: 57984

DQMOM with kokkos

1 lines of code changed in 1 file:

  • CCA/Components/Arches/TurbulenceModels: DynamicSmagorinskyHelper.h (+1 -1)
jthornoc 2018-03-22 15:31 Rev.: 57982

Removal of duplicate scheduling functionality in the Arches Task Interface. Now we go through the factory.
Cleaning up the failures in the kokkos turbulence models, which required an input file change (removal of volFraction def)
Fixing the setting of simTime in the Arches tasks. Previously time was zero always resulting in nonsense answers.
Finally, changing the Atomic task to derive off the Arches Task rather than be its own beast.

Expecting the following "failures" which will require update to GS:
S U M M A R Y
Failed: ARCHES-opt tests
:kokkos-x-scalar_mms_RK1: test failed comparison tests
:kokkos-x-scalar_mms_RK1: (restart) test failed comparison tests
:kokkos-x-scalar_mms_RK2: test failed comparison tests
:kokkos-x-scalar_mms_RK2: (restart) test failed comparison tests
:kokkos-x-scalar_mms_RK3: test failed comparison tests
:kokkos-x-scalar_mms_RK3: (restart) test failed comparison tests
:problem3_Shunn_mms-x: test failed comparison tests
:problem3_Shunn_mms-x: (restart) test failed comparison tests
:isotropic_kokkos_wale: test failed comparison tests

9 lines of code changed in 1 file:

  • CCA/Components/Arches/TurbulenceModels: TurbulenceModelFactory.cc (+9 -10)
jthornoc 2018-03-02 11:05 Rev.: 57907

Removing print statement in task.

0 lines of code changed in 1 file:

  • CCA/Components/Arches/TurbulenceModels: DSmaCs.h (-1)
jthornoc 2018-02-26 23:57 Rev.: 57884

Grouping DQMOM eqns by environment.
Cleaning up some warnings.

2 lines of code changed in 1 file:

  • CCA/Components/Arches/TurbulenceModels: SGSsigma.cc (+2 -2)
zhouminmin 2018-02-21 18:24 Rev.: 57859

Updating sigma turbulent viscosity model with wall bc, it doesnot break RT

169 lines of code changed in 2 files:

  • CCA/Components/Arches/TurbulenceModels: SGSsigma.cc (+155 -48), SGSsigma.h (+14 -2)
ohdiazi 2018-02-21 16:47 Rev.: 57858

WALE model for production code

24 lines of code changed in 2 files:

  • CCA/Components/Arches/TurbulenceModels: WALE.cc (+22 -5), WALE.h (+2)
ohdiazi 2018-02-21 09:31 Rev.: 57851

fixing packed isotropic test

6 lines of code changed in 1 file:

  • CCA/Components/Arches/TurbulenceModels: DSmaMMML.h (+6 -6)
bisaac 2018-02-18 22:49 Rev.: 57847

This is a commit from Oscar. It is fixing an issue related to uninitialized variables. No impact on RT.

8 lines of code changed in 2 files:

  • CCA/Components/Arches/TurbulenceModels: DSFT.cc (+1), DSmaMMML.h (+7 -6)
ohdiazi 2018-02-16 12:16 Rev.: 57840

fixing packed turbulence case

38 lines of code changed in 4 files:

  • CCA/Components/Arches/TurbulenceModels: DSFT.cc (+20 -18), DSmaCs.h (+9 -4), DSmaMMML.h (+6), WALE.cc (+3 -3)
ohdiazi 2018-02-16 12:16 Rev.: 57838

BC for smag dynamic model

336 lines of code changed in 6 files:

  • CCA/Components/Arches/TurbulenceModels: DSFT.cc (+40 -18), DSFT.h (+2 -2), DSmaCs.h (+8 -27), DSmaMMML.h (+2 -2), DynamicSmagorinskyHelper.h (+281 -6), WALE.cc (+3 -1)
ohdiazi 2018-02-16 12:16 Rev.: 57837

save filter MM and ML

10 lines of code changed in 1 file:

  • CCA/Components/Arches/TurbulenceModels: DSmaCs.h (+10 -2)
ohdiazi 2018-02-16 12:16 Rev.: 57836

DS v2 : sij is filtered instead of rho*ui

1158 lines of code changed in 6 files:

  • CCA/Components/Arches/TurbulenceModels: DSFTv2.cc (+304), DSFTv2.h (+76), DSmaCsv2.cc (new 2), DSmaCsv2.h (+302), DSmaMMMLv2.cc (new 2), DSmaMMMLv2.h (+472)
ohdiazi 2018-02-16 12:16 Rev.: 57835

recoding filter

141 lines of code changed in 7 files:

  • CCA/Components/Arches/TurbulenceModels: DSFT.cc (+5 -14), DSFT.h (+1), DSmaCs.h (+5 -6), DSmaMMML.h (+18 -34), DynamicSmagorinskyHelper.h (+54 -172), TurbulenceModelFactory.cc (+55), sub.mk (+3)
ohdiazi 2018-02-16 12:16 Rev.: 57833

adding a special filter for density

78 lines of code changed in 2 files:

  • CCA/Components/Arches/TurbulenceModels: DSFT.cc (+1 -1), DynamicSmagorinskyHelper.h (+77 -1)
ohdiazi 2018-02-16 12:16 Rev.: 57832

rho*u is computed and filter

297 lines of code changed in 4 files:

  • CCA/Components/Arches/TurbulenceModels: DSFT.cc (+62 -3), DSmaCs.h (+3 -3), DSmaMMML.h (+31 -43), DynamicSmagorinskyHelper.h (+201 -1)
ohdiazi 2018-02-16 12:16 Rev.: 57831

filter operation

73 lines of code changed in 6 files:

  • CCA/Components/Arches/TurbulenceModels: DSFT.cc (+21 -1), DSFT.h (+2), DSmaCs.h (-1), DynamicSmagorinskyHelper.h (+1 -1), WALE.cc (+46 -25), WALE.h (+3)

(8 more)

Generated by StatSVN 0.7.0