Skip to content

Commit

Permalink
Merge pull request #296 from CFD-GO/develop
Browse files Browse the repository at this point in the history
Version 6.4
  • Loading branch information
llaniewski authored Aug 5, 2020
2 parents 99242e5 + 0d8d7ca commit cac2755
Show file tree
Hide file tree
Showing 69 changed files with 6,452 additions and 391 deletions.
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,15 @@ jobs:
env:
secure: "gDINAbE+apFUrReGDClqtSd4ir1ivFww/EjslD2XA8igmwELA0Kkom3z+X6HiMjlPaNLK5oRoyD7BkFSJ9Sf1i6z2+iLVmqJoOLaexZXM09C557Xmh38DisHTvQf6IVg0TRvQ8DEGDfFMrNr5jjDpXdPYs2sVJPW1Mi0Hwehtvt1Siuxr8bkoa/p6qZLbmhYl6ETGqFXDMmRWKFMaJpJ38BScwWIPgVqwSOcejhEdaPUuGtOYSirUhUDWoSQmOUPfbHfadIAT9+OPDY4p91eQmDQGNj9ZgWMvU8dECrrzE2Z6UfbO+swXmfMWe0BYwEpcGtYMG19y6dEKh4TmrEPR8Y/9SaVFiY/PPm906agKeJdGwHdokYqcjB/STSR83ni+b3qAfIgwYW2pcSMSEpbn+kUp70k9emV3KVJVIg3G/s4fEC1bip5wkBAYInPGa+FmNJTM8Y3iSHeQmuv2zia5od5RJDZg98kf0nXv9iEWEYrQl2KkEGNPK+bsWinA0KES1cZ21aMnPENf7mhyOsUUEYX4oCCxzzR16PCWWx4b7E4SBDweU5DfsEuwByjAImTOArSuofv1QnXynmDDD5W3TVDqx+067pMCE4FLV1yWqqrnaoPpWeWGlhTQStbO3xYSNgUNMma8pYEQStTpdkgXt4gx6RHaCjZwZ/FZx1rZRk="
script:
- tools/install.sh rpackage jsonlite
- tools/install.sh rpackage yaml
- tools/install.sh rpackage XML
- make configure
- ./configure --disable-cuda
- mkdir -p wiki/xml wiki/images
- mkdir -p wiki/xml wiki/images wiki/schema
- R -f tools/gen.doc.R
- make wiki/Models.md
- make -j 2 wiki/Models.md
- make -j 2 schemas
- tools/deploy.docs.sh

after_success:
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ Contributors:
* [Dmytro Sashko](https://github.com/shkodm)
* [Travis Mitchell](https://github.com/TravisMitchell)
* [Paweł Obrępalski](https://github.com/PabloOb)
* [Grzegorz Gruszczyński](https://github.com/ggruszczynski)

Developed at: [C-CFD Group](https://c-cfd.meil.pw.edu.pl/) at [Warsaw University of Technology](http://pw.edu.pl/) from 2012

Expand Down
83 changes: 80 additions & 3 deletions doc/elements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ types:
name: Node Type Brush
children:
- type: geom
- type: predefined
- type: bool
- special: blocks
attr:
Expand All @@ -11,10 +12,15 @@ types:
select:
- special: NodeTypeGroups
- type: geom
- name: name
val:
string: zonename
geom:
name: Geometry Primitive
attr:
- type: geom
predefined:
name: Predefined geometry shapes
bool:
name: Geometry Boolean Operation
children:
Expand Down Expand Up @@ -74,16 +80,49 @@ CLBConfig:
- type: container
- type: params
- type: setup

attr:
- name: permissive
val:
bool:
- name: version
val:
string: version

Geometry:
type: geometry
attr:
- name: nx
val:
unit: int
- name: ny
val:
unit: int
- name: nz
val:
unit: int

Init:
comment: >
Initialize lattice. Init is also always run at the end of `<Model/`> element
type: callback

Solve:
comment: >
Main solution element. It runs a prescribed number of iterations.
type: action

RunAction:
comment: >
Main solution element. It runs a prescribed number of iterations.
type: action
attr:
- name: name
optional: false
val:
select:
- special: Actions
comment: The name of the action to run

VTK:
comment: Export VTK data
example: <VTK Iterations="1000" what="U,Rho"/>
Expand Down Expand Up @@ -247,6 +286,9 @@ Sample:
Box:
type: geom

Sphere:
type: geom

Pipe:
type: geom

Expand All @@ -258,8 +300,8 @@ Wedge:
select:
- UpperLeft
- UpperRight
- BottomLeft
- BottomRight
- LowerLeft
- LowerRight
use: required

STL:
Expand Down Expand Up @@ -295,6 +337,31 @@ STL:
val:
unit: float
comment: Specifies the scale by which the STL geometry should be multiplied. If you work in physical units, this can be e.g. "1m"
- name: x
val:
unit: float
comment: Specifies the offset by which the STL geometry should be moved
- name: y
val:
unit: float
comment: Specifies the offset by which the STL geometry should be moved
- name: z
val:
unit: float
comment: Specifies the offset by which the STL geometry should be moved

Inlet:
type: predefined

Outlet:
type: predefined

Channel:
type: predefined

Tunnel:
type: predefined


Param:
type:
Expand Down Expand Up @@ -506,6 +573,16 @@ Repeat:
numeric: int
comment: Numer of Times to repeat a segment

Container:
type: action
comment: A simple container element
example: |
<Container>
<VTK Iterations="10"/>
<Solve Iterations="1000"/>
</Container>
attr:

Control:
type: setup
comment: Element prescribing time-dependent Settings
Expand Down
4 changes: 3 additions & 1 deletion example/heat/d3q27q27_Hot_Karman_Re100_Pr5.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
<?xml version="1.0"?>
<CLBConfig version="2.0" output="output/d3q27q27_HotKarman_Re100_Pr5/">
<Geometry nx="512" ny="100" nz="3" >
<!-- <CM_HIGHER> <Box/> </CM_HIGHER> -->
<Cumulants> <Box/> </Cumulants>
<!-- <CM> <Box/> </CM> -->
<!-- <CM_HIGHER> <Box/> </CM_HIGHER> -->
<!-- <BGK> <Box/> </BGK> -->
<WVelocity name="Inlet"><Box nx="1"/></WVelocity>
<ENeumann name="Outlet"><Box dx="-1"/></ENeumann>
<!-- <EConvective name="Outlet"><Box dx="-1"/></EConvective> -->
Expand Down
121 changes: 121 additions & 0 deletions example/heat/d3q27q7_Hot_Karman_Re100_Pr5.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@

<!-- To be used with d3q27q27_cm_cht_OutFlowNeumann_AVG_IBB -->

<?xml version="1.0"?>
<CLBConfig version="2.0" output="output/d3q27q7_HotKarman_Re100_Pr5/">
<Geometry nx="512" ny="100" nz="3" >
<CM> <Box/> </CM>
<!-- <BGK> <Box/> </BGK> -->
<!-- <CM_NONLINEAR> <Box/> </CM_NONLINEAR> -->
<WVelocity name="Inlet"><Box nx="1"/></WVelocity>
<ENeumann name="Outlet"><Box dx="-1"/></ENeumann>
<!-- <EConvective name="Outlet"><Box dx="-1"/></EConvective> -->
<!-- <EPressure name="Outlet"><Box dx="-1"/></EPressure> -->


<!--
Second Order BC on cylinder
-->
<HydroIBB>
<STL file="example/heat/cylinder_XYplane_D10_Z9.stl"
scale="3.0"
Xrot="0d"
x="135.000000"
y="50.000000"
z="0"
side="surface"/>
</HydroIBB>
<HeaterDirichletTemperatureIABB name="BC_heat_cylinder">
<STL file="example/heat/cylinder_XYplane_D10_Z9.stl"
scale="3.0"
Xrot="0d"
x="135.000000"
y="50.000000"
z="0"
side="surface"/>
</HeaterDirichletTemperatureIABB >


<!-- First order BC on cylinder:
Read cylinder from stl
-->


<!-- <Wall mask="ALL">
<STL file="example/heat/cylinder_XYplane_D10_Z9.stl"
scale="3.0"
Xrot="0d"
x="135.000000"
y="50.000000"
z="0"
side="in"/>
</Wall>
<HeaterDirichletTemperatureEQ name="BC_heat_cylinder">
<STL file="example/heat/cylinder_XYplane_D10_Z9.stl"
scale="3.0"
Xrot="0d"
x="135.000000"
y="50.000000"
z="0"
side="in"/>
</HeaterDirichletTemperatureEQ> -->



<!-- First order BC on cylinder:
draw cylinder using primitive functions
-->

<!--
<Wall mask="ALL">
<Cylinder dx="120" dy="35" nx="30" ny="30" nz="3"/>
</Wall>
<HeaterDirichletTemperatureEQ name="BC_heat_cylinder">
<Cylinder dx="120" dy="35" nx="30" ny="30" nz="3"/>
</HeaterDirichletTemperatureEQ>
-->

<FluxMeasurmentZone1>
<Box dx="25" nx="1"/>
</FluxMeasurmentZone1>

<FluxMeasurmentZone2>
<Box dx="-50" nx="1"/>
</FluxMeasurmentZone2>
</Geometry>
<Model>

<Param name="InitTemperature" value="10"/>
<Param name="InitTemperature" value="10" zone="Inlet"/>
<Param name="InitTemperature" value="11" zone="BC_heat_cylinder"/>
<!-- <Param name="InitTemperature" value="10" zone="Outlet"/> -->
<!-- <Param name="InitHeatFlux" value="0.001" zone="BC_heat_cylinder"/> -->

<Param name="nu" value="0.01"/>
<Param name="conductivity" value="0.005"/>

<Param name="nu_buffer" value="0.166666"/>
<Param name="conductivity_buffer" value="0.166666"/>

<Param name="h_stability_enhancement" value="1."/>
<Param name="cp" value="1."/>
<Param name="material_density" value="1."/>

<Param name="VelocityX" value="0.025" />

<!-- CylinderCenter is used only for heat flux bc
<Params CylinderCenterX="135.0" />
<Params CylinderCenterY="50.0"/>
-->

</Model>

<Solve Iterations="3"> <VTK Iterations="1"/> </Solve>
<Failcheck Iterations="5000" nx="512" ny="100" nz="3" />

<Solve Iterations="30000">
<VTK Iterations="1000" what="H,T,U,Rho,averageT,averageU"/>
<Average Iterations="5000"/>
<Log Iterations="1000"/>
</Solve>
</CLBConfig>
2 changes: 1 addition & 1 deletion example/moving/flapping1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<Param name="PDX" value="0.5m"/>
<!-- Movement of the plate -->
<Control Iterations="1s">
<CSV file="example/sin.csv" Time="x*1s">
<CSV file="example/moving/sin.csv" Time="x*1s">
<Param name="PY" value="Sin*0.5m+1m"/>
<Param name="PR" value="Cos*2+1"/>
</CSV>
Expand Down
54 changes: 54 additions & 0 deletions example/multiphase/d3q27_pf_velocity/BubbleMa001.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0"?>
<CLBConfig version="2.0" output="/scratch/eait/uqtmitc3/thermocapillary/" permissive="true">
<!-- MODEL: d3q27_pf_thermocapillary
First test of temp field
Created: 17/04/2020
Responsible: @TravisMitchell
-->
<Geometry nx="160" ny="321" nz="160">
<MRT>
<Box/>
</MRT>
<Wall mask="ALL" name="BottomWall">
<Box ny="1"/>
</Wall>
<Wall mask="ALL" name="TopWall">
<Box dy="-1"/>
</Wall>
</Geometry>
<Model>
<Param name="Radius" value="20"/>
<Param name="CenterX" value="80"/>
<Param name="CenterY" value="160"/>
<Param name="CenterZ" value="80"/>
<Param name="BubbleType" value="-1"/>
<Param name="Density_h" value="1"/>
<Param name="Density_l" value="1"/>
<Param name="Viscosity_h" value="0.1"/>
<Param name="Viscosity_l" value="0.1"/>
<Param name="sigma" value="5e-3"/>
<Param name="M" value="0.05"/>
<Param name="IntWidth" value="4"/>
<Param name="T_init" value="16"/>
<Param name="T_ref" value="16"/>
<Param name="dT" value="0.1"/>
<Param name="sigma_T" value="-2.5e-4"/>
<Param name="T_init" value="0" zone="BottomWall"/>
<Param name="T_init" value="32" zone="TopWall"/>
<Param name="cp_h" value="1"/>
<Param name="cp_l" value="1"/>
<Param name="k_h" value="0.1"/>
<Param name="k_l" value="0.1"/>
</Model>
<Init/>
<Container>
<Stop TempChangeBelow="1e-4" Times="2" Iterations="100"/>
<RunAction name="TempToSteadyState" Iterations="100000"/>
</Container>
<VTK what="PhaseField,U,T" />
<Failcheck nx="10" Iterations="5"/>
<Solve Iterations="100000">
<VTK Iterations="50000" what="PhaseField,U,T" />
<Log Iterations="100"/>
</Solve>
</CLBConfig>
Loading

0 comments on commit cac2755

Please sign in to comment.