diff --git a/COPYING b/COPYING deleted file mode 100644 index de2dcce..0000000 --- a/COPYING +++ /dev/null @@ -1,678 +0,0 @@ -------------------------------------------------------------------------- - - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. - -------------------------------------------------------------------------- diff --git a/DISCLAIMER b/DISCLAIMER deleted file mode 100644 index 5a7dfe2..0000000 --- a/DISCLAIMER +++ /dev/null @@ -1,10 +0,0 @@ -Parts of the code uses OpenFOAM® technology. This offering is not approved or endorsed by OpenCFD Limited, the producer of the OpenFOAM software and owner of the OPENFOAM® and OpenCFD® trade marks. - -Detailed information on the OpenFOAM trademark can be found at - - - http://www.openfoam.com/legal/trademark-policy.php - - http://www.openfoam.com/legal/trademark-guidelines.php - -For further information on OpenCFD and OpenFOAM, please refer to - - - http://www.openfoam.com diff --git a/README b/README deleted file mode 100755 index 816c6c1..0000000 --- a/README +++ /dev/null @@ -1,107 +0,0 @@ -/*---------------------------------------------------------------------------*\ - CFDEMcoupling - Open Source CFD-DEM coupling - - CFD-DEM coupling toolbox, released by - DCS Computing GmbH, Linz, Austria - www.dcs-computing.com, office@dcs-computing.com - - CFDEMcoupling is part of the CFDEMproject - www.cfdem.com - - CFDEMcoupling is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 3 of the License, or (at your - option) any later version. - - CFDEMcoupling is part of CFDEMproject: - www.liggghts.com | www.cfdem.com - - Core developer and main author: - Christoph Goniva, christoph.goniva@dcs-computing.com - - LIGGGHTS® and CFDEM® are registered trade marks of DCS Computing GmbH, - the producer of the LIGGGHTS® software and the CFDEM®coupling software - See http://www.cfdem.com/terms-trademark-policy for details. -/*---------------------------------------------------------------------------*\ -Copyright - - Copyright 2012- DCS Computing GmbH, Linz - Copyright 2009-2015 JKU Linz - - Some parts of CFDEMcoupling are based on OpenFOAM® and Copyright on these - parts is held by the OpenFOAM® Foundation (www.openFoam.org) - and potentially other parties. - Some parts of CFDEMcoupling are contributied by other parties, which are - holding the Copyright. This is listed in each file of the distribution. -/*---------------------------------------------------------------------------*\ -License - - This file is part of CFDEMcoupling. - - CFDEMcoupling is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 3 of the License, or (at your - option) any later version. - - CFDEMcoupling is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with CFDEMcoupling; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -/*---------------------------------------------------------------------------*\ -Description - This code provides models and solvers to realize coupled CFD-DEM simulations - using LIGGGHTS and OpenFOAM® technology. - Note: this code is not part of OpenFOAM®. - This offering is not approved or endorsed by OpenCFD Limited, - the producer of the OpenFOAM® software and owner of the OPENFOAM® - and OpenCFD® trade marks. -\*---------------------------------------------------------------------------*/ - - -CFDEM® coupling provides an open source parallel coupled CFD-DEM framework -combining the strengths of LIGGGHTS® DEM code and the Open Source -CFD package OpenFOAM®(*). The CFDEM®coupling toolbox allows to expand -standard CFD solvers of OpenFOAM®(*) to include a coupling to the DEM -code LIGGGHTS®. In this toolbox the particle representation within the -CFD solver is organized by "cloud" classes. Key functionalities are organised -in sub-models (e.g. force models, data exchange models, etc.), which can easily -be selected and combined by dictionary settings. - -The coupled solvers run fully parallel on distributed-memory clusters. - -Features are: - -- its modular approach allows users to easily implement new models -- its MPI parallelization enables to use it for large scale problems -- the "forum" (www.cfdem.com) on CFD-DEM gives the possibility - to exchange with other users / developers -- the use of GIT allows to easily update to the latest version -- basic documentation is provided - -The CFDEM®coupling distribution includes the following files and directories: - -- "README" file (this file) -- "COPYING" file the GNU General Public License (GPL) -- "DISCLAIMER" file -- "src" directory including the source files of the coupling toolbox and models -- "applications" directory including the solver files for coupled CFD-DEM simulations -- "doc" directory including the documentation of CFDEM®coupling -- "tutorials" directory including basic tutorial cases showing the functionality - -Details on installation are given on the "www.cfdem.com" website. - -The functionality of this CFD-DEM framwork is described via "tutorial cases" showing -how to use different solvers and models. - -CFDEM®coupling stands for Computational Fluid Dynamics (CFD) - -Discrete Element Method (DEM) coupling. - -\*---------------------------------------------------------------------------*/ -(*) This offering is not approved or endorsed by OpenCFD Limited, - the producer of the OpenFOAM software and - owner of the OPENFOAM® and OpenCFD® trade marks. -\*---------------------------------------------------------------------------*/ diff --git a/applications/solvers/cfdemSolverIB/Make/options b/applications/solvers/cfdemSolverIB/Make/options index c3aae78..6b65ebe 100755 --- a/applications/solvers/cfdemSolverIB/Make/options +++ b/applications/solvers/cfdemSolverIB/Make/options @@ -1,10 +1,12 @@ +sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) include $(CFDEM_ADD_LIBS_DIR)/$(CFDEM_ADD_LIBS_NAME) PFLAGS+= -DCFDEMWMPROJECTVERSION="$(CFDEM_WM_PROJECT_VERSION)" EXE_INC = \ $(PFLAGS) \ - $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \ + $(PINC) \ + $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -16,6 +18,7 @@ EXE_INC = \ -I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \ -I$(CFDEM_LIGGGHTS_SRC_DIR) + EXE_LIBS = \ -L$(CFDEM_LIB_DIR)\ $(CFDEM_ADD_INCOMPTURBMOD_LIBS) \ diff --git a/applications/solvers/cfdemSolverIB/cfdemSolverIB.C b/applications/solvers/cfdemSolverIB/cfdemSolverIB.C index 3a005b1..bd0700b 100755 --- a/applications/solvers/cfdemSolverIB/cfdemSolverIB.C +++ b/applications/solvers/cfdemSolverIB/cfdemSolverIB.C @@ -47,7 +47,6 @@ Contributions #else #include "turbulenceModel.H" #endif -#include "superquadric_flag.h" #include "cfdemCloudIB.H" #if defined(SUPERQUADRIC_ACTIVE_FLAG) #include "cfdemCloudIBSuperquadric.H" @@ -108,7 +107,7 @@ int main(int argc, char *argv[]) //=== dyM =================== interFace = mag(mesh.lookupObject("voidfractionNext")); - mesh.update(); //dyM + particleCloud.setMeshHasUpdatedFlag(mesh.update()); //dyM #if defined(version30) #include "readTimeControls.H" diff --git a/applications/solvers/cfdemSolverPiso/Make/options b/applications/solvers/cfdemSolverPiso/Make/options index a5f603d..3a8d791 100644 --- a/applications/solvers/cfdemSolverPiso/Make/options +++ b/applications/solvers/cfdemSolverPiso/Make/options @@ -1,14 +1,17 @@ +sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) include $(CFDEM_ADD_LIBS_DIR)/$(CFDEM_ADD_LIBS_NAME) PFLAGS+= -DCFDEMWMPROJECTVERSION="$(CFDEM_WM_PROJECT_VERSION)" EXE_INC = \ $(PFLAGS) \ - $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \ + $(PINC) \ + $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/fvOptions/lnInclude \ -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \ -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \ -I$(CFDEM_LIGGGHTS_SRC_DIR) @@ -19,6 +22,7 @@ EXE_LIBS = \ -lincompressibleTransportModels \ -lfiniteVolume \ -lmeshTools \ + -lfvOptions \ -l$(CFDEM_LIB_NAME) \ $(CFDEM_ADD_LIB_PATHS) \ $(CFDEM_ADD_LIBS) diff --git a/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C b/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C index 104a0a8..0a48e6e 100644 --- a/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C +++ b/applications/solvers/cfdemSolverPiso/cfdemSolverPiso.C @@ -44,13 +44,17 @@ Description #else #include "turbulenceModel.H" #endif +#if defined(versionv1606plus) || defined(version40) + #include "fvOptions.H" +#else + #include "fvIOoptionList.H" +#endif #include "fixedFluxPressureFvPatchScalarField.H" #include "cfdemCloud.H" #if defined(anisotropicRotation) #include "cfdemCloudRotation.H" #endif -#include "superquadric_flag.h" #if defined(SUPERQUADRIC_ACTIVE_FLAG) #include "cfdemCloudRotationSuperquadric.H" #endif @@ -72,6 +76,7 @@ int main(int argc, char *argv[]) #include "createTimeControls.H" #endif #include "createFields.H" + #include "createFvOptions.H" #include "initContinuityErrs.H" // create cfdemCloud @@ -89,8 +94,6 @@ int main(int argc, char *argv[]) Info<< "\nStarting time loop\n" << endl; while (runTime.loop()) { - particleCloud.clockM().start(1,"Global"); - Info<< "Time = " << runTime.timeName() << nl << endl; #if defined(version30) @@ -103,6 +106,7 @@ int main(int argc, char *argv[]) #endif // do particle stuff + particleCloud.clockM().start(1,"Global"); particleCloud.clockM().start(2,"Coupling"); bool hasEvolved = particleCloud.evolve(voidfraction,Us,U); @@ -139,9 +143,11 @@ int main(int argc, char *argv[]) + particleCloud.divVoidfractionTau(U, voidfraction) == - fvm::Sp(Ksl/rho,U) + + fvOptions(U) ); UEqn.relax(); + fvOptions.constrain(UEqn); #if defined(version30) if (piso.momentumPredictor()) @@ -153,6 +159,8 @@ int main(int argc, char *argv[]) solve(UEqn == - fvc::grad(p) + Ksl/rho*Us); else solve(UEqn == - voidfraction*fvc::grad(p) + Ksl/rho*Us); + + fvOptions.correct(U); } // --- PISO loop @@ -190,7 +198,11 @@ int main(int argc, char *argv[]) { setSnGrad ( - p.boundaryField(), + #ifdef versionv1612plus + p.boundaryFieldRef(), + #else + p.boundaryField(), + #endif ( phi.boundaryField() - (mesh.Sf().boundaryField() & U.boundaryField()) @@ -200,7 +212,11 @@ int main(int argc, char *argv[]) { setSnGrad ( - p.boundaryField(), + #ifdef versionv1612plus + p.boundaryFieldRef(), + #else + p.boundaryField(), + #endif ( phi.boundaryField() - (mesh.Sf().boundaryField() & U.boundaryField()) @@ -258,6 +274,7 @@ int main(int argc, char *argv[]) U -= voidfraction*rUA*fvc::grad(p) - Ksl/rho*Us*rUA; U.correctBoundaryConditions(); + fvOptions.correct(U); } // end piso loop } diff --git a/applications/solvers/cfdemSolverPisoSTM/Make/options b/applications/solvers/cfdemSolverPisoSTM/Make/options index 1146aba..d72dd80 100644 --- a/applications/solvers/cfdemSolverPisoSTM/Make/options +++ b/applications/solvers/cfdemSolverPisoSTM/Make/options @@ -1,10 +1,12 @@ +sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) include $(CFDEM_ADD_LIBS_DIR)/$(CFDEM_ADD_LIBS_NAME) PFLAGS+= -DCFDEMWMPROJECTVERSION="$(CFDEM_WM_PROJECT_VERSION)" EXE_INC = \ $(PFLAGS) \ - $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \ + $(PINC) \ + $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -12,6 +14,7 @@ EXE_INC = \ -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \ -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \ -I$(CFDEM_SRC_DIR)/eulerian/scalarTransportModelsCFDEM/lnInclude \ + -I$(CFDEM_LIGGGHTS_SRC_DIR) EXE_LIBS = \ -L$(CFDEM_LIB_DIR)\ diff --git a/applications/solvers/cfdemSolverPisoSTM/cfdemSolverPisoSTM.C b/applications/solvers/cfdemSolverPisoSTM/cfdemSolverPisoSTM.C index d4763f8..1f505cc 100644 --- a/applications/solvers/cfdemSolverPisoSTM/cfdemSolverPisoSTM.C +++ b/applications/solvers/cfdemSolverPisoSTM/cfdemSolverPisoSTM.C @@ -44,7 +44,11 @@ Description #include "turbulenceModel.H" #endif #include "fixedFluxPressureFvPatchScalarField.H" -#include "cfdemCloud.H" +#ifdef MS + #include "cfdemCloudMS.H" +#else + #include "cfdemCloud.H" +#endif #if defined(anisotropicRotation) #include "cfdemCloudRotation.H" #endif @@ -73,7 +77,11 @@ int main(int argc, char *argv[]) #if defined(anisotropicRotation) cfdemCloudRotation particleCloud(mesh); #else - cfdemCloud particleCloud(mesh); + #ifdef MS + cfdemCloudMS particleCloud(mesh); + #else + cfdemCloud particleCloud(mesh); + #endif #endif #include "checkModelType.H" @@ -124,14 +132,9 @@ int main(int argc, char *argv[]) particleCloud.clockM().start(26,"Flow"); - // get scalar source from DEM - particleCloud.forceM(1).manipulateScalarField(Tsource); - Tsource.correctBoundaryConditions(); - + //Scalar transport if desired. Use "none" (noTransport) if no scalar transport is desired stm().update(); - particleCloud.clockM().start(26,"Flow"); - if(particleCloud.solveFlow()) { // Pressure-velocity PISO corrector @@ -196,7 +199,11 @@ int main(int argc, char *argv[]) { setSnGrad ( - p.boundaryField(), + #ifdef versionv1612plus + p.boundaryFieldRef(), + #else + p.boundaryField(), + #endif ( phi.boundaryField() - (mesh.Sf().boundaryField() & U.boundaryField()) @@ -206,7 +213,11 @@ int main(int argc, char *argv[]) { setSnGrad ( - p.boundaryField(), + #ifdef versionv1612plus + p.boundaryFieldRef(), + #else + p.boundaryField(), + #endif ( phi.boundaryField() - (mesh.Sf().boundaryField() & U.boundaryField()) diff --git a/applications/solvers/cfdemSolverPisoScalar/Make/options b/applications/solvers/cfdemSolverPisoScalar/Make/options index db9c417..4245ee5 100644 --- a/applications/solvers/cfdemSolverPisoScalar/Make/options +++ b/applications/solvers/cfdemSolverPisoScalar/Make/options @@ -1,16 +1,19 @@ +sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) include $(CFDEM_ADD_LIBS_DIR)/$(CFDEM_ADD_LIBS_NAME) PFLAGS+= -DCFDEMWMPROJECTVERSION="$(CFDEM_WM_PROJECT_VERSION)" EXE_INC = \ $(PFLAGS) \ - $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \ + $(PINC) \ + $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \ -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \ + -I$(CFDEM_LIGGGHTS_SRC_DIR) EXE_LIBS = \ -L$(CFDEM_LIB_DIR)\ diff --git a/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C b/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C index b1af991..ba339a4 100644 --- a/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C +++ b/applications/solvers/cfdemSolverPisoScalar/cfdemSolverPisoScalar.C @@ -121,6 +121,7 @@ int main(int argc, char *argv[]) // get scalar source from DEM particleCloud.forceM(1).manipulateScalarField(Tsource); Tsource.correctBoundaryConditions(); + particleCloud.forceM(1).commToDEM(); // solve scalar transport equation fvScalarMatrix TEqn @@ -198,7 +199,11 @@ int main(int argc, char *argv[]) { setSnGrad ( - p.boundaryField(), + #ifdef versionv1612plus + p.boundaryFieldRef(), + #else + p.boundaryField(), + #endif ( phi.boundaryField() - (mesh.Sf().boundaryField() & U.boundaryField()) @@ -208,7 +213,11 @@ int main(int argc, char *argv[]) { setSnGrad ( - p.boundaryField(), + #ifdef versionv1612plus + p.boundaryFieldRef(), + #else + p.boundaryField(), + #endif ( phi.boundaryField() - (mesh.Sf().boundaryField() & U.boundaryField()) diff --git a/applications/utilities/cfdemPostproc/Make/options b/applications/utilities/cfdemPostproc/Make/options index dbbf058..e51ebc0 100644 --- a/applications/utilities/cfdemPostproc/Make/options +++ b/applications/utilities/cfdemPostproc/Make/options @@ -1,15 +1,18 @@ +sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) include $(CFDEM_ADD_LIBS_DIR)/$(CFDEM_ADD_LIBS_NAME) PFLAGS+= -DCFDEMWMPROJECTVERSION="$(CFDEM_WM_PROJECT_VERSION)" EXE_INC = \ $(PFLAGS) \ - $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \ + $(PINC) \ + $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(CFDEM_LIGGGHTS_SRC_DIR) EXE_LIBS = \ diff --git a/applications/utilities/cfdemPostproc/cfdemPostproc.C b/applications/utilities/cfdemPostproc/cfdemPostproc.C index 5c64bf5..ae1cd55 100644 --- a/applications/utilities/cfdemPostproc/cfdemPostproc.C +++ b/applications/utilities/cfdemPostproc/cfdemPostproc.C @@ -114,8 +114,11 @@ int main(int argc, char *argv[]) particleCloud.setPos(positions_); particleCloud.voidFractionM().setvoidFraction(NULL,voidfractions_,particleWeights_,particleVolumes_,particleV_); - - voidfraction.internalField() = particleCloud.voidFractionM().voidFractionInterp(); + #ifdef versionv1612plus + voidfraction = particleCloud.voidFractionM().voidFractionInterp(); + #else + voidfraction.internalField() = particleCloud.voidFractionM().voidFractionInterp(); + #endif voidfraction.correctBoundaryConditions(); particleCloud.averagingM().setVectorAverage diff --git a/doc/CFDEMcoupling_Manual.txt b/doc/CFDEMcoupling_Manual.txt index 22108c1..65bbc4a 100644 --- a/doc/CFDEMcoupling_Manual.txt +++ b/doc/CFDEMcoupling_Manual.txt @@ -1,7 +1,7 @@ -"CFDEMproject WWW Site"_lws :c +"CFDEM(R)project WWW Site"_lws :c :line -CFDEMcoupling Documentation :h2,c +CFDEM(R)coupling Documentation :h2,c :line :c,image(Portfolio_CFDEMcoupling.png) :line @@ -13,9 +13,9 @@ CFDEMcoupling Documentation :h2,c 1. Contents :h3 -The CFDEMcoupling documentation is organized into the following sections. If you find any errors or omissions in this manual or have suggestions for useful information to add, please send an email to the developers so the CFDEMcoupling documentation can be improved. +The CFDEM(R)coupling documentation is organized into the following sections. If you find any errors or omissions in this manual or have suggestions for useful information to add, please send an email to the developers so the CFDEM(R)coupling documentation can be improved. -1.1 "About CFDEMcoupling"_#1_1 +1.1 "About CFDEM(R)coupling"_#1_1 1.2 "Installation"_#1_2 1.3 "Tutorials"_#1_3 1.4 "couplingProperties dictionary"_#1_4 @@ -24,9 +24,9 @@ The CFDEMcoupling documentation is organized into the following sections. If you :line -1.1 About CFDEMcoupling :link(1_1),h4 +1.1 About CFDEM(R)coupling :link(1_1),h4 -CFDEM coupling provides an open source parallel coupled CFD-DEM framework combining the strengths of "LIGGGHTS"_lig DEM code and the Open Source CFD package "OpenFOAM(R)(*)"_of. The CFDEMcoupling toolbox allows to expand standard CFD solvers of "OpenFOAM(R)(*)"_of to include a coupling to the DEM code "LIGGGHTS"_lig. In this toolbox the particle representation within the CFD solver is organized by "cloud" classes. Key functionalities are organised in sub-models (e.g. force models, data exchange models, etc.) which can easily be selected and combined by dictionary settings. +CFDEM(R)coupling provides an open source parallel coupled CFD-DEM framework combining the strengths of "LIGGGHTS(R)"_lig DEM code and the Open Source CFD package "OpenFOAM(R)(*)"_of. The CFDEM(R)coupling toolbox allows to expand standard CFD solvers of "OpenFOAM(R)(*)"_of to include a coupling to the DEM code "LIGGGHTS(R)"_lig. In this toolbox the particle representation within the CFD solver is organized by "cloud" classes. Key functionalities are organised in sub-models (e.g. force models, data exchange models, etc.) which can easily be selected and combined by dictionary settings. The coupled solvers run fully parallel on distributed-memory clusters. Features are: @@ -41,18 +41,18 @@ The file structure: {src} directory including the source files of the coupling toolbox and models :ulb,l {applications} directory including the solver files for coupled CFD-DEM simulations :l -{doc} directory including the documentation of CFDEMcoupling :l +{doc} directory including the documentation of CFDEM(R)coupling :l {tutorials} directory including basic tutorial cases showing the functionality :l :ule -Details on installation are given on the "CFDEMproject WWW Site"_lws . +Details on installation are given on the "CFDEM(R)project WWW Site"_lws . The functionality of this CFD-DEM framework is described via "tutorial cases"_#_1_2 showing how to use different solvers and models. -CFDEMcoupling stands for Computational Fluid Dynamics (CFD) -Discrete Element Method (DEM) coupling. +CFDEM(R)coupling stands for Computational Fluid Dynamics (CFD) -Discrete Element Method (DEM) coupling. -CFDEMcoupling is an open-source code, distributed freely under the terms of the GNU Public License (GPL). +CFDEM(R)coupling is an open-source code, distributed freely under the terms of the GNU Public License (GPL). -Core development of CFDEMcoupling is done by Christoph Goniva and Christoph Kloss, both at DCS Computing GmbH, 2012 +Core development of CFDEM(R)coupling is done by Christoph Goniva and Christoph Kloss, both at DCS Computing GmbH, 2012 This documentation was written by Christoph Goniva, DCS Computing GmbH, 2012 @@ -72,7 +72,7 @@ In order to get the latest code version, please use the git repository at http:/ [General:] -Each solver of the CFDEMcoupling comes with at least one tutorial example, showing its functionality and correct usage. Provided that the installation is correct, the tutorials can be run via "Allrun.sh" shell scripts. These scripts perform all necessary steps (preprocessing, run, postprocessing, visualization). +Each solver of the CFDEM(R)coupling comes with at least one tutorial example, showing its functionality and correct usage. Provided that the installation is correct, the tutorials can be run via "Allrun.sh" shell scripts. These scripts perform all necessary steps (preprocessing, run, postprocessing, visualization). [Location:] @@ -90,11 +90,11 @@ Provided that the installation is correct, the tutorials can be run via "Allrun. The main settings of a simulation are done via dictionaries: -The DEM setup of each case is defined by a "LIGGGHTS"_lig input file located in $caseDir/DEM (e.g. in.liggghts_init). For details on the "LIGGGHTS"_lig setup, please have a look at the "LIGGGHTS"_lig manual. +The DEM setup of each case is defined by a "LIGGGHTS(R)"_lig input file located in $caseDir/DEM (e.g. in.liggghts_init). For details on the "LIGGGHTS(R)"_lig setup, please have a look at the "LIGGGHTS(R)"_lig manual. Standard CFD settings are defined in $caseDir/CFD/constant (e.g. transportProperties, RASproperties, etc.) and $caseDir/CFD/system (e.g. fvSchemes, controlDict). You can find more information on that in "OpenFOAM(R)(*)"_of documentations (www.openFoam.com)(*). -Settings of the coupling routines are defined in $caseDir/CFD/constant/"couplingProperies"_#1_3 (e.g. force models, data exchange model, etc.) and $caseDir/CFD/constant/"liggghtsCommands"_#1_3 (allows to execute a LIGGGHTS command during a coupled simulation). +Settings of the coupling routines are defined in $caseDir/CFD/constant/"couplingProperies"_#1_3 (e.g. force models, data exchange model, etc.) and $caseDir/CFD/constant/"liggghtsCommands"_#1_3 (allows to execute a LIGGGHTS(R) command during a coupled simulation). :line @@ -134,7 +134,7 @@ Reasonable example settings for the "couplingProperties" dictionary are given in modelType :pre -"modelType" refers to the formulation of the equations to be solved. Choose "A", "B" or "Bfull", according to Zhou et al. (2010): "Discrete particle simulation of particle-fluid flow: model formulations and their applicability", JFM. "A" requires the use of the force models gradPForce and viscForce, whereas "B" requires the force model "Archimedes". "Bfull" refers to model type I. +"modelType" refers to the formulation of the equations to be solved. Choose "A", "B" or "Bfull", according to Zhou et al. (2010): "Discrete particle simulation of particle-fluid flow: model formulations and their applicability", JFM. "A" requires the use of the force models gradPForce and viscForce, whereas "B" requires the force model "Archimedes". "Bfull" refers to model type I, "A" refers to model type II and "B" refers to type III in the nomenclature used by Zhou et al. couplingInterval :pre @@ -153,7 +153,7 @@ Example: DEMts=0.00001s, couplingInterval=10 exchange data (=couple) will happen [General:] -In the "liggghtsCommands" dictionary liggghts commands being executed during a coupled CFD-DEM simulation are specified. +In the "liggghtsCommands" dictionary LIGGGHTS(R) commands being executed during a coupled CFD-DEM simulation are specified. [Location:] $caseDir/CFD/constant @@ -190,10 +190,14 @@ listing below of styles within certain commands. "averagingModel_dilute"_averagingModel_dilute.html, "cfdemSolverIB"_cfdemSolverIB.html, "cfdemSolverPiso"_cfdemSolverPiso.html, +"cfdemSolverPisoSTM"_cfdemSolverPisoSTM.html, "cfdemSolverPisoScalar"_cfdemSolverPisoScalar.html, "clockModel"_clockModel.html, "clockModel_noClock"_clockModel_noClock.html, "clockModel_standardClock"_clockModel_standardClock.html, +"couple/cfd"_fix_couple_cfd.html, +"couple/cfd/force"_fix_couple_cfd_force.html, +"couple/cfd/force/implicit"_fix_couple_cfd_force_implicit.html, "dataExchangeModel"_dataExchangeModel.html, "dataExchangeModel_noDataExchange"_dataExchangeModel_noDataExchange.html, "dataExchangeModel_oneWayVTK"_dataExchangeModel_oneWayVTK.html, @@ -244,6 +248,7 @@ listing below of styles within certain commands. "regionModel"_regionModel.html, "regionModel_allRegion"_regionModel_allRegion.html, "scalarTransportModel"_scalarTransportModel.html, +"scalarTransportModel_generalManual"_scalarTransportModel_generalManual.html, "smoothingModel"_smoothingModel.html, "smoothingModel_constDiffSmoothing"_smoothingModel_constDiffSmoothing.html, "smoothingModel_noSmoothing"_smoothingModel_noSmoothing.html, diff --git a/doc/Eqs/voidfractionModel_divided_pic1.png b/doc/Eqs/voidfractionModel_divided_pic1.png new file mode 100755 index 0000000..b455f06 Binary files /dev/null and b/doc/Eqs/voidfractionModel_divided_pic1.png differ diff --git a/doc/Eqs/voidfractionModel_divided_pic2.png b/doc/Eqs/voidfractionModel_divided_pic2.png new file mode 100755 index 0000000..9b331fb Binary files /dev/null and b/doc/Eqs/voidfractionModel_divided_pic2.png differ diff --git a/doc/Eqs/voidfractionModel_divided_pic3.png b/doc/Eqs/voidfractionModel_divided_pic3.png new file mode 100755 index 0000000..5430f27 Binary files /dev/null and b/doc/Eqs/voidfractionModel_divided_pic3.png differ diff --git a/doc/Eqs/voidfractionModel_divided_pic4.png b/doc/Eqs/voidfractionModel_divided_pic4.png new file mode 100755 index 0000000..c3520b5 Binary files /dev/null and b/doc/Eqs/voidfractionModel_divided_pic4.png differ diff --git a/doc/Eqs/voidfractionModel_divided_pic5.png b/doc/Eqs/voidfractionModel_divided_pic5.png new file mode 100755 index 0000000..acd4ad8 Binary files /dev/null and b/doc/Eqs/voidfractionModel_divided_pic5.png differ diff --git a/doc/Eqs/voidfractionModel_divided_pic6.png b/doc/Eqs/voidfractionModel_divided_pic6.png new file mode 100755 index 0000000..4c051ab Binary files /dev/null and b/doc/Eqs/voidfractionModel_divided_pic6.png differ diff --git a/doc/_build/doctrees/CFDEMcoupling_Manual.doctree b/doc/_build/doctrees/CFDEMcoupling_Manual.doctree index 8c5a4a4..dedd7db 100644 Binary files a/doc/_build/doctrees/CFDEMcoupling_Manual.doctree and b/doc/_build/doctrees/CFDEMcoupling_Manual.doctree differ diff --git a/doc/_build/doctrees/cfdemSolverPisoSTM.doctree b/doc/_build/doctrees/cfdemSolverPisoSTM.doctree new file mode 100644 index 0000000..44251e3 Binary files /dev/null and b/doc/_build/doctrees/cfdemSolverPisoSTM.doctree differ diff --git a/doc/_build/doctrees/cfdemSolverPisoScalar.doctree b/doc/_build/doctrees/cfdemSolverPisoScalar.doctree index 242a881..3d9f21a 100644 Binary files a/doc/_build/doctrees/cfdemSolverPisoScalar.doctree and b/doc/_build/doctrees/cfdemSolverPisoScalar.doctree differ diff --git a/doc/_build/doctrees/clockModel_standardClock.doctree b/doc/_build/doctrees/clockModel_standardClock.doctree index 08041e1..0d645c6 100644 Binary files a/doc/_build/doctrees/clockModel_standardClock.doctree and b/doc/_build/doctrees/clockModel_standardClock.doctree differ diff --git a/doc/_build/doctrees/dataExchangeModel.doctree b/doc/_build/doctrees/dataExchangeModel.doctree index ac76134..1385151 100644 Binary files a/doc/_build/doctrees/dataExchangeModel.doctree and b/doc/_build/doctrees/dataExchangeModel.doctree differ diff --git a/doc/_build/doctrees/environment.pickle b/doc/_build/doctrees/environment.pickle index eedff1a..8eda42d 100644 Binary files a/doc/_build/doctrees/environment.pickle and b/doc/_build/doctrees/environment.pickle differ diff --git a/doc/_build/doctrees/fix_couple_cfd.doctree b/doc/_build/doctrees/fix_couple_cfd.doctree new file mode 100644 index 0000000..84a0de2 Binary files /dev/null and b/doc/_build/doctrees/fix_couple_cfd.doctree differ diff --git a/doc/_build/doctrees/fix_couple_cfd_force.doctree b/doc/_build/doctrees/fix_couple_cfd_force.doctree new file mode 100644 index 0000000..d5011e1 Binary files /dev/null and b/doc/_build/doctrees/fix_couple_cfd_force.doctree differ diff --git a/doc/_build/doctrees/fix_couple_cfd_force_implicit.doctree b/doc/_build/doctrees/fix_couple_cfd_force_implicit.doctree new file mode 100644 index 0000000..b834fd5 Binary files /dev/null and b/doc/_build/doctrees/fix_couple_cfd_force_implicit.doctree differ diff --git a/doc/_build/doctrees/forceModel_Archimedes.doctree b/doc/_build/doctrees/forceModel_Archimedes.doctree index af9401a..396cc64 100644 Binary files a/doc/_build/doctrees/forceModel_Archimedes.doctree and b/doc/_build/doctrees/forceModel_Archimedes.doctree differ diff --git a/doc/_build/doctrees/forceModel_DiFeliceDrag.doctree b/doc/_build/doctrees/forceModel_DiFeliceDrag.doctree index 96e76ec..81dc5fe 100644 Binary files a/doc/_build/doctrees/forceModel_DiFeliceDrag.doctree and b/doc/_build/doctrees/forceModel_DiFeliceDrag.doctree differ diff --git a/doc/_build/doctrees/forceModel_GidaspowDrag.doctree b/doc/_build/doctrees/forceModel_GidaspowDrag.doctree index 0728f7e..b5c071f 100644 Binary files a/doc/_build/doctrees/forceModel_GidaspowDrag.doctree and b/doc/_build/doctrees/forceModel_GidaspowDrag.doctree differ diff --git a/doc/_build/doctrees/forceModel_ShirgaonkarIB.doctree b/doc/_build/doctrees/forceModel_ShirgaonkarIB.doctree index 0cc2eb2..b052ed7 100644 Binary files a/doc/_build/doctrees/forceModel_ShirgaonkarIB.doctree and b/doc/_build/doctrees/forceModel_ShirgaonkarIB.doctree differ diff --git a/doc/_build/doctrees/forceModel_checkCouplingInterval.doctree b/doc/_build/doctrees/forceModel_checkCouplingInterval.doctree index e4ffeb9..9eb6f6b 100644 Binary files a/doc/_build/doctrees/forceModel_checkCouplingInterval.doctree and b/doc/_build/doctrees/forceModel_checkCouplingInterval.doctree differ diff --git a/doc/_build/doctrees/forceModel_particleCellVolume.doctree b/doc/_build/doctrees/forceModel_particleCellVolume.doctree index 4b7e8b5..96de022 100644 Binary files a/doc/_build/doctrees/forceModel_particleCellVolume.doctree and b/doc/_build/doctrees/forceModel_particleCellVolume.doctree differ diff --git a/doc/_build/doctrees/forceModel_particleVolume.doctree b/doc/_build/doctrees/forceModel_particleVolume.doctree index b72ba76..8b260b4 100644 Binary files a/doc/_build/doctrees/forceModel_particleVolume.doctree and b/doc/_build/doctrees/forceModel_particleVolume.doctree differ diff --git a/doc/_build/doctrees/forceModel_scalarGeneralExchange.doctree b/doc/_build/doctrees/forceModel_scalarGeneralExchange.doctree index e00bb94..4a232b6 100644 Binary files a/doc/_build/doctrees/forceModel_scalarGeneralExchange.doctree and b/doc/_build/doctrees/forceModel_scalarGeneralExchange.doctree differ diff --git a/doc/_build/doctrees/forceModel_virtualMassForce.doctree b/doc/_build/doctrees/forceModel_virtualMassForce.doctree index 04e874a..8f8eac7 100644 Binary files a/doc/_build/doctrees/forceModel_virtualMassForce.doctree and b/doc/_build/doctrees/forceModel_virtualMassForce.doctree differ diff --git a/doc/_build/doctrees/forceModel_viscForce.doctree b/doc/_build/doctrees/forceModel_viscForce.doctree index 5e7bedd..ac8e3fc 100644 Binary files a/doc/_build/doctrees/forceModel_viscForce.doctree and b/doc/_build/doctrees/forceModel_viscForce.doctree differ diff --git a/doc/_build/doctrees/forceSubModel.doctree b/doc/_build/doctrees/forceSubModel.doctree index 5f887e3..82fc612 100644 Binary files a/doc/_build/doctrees/forceSubModel.doctree and b/doc/_build/doctrees/forceSubModel.doctree differ diff --git a/doc/_build/doctrees/forceSubModel_ImEx.doctree b/doc/_build/doctrees/forceSubModel_ImEx.doctree index c6c1f3f..3655146 100644 Binary files a/doc/_build/doctrees/forceSubModel_ImEx.doctree and b/doc/_build/doctrees/forceSubModel_ImEx.doctree differ diff --git a/doc/_build/doctrees/githubAccess_public.doctree b/doc/_build/doctrees/githubAccess_public.doctree index ae79e77..097d151 100644 Binary files a/doc/_build/doctrees/githubAccess_public.doctree and b/doc/_build/doctrees/githubAccess_public.doctree differ diff --git a/doc/_build/doctrees/liggghtsCommandModel_runLiggghts.doctree b/doc/_build/doctrees/liggghtsCommandModel_runLiggghts.doctree index e353c87..f13b416 100644 Binary files a/doc/_build/doctrees/liggghtsCommandModel_runLiggghts.doctree and b/doc/_build/doctrees/liggghtsCommandModel_runLiggghts.doctree differ diff --git a/doc/_build/doctrees/locateModel.doctree b/doc/_build/doctrees/locateModel.doctree index 2cbf730..3807c79 100644 Binary files a/doc/_build/doctrees/locateModel.doctree and b/doc/_build/doctrees/locateModel.doctree differ diff --git a/doc/_build/doctrees/locateModel_standardSearch.doctree b/doc/_build/doctrees/locateModel_standardSearch.doctree index caa51c2..4756074 100644 Binary files a/doc/_build/doctrees/locateModel_standardSearch.doctree and b/doc/_build/doctrees/locateModel_standardSearch.doctree differ diff --git a/doc/_build/doctrees/probeModel_noProbe.doctree b/doc/_build/doctrees/probeModel_noProbe.doctree index 7e1c2ee..37de3ca 100644 Binary files a/doc/_build/doctrees/probeModel_noProbe.doctree and b/doc/_build/doctrees/probeModel_noProbe.doctree differ diff --git a/doc/_build/doctrees/probeModel_particleProbe.doctree b/doc/_build/doctrees/probeModel_particleProbe.doctree index 4d9c03f..f39a46b 100644 Binary files a/doc/_build/doctrees/probeModel_particleProbe.doctree and b/doc/_build/doctrees/probeModel_particleProbe.doctree differ diff --git a/doc/_build/doctrees/scalarTransportModel.doctree b/doc/_build/doctrees/scalarTransportModel.doctree index 80e6a14..8667fe2 100644 Binary files a/doc/_build/doctrees/scalarTransportModel.doctree and b/doc/_build/doctrees/scalarTransportModel.doctree differ diff --git a/doc/_build/doctrees/scalarTransportModel_generalManual.doctree b/doc/_build/doctrees/scalarTransportModel_generalManual.doctree new file mode 100644 index 0000000..9a3c3ed Binary files /dev/null and b/doc/_build/doctrees/scalarTransportModel_generalManual.doctree differ diff --git a/doc/_build/doctrees/voidFractionModel_centreVoidFraction.doctree b/doc/_build/doctrees/voidFractionModel_centreVoidFraction.doctree index 6bfcbe4..4cad64f 100644 Binary files a/doc/_build/doctrees/voidFractionModel_centreVoidFraction.doctree and b/doc/_build/doctrees/voidFractionModel_centreVoidFraction.doctree differ diff --git a/doc/_build/doctrees/voidFractionModel_dividedVoidFraction.doctree b/doc/_build/doctrees/voidFractionModel_dividedVoidFraction.doctree index ca4e7b1..8dfe1c1 100644 Binary files a/doc/_build/doctrees/voidFractionModel_dividedVoidFraction.doctree and b/doc/_build/doctrees/voidFractionModel_dividedVoidFraction.doctree differ diff --git a/doc/_build/html/CFDEMcoupling_Manual.html b/doc/_build/html/CFDEMcoupling_Manual.html index eeafe69..710fa87 100644 --- a/doc/_build/html/CFDEMcoupling_Manual.html +++ b/doc/_build/html/CFDEMcoupling_Manual.html @@ -8,7 +8,7 @@ - CFDEMcoupling Documentation — CFDEMcoupling v3.X documentation + CFDEM(R)coupling Documentation — CFDEMcoupling v3.X documentation @@ -82,9 +82,9 @@
    -
  • CFDEMcoupling Documentation
      +
    • CFDEM(R)coupling Documentation
      • Contents @@ -139,67 +138,20 @@

        scalarTransportModel command

        Syntax

        -

        Defined in scalarTransportProperties dictionary. A variety of derived classes exist that implement different physics of the scalarTransportModel. Here, the most general one, i.e., ‘generalManual’ is discussed. If no scalar transport shall be used, use the model ‘none’.

        -
        -generalManualProps
-{
-    phiFieldName phiName;
-    voidfractionFieldName voidfractionName;
-    ScT scalar1;
-    PrT scalar2;
-    cpVolumetric scalar3;
-    cpVolumetricFieldName word1;
-    rhoMixFieldName word2;
-    eulerianFields
-    (
-        C
-        T
-    );
-
        -
        }
+
        Defined in scalarTransportProperties dictionary. A variety of derived classes exist that implement different physics of the scalarTransportModel. If no scalar transport shall be used, use the model ‘none’.
        
+
        scalarTransportModel model;
 
        
 
        
 
          
-
        • phiName = (optional) name of the surface field for the SUPERFICIAL flux, default “phi”.
          • 
-
        • voidfractionName = (optional) name of the finite volume voidfraction field, default “voidfraction”.
          • 
-
        • scalar1 = (optional, default 0.7) turbulent Schmidt Nr, set to large value to suppress turbulent species transport
          • 
-
        • scalar2 = (optional, default 0.7) turbulent Prandtl Nr, set to large value to suppress turbulent heat transport
          • 
-
        • scalar3 = (optional, alternatively define word1) volumetric heat capacity as a global constant (in contrast to cpVolumetricFieldName for a field). This is the mixture density times the heat capacity J/K/(m_voidspace)^3, will only be used if cpVolumetricFieldName, or updateMixtureProperties = false
          • 
-
        • word1 = (optional, alternatively define scalar3) volumetric heat capacity as a field
          • 
-
        • word3 = mixture density field
          • 
-
        • C = concentration field name
          • 
-
        • T = temperature field name
          • 
+
        • model = name of the scalarTransportModel to be applied
          •

        Examples

        -
        generalManualProps
-{
-    phiFieldName "phi";
-    ScT 0.7;
-    PrT 0.7;
-    cpVolumetric 1196;
-    rhoMixFieldName "rhoMix";
-    eulerianFields
-    (
-        C
-        T
-    );
-
        -
        -
        fvOptionsC
-{
-};
-
        -
        -
        fvOptionsT
-{
-};
-
        -
        -
        }
+
        scalarTransportModel generalManual;
 
        
 
        
+
        Note: This examples list might not be complete - please look for other models (scalarTransportModel_XY) in this documentation.

        Description

        @@ -207,11 +159,9 @@ generalManualProps

        Restrictions

        -

        The user MUST ensure the “phi” field is SUPERFICIAL (i.e., the fluid-phase velocity times voidfraction interpolatedat the cells’ faces). The code cannot know or check whether this is the case, so the user of a certain solver has to ensure this.

        -
        -
        diff --git a/doc/_build/html/scalarTransportModel_generalManual.html b/doc/_build/html/scalarTransportModel_generalManual.html new file mode 100644 index 0000000..d67d09b --- /dev/null +++ b/doc/_build/html/scalarTransportModel_generalManual.html @@ -0,0 +1,278 @@ + + + + + + + + + + + scalarTransportModel_generalManual command — CFDEMcoupling v3.X documentation + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        + + + + +
        + + + + + + +
        +
        + + + + + + +
        +
          +
        • Docs »
          • + +
        • scalarTransportModel_generalManual command
          • +
        • + + + Website + + +
          • +
        +
        + +
        +
        +
        + +
        +

        scalarTransportModel_generalManual command

        +
        +

        Syntax

        +

        Defined in scalarTransportProperties dictionary.

        +

        scalarTransportModel generalManual;

        +
        +generalManualProps
+{
+    phiFieldName phiName;
+    voidfractionFieldName voidfractionName;
+    ScT scalar1;
+    PrT scalar2;
+    cpVolumetric scalar3;
+    cpVolumetricFieldName word1;
+    rhoMixFieldName word2;
+    eulerianFields
+    (
+        C
+        T
+    );
+
        +
        }
+
        +
        +
          +
        • phiName = (optional) name of the surface field for the SUPERFICIAL flux, default “phi”.
          • +
        • voidfractionName = (optional) name of the finite volume voidfraction field, default “voidfraction”.
          • +
        • scalar1 = (optional, default 0.7) turbulent Schmidt Nr, set to large value to suppress turbulent species transport
          • +
        • scalar2 = (optional, default 0.7) turbulent Prandtl Nr, set to large value to suppress turbulent heat transport
          • +
        • scalar3 = (optional, alternatively define word1) volumetric heat capacity as a global constant (in contrast to cpVolumetricFieldName for a field). This is the mixture density times the heat capacity J/K/(m_voidspace)^3, will only be used if cpVolumetricFieldName, or updateMixtureProperties = false
          • +
        • word1 = (optional, alternatively define scalar3) volumetric heat capacity as a field
          • +
        • word3 = mixture density field
          • +
        • C = concentration field name
          • +
        • T = temperature field name
          • +
        +
        +
        +

        Examples

        +
        generalManualProps
+{
+    phiFieldName "phi";
+    ScT 0.7;
+    PrT 0.7;
+    cpVolumetric 1196;
+    rhoMixFieldName "rhoMix";
+    eulerianFields
+    (
+        C
+        T
+    );
+
        +
        +
        fvOptionsC
+{
+};
+
        +
        +
        fvOptionsT
+{
+};
+
        +
        +
        }
+
        +
        +
        +
        +

        Description

        +

        Solves the advection-dispersion transport equation for a dilute scalar quantity in the fluid phase. fvOptions can be specified to model sources, etc. in the fluid phase. Exchange models with a particle phase can be included by including appropriate forceModels in couplingProperties.

        +
        +
        +

        Restrictions

        +

        The user MUST ensure the “phi” field is SUPERFICIAL (i.e., the fluid-phase velocity times voidfraction interpolatedat the cells’ faces). The code cannot know or check whether this is the case, so the user of a certain solver has to ensure this.

        +
        + +
        + + +
        +
        +
        + + +
        + +
        +

        + © Copyright 2016, DCS Computing GmbH, JKU Linz. + +

        +
        + Built with Sphinx using a theme provided by Read the Docs. + +
        + +
        +
        + +
        + +
        + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/_build/html/searchindex.js b/doc/_build/html/searchindex.js index 20fca44..67402ba 100644 --- a/doc/_build/html/searchindex.js +++ b/doc/_build/html/searchindex.js @@ -1 +1 @@ -Search.setIndex({envversion:42,terms:{maxsourc:[37,38],whose:[22,20,50,44,11,15],accur:22,under:13,preprocess:13,digit:74,localpsizediffsmooth:18,everi:[30,39,43,46,75,27,21,13,74,51,66],"void":[36,62,29],govern:62,exacttim:51,clockmodel_xi:28,solid:[62,22,50,38],vector:[72,59,4,73],speci:[38,54],clockmodel:13,direct:[38,39],second:[37,61,38],follow:[17,39,3,34,6,13],liggghtscommandmodel_readliggghtsdata:13,even:[47,51,39],flimit:72,conduct:[41,37,2,38,52],"new":[36,30,39,52,13,51],rhop:66,checkperiodiccel:[47,50],here:[44,54,39],openfoam:[39,20,62,38,11,13],path:[46,31,51,23,39],interpret:4,forum:[13,39],studi:6,cfdem_solver_dir:39,bashrc:39,total:[12,5,62],describ:[13,39],would:[36,13],granvelfieldnam:[6,3,34,64],iomodel:13,recommend:[47,69],type:[17,43,37,38,39,61,3,24,34,29,49,6,13,14],forcemodel_gradpforc:13,relax:66,warn:[65,39,42,66,27,38],postporcessor:4,exce:[62,66],"9000e":10,hold:55,must:[18,38,10,13,32,54],swtich:55,springer:11,mylpp:39,word:[30,51,39],setup:[13,39],work:[1,65,39,66],smoothingmodel:13,root:39,particleprobeprop:74,xeveri:74,overrid:74,trackio:70,give:[13,18,39,10],forcesubmodel_xi:55,indic:[51,39,14],want:39,type1:[17,37,61,3,24,34,38,49,6,14],type3:38,type2:[17,61,3,34,38,6,14],end:[32,51],travel:65,locatemodel_xi:68,iiii:66,fvscheme:13,maxaccnr:66,env:39,verifi:39,perspect:[11,20],updat:[13,39],after:[36,43,39],befor:39,wrong:39,mesh:[12,22,62,65,60],patankar:52,explicitcoupleprop:72,nodragprop:9,law:[6,36,3,34],parallel:[39,20,47,62,11,13,65],averag:[56,20,57,43,3,47,25,10,11,59,73],dilut:[56,3,57,25,10,54],third:[36,13],spout:6,momcouplemodel_nocoupl:13,maintain:39,environ:39,incorpor:62,first:[30,66,27,13,32,51],order:[13,43,36,61,38],oper:[18,10],meiliftprop:61,endors:[11,62,13,20],over:[47,65,10],becaus:[43,18,10],maxcfl:66,heatflux:[37,38],implicitcoupleprop:64,writeliggghtsprop:46,additionallibs30x:39,schmidt:54,easier:43,them:[70,9,39],thei:[12,59],trondheim:62,choic:[55,71],dotdot:[30,51],volumefractionnam:73,each:[61,3,30,9,6,13,51,17,24,14,38,34,39,41,42,52,47,62,55,2,49,74],nodataexchang:[26,45],went:39,side:[6,17,3,55],clockmodel_noclock:13,dataexchangemodel_xi:45,gradient:24,imexsplitfactor:36,mason:[37,38],adapt:39,bigparticleprop:22,linear:[47,61,69],situat:10,omiss:13,standard:[39,43,38,16,12,13,59,73],switch3:[37,2,61,3,24,30,9,38,49,6,14,34],switch2:[37,2,61,3,24,46,5,30,9,38,49,6,12,52,14,34],switch1:[30,3,9,49,6,12,14,24,34,38,32,73,37,69,41,52,46,47,5,29,2,61],switch0:73,switch7:[6,3],switch6:[6,3,34,38],forcemodel_scalargeneralexchang:13,switch4:[49,61,3,24,30,34,6,14],writeprecis:74,rang:[65,29],mkdir:39,pisofoam:[11,20],cfdemtut:13,capac:[37,38,54],instruct:39,alreadi:39,allrun:[13,39],scalartransportmodel:13,advect:54,top:39,sometim:39,startindex:51,cfdemsolverpisostm:38,iomodel_noio:13,tool:[39,4,5,66,12,59,73],locatemodel_standardsearch:13,compof_:39,keyword:[55,75,2,41,61,52,71,73],provid:[35,55,64,71,72,13],particletrackproperti:70,tree:[47,69],project:39,thu:11,fashion:36,ran:43,locatemodel_enginesearchib:13,shell:[13,39],manner:52,meshmotionmodel_xi:60,strength:13,unresolv:62,procboundarycorrect:29,liggghtscommandmodel_writeliggght:13,gaussprop:44,shall:54,object:[31,12,59,73],kloss:[11,62,13,20],phase:[11,62,54],doi:11,doc:[13,39],flow:[10,36,37,61,4,24,38,49,13],doe:[36,37,58,43,4,5,48,76,38,12,73,59,66],dummi:[35,7,58,26,63,53,76],bejan:11,kochhilldrag:6,heattranscoeff:[37,38],prio:51,probe:[48,2,59,49,3,24,34,38,67,6,12,74,73],radii:75,regionmodel:13,speciestransportmodel:38,runlast:30,voidfractioninterpolationtyp:[6,17,3,34,38],stop:[43,42,66],fluid:[49,3,6,9,11,13,14,17,22,24,34,38,36,37,41,42,52,62,54,55,2,61,64,66,74],report:[61,39],toolbox:[62,13],method:[41,47,62,13,52],bad:66,novoidfract:7,shirgaonkarib:[62,52],structur:[47,13,65,69],fail:[50,22,44,39],dirctori:13,loth:61,approach:[62,13,18,29],accord:[50,39,22,44,60,27,29,11,13],cfdem_doc_dir:39,cfdem:[13,39,14,67],rasproperti:13,particleprob:[48,74,67],howev:[36,38,39],com:[13,39],archimedesibprop:41,serialoutput:75,assum:66,partspeciesnam:38,numpi:39,three:29,been:36,accumul:[55,43],velfieldnam:[17,37,61,3,52,34,38,6,64,14],basic:[75,39,43,29,10,13],relnotes_:39,suppress:[2,49,3,24,34,38,6,54],xxx:13,cfdemparticl:[25,56,39],gidaspow:3,partheatfluidnam:[37,38],lift:[41,61,2],gnu:13,properti:[19,42,23,8,38,11,31,13,74],calcul:[49,3,6,9,10,11,12,14,15,17,20,22,24,25,34,38,73,37,29,41,42,43,44,52,62,50,55,56,2,61,5,64,66],dataexchang:66,stairstep:22,conf:62,sever:[47,66,9],maxcellsperparticl:[22,50,44],perform:[48,10,3,9,49,6,13,14,17,39,23,24,25,34,29,31,36,19,41,42,45,57,52,56,2,61,26,67,74],suggest:13,make:39,additionallib:39,split:14,complet:[0,55,36,1,42,28,45,57,48,8,68,67,60,18,74,33],vizclock:43,schiller:17,jku:[50,62,22,28],josef:28,liggghtscommandmodel_execut:13,kept:51,bewar:39,momcouplemodel_explicitcoupl:13,forcemodel_fieldstor:13,contact:39,thi:[0,48,4,1,8,10,11,12,18,65,13,20,22,25,28,38,33,73,36,37,29,39,40,41,42,43,45,47,62,50,52,54,55,56,57,59,60,61,5,66,67,74,68],cellid:[47,68,69,16],protocol:39,just:[62,66,39],wm_project_vers:39,newton:36,yet:65,previous:[9,23],propuls:52,debug:[55,73,74,29,10],save:[46,74,39],applic:[13,62,49,39,24],liggghtscommandmodel:[31,13],ibprop:50,runliggght:[46,32,1,27],measur:[43,76],specif:[13,37,74,38],manual:[13,74],uselimason:38,forcemodel_difelicedrag:13,nield:11,maciv:52,www:[13,39],interv:[55,30,74,66,27,13,32,51],maxim:[62,37,38],smoothinglength:10,txt:[43,39],fpic:39,condit:[62,18,4,10],twowaympiprop:31,core:13,forcemodel_viscforc:13,repositori:[13,39],post:23,voidfracfieldnamesnext:29,surround:62,simul:[0,30,3,12,13,51,39,23,24,38,31,32,73,36,75,19,41,42,43,52,5,59,49,66,74,21],libvtk5:39,difelicedrag:[42,34],done:[36,13,39],coars:[55,42],commit:39,produc:[11,43,13,62,20],scaleupvol:50,bound:[43,66,10],latter:75,volaverage_field:73,storag:74,liggghtscommandmodel_setdemgrav:13,standardclock:[43,28],git:[13,39],casedir:[46,43,13],support:39,centreprop:15,width:19,regionmodel_allregion:13,call:[43,13,27,38],head:39,offer:[11,62,13,20],forc:[48,10,3,71,9,49,6,18,14,17,13,24,34,38,36,37,41,42,52,62,55,2,61,67,72,74,21],heat:[11,37,38,54],"true":[49,3,71,9,6,12,51,24,27,14,69,73,36,37,38,39,41,47,5,34,55,2,61,66],expforc:36,reset:29,myprobemodelprop:67,maximum:[22,19,43,44,50,66,23],dataexchangemodel_onewayvtk:13,vortic:61,featur:[43,13,74,39,67],forcemodel_shirgaonkarib:13,exist:54,arraypo:43,check:[48,39,47,66,67,74,54],when:[55,36,50,65,39,22,44,47,25,29],test:[18,39,10],noclock:76,intend:43,consid:[55,36,65,50,47,12,73],stoke:[11,36,66,62,20],bigparticl:[22,44],longer:[0,40],treatvoidcellsasexplicitforc:36,phifieldnam:[54,14],turbul:[11,37,54,20,38],geometr:[47,69],maxnumberofparticl:[19,23],time:[30,10,12,18,51,13,28,23,27,29,32,73,36,75,19,43,5,54,55,59,62,66,74,21,76],backward:39,particlerelaxationtim:66,global:54,signific:74,computation:25,usesecondorderterm:61,alphamin:[22,65,50,44,29,15],depend:[55,62,13,71,29],speciesctranscoeff:38,readabl:39,sourc:[35,37,39,20,64,62,9,11,72,13,54],string:43,fvoptionsc:54,exact:62,drag:[17,36,55,3,52,34,6],forcemodel_xi:42,div:49,git_ssl_no_verifi:39,dir:70,upper:[12,73,10],lvtkio:39,sign:39,useaddedmass:[49,24],port:39,suppressprob:[2,49,3,24,34,38,6,74],couplinginterv:[30,13,51],current:[0,55,48,39,40,67,74,73],deriv:54,gener:[39,54,38,70,13,68],coeffici:[24,37,55,38,49],disclaim:38,modif:47,lengthscal:10,viscforceprop:49,treatforceexplicit:[55,49,41,61,3,24,9,6,52,14,34],prefer:39,volumetr:[41,54,2],should:[25,66,51,39,10],useparcelsizedependentfiltereddrag:55,memori:13,cfdemcompcfdemal:39,value2:[47,38],value1:[47,38],criteria:66,myforcemodel3:[48,74],myforcemodel2:[48,74],myforcemodel1:[48,74],checkout:39,setdemgrav:32,generalcorrelationparamet:38,finit:[17,37,20,2,41,11,61,3,4,24,47,52,64,54,38,49,6,73,59,14,34],visual:[43,13],endtim:[32,51],examin:28,noio:63,effort:39,graphic:43,prepar:39,pfieldnam:24,onewayvtk:[66,23,45],can:[55,43,19,39,2,42,49,3,23,24,11,66,71,34,38,6,31,12,13,59,73],onewayvtkprop:23,twodimension:[41,2,52],purpos:62,runfirst:[30,32,51],agent:39,ssl3_get_server_certif:39,occur:74,alwai:[55,10],multipl:6,write:[75,39,46,30,8,70,21],criterion:66,pure:[55,13],map:[57,25,56,10],clone:39,mai:[55,42,43,8,39],data:[55,26,37,56,19,39,43,23,45,57,25,75,8,21,38,31,27,13,74,51],explicit:[55,36,72,21,10],virtualmassforceprop:14,inform:[62,43,13,38,39],"switch":[30,3,9,49,6,12,14,24,27,34,69,32,73,36,37,38,41,52,46,5,55,2,61,66,74],combin:[55,13,3],liggghts_init:[31,13],approx:22,approv:[11,62,13,20],includeposit:74,voidfractionmodel_bigparticlevoidfract:13,still:39,dynam:[62,13],conjunct:[18,10],how:[13,39],vtk:[19,70,23,39],norwai:62,main:[13,74,28],particleidstosampl:74,non:39,initi:[43,18,62,10],partheattranscoeffnam:[37,38],voidfractionmodel_novoidfractionvoidfract:13,now:[55,39],discuss:54,enabl:[13,48,74,39],term:[35,55,61,64,9,72,13],name:[0,1,2,3,4,60,8,49,6,12,18,14,17,28,24,34,38,33,73,36,37,29,41,42,43,45,46,47,52,54,55,57,61,64,66,59,68],forcemodel:13,separ:13,implforcedem:[6,17,3,34,55],dataexchangemodel_twowaympi:13,pizza:39,compil:39,domain:[22,44,62,27,29,33,15],beetstra:55,replac:39,individu:38,continu:39,scienc:38,forcemodel_kochhilldrag:13,happen:13,setdemgravityprops1:32,setdemgravityprops0:32,forcesubmodel:[37,2,41,42,61,3,24,52,9,38,49,6,13,14,34],correcl:38,cellpointfac:[17,49,61,3,24,34,38,6,14],lagrangian:[55,75,39,57,25,56,10],correct:[30,39,3,62,29,13,51],accordingli:[74,39],particlecellvolumeprop:12,schillernaumanndragprop:17,usefiltereddragmodel:55,chemengsci:[6,3],base:[0,1,3,6,60,8,49,11,18,17,20,28,23,24,34,38,33,36,37,29,61,66,21,70,68],wai:[36,38],motion:[55,62,60],place:[43,18,62,10],lambda:[37,38],origin:[12,59,73],onc:[43,39],arrai:43,fast:52,open:[11,62,13,20,39],angular:62,size:[55,65,43,23,62,66,29],avail:[55,39],given:[47,66,69,16,12,13],bool1:[17,66,51,38],bool3:51,bool2:[17,51],lognam:39,nosmooth:58,m_voidspac:54,"1500e":10,githubaccess:13,dataexchangemodel_twowayfil:13,fraction:[62,64,29,73],eulerianfield:54,especi:[41,47,36,4],copi:39,specifi:[18,38,39,59,61,27,29,10,13,74,54],github:[13,39],mostli:73,than:[43,22,44,66,50,10,12,13,73],iomodel_sophio:13,speciesflux:38,sophio:[70,21],were:[62,9,39],posit:[43,75,29,61,47,62,38,69,16,74,68],seri:[19,23],pre:27,dorgan:61,ani:[13,42,48],prt:54,nodemforc:9,cfdemproject_gitcfdem:39,engin:[68,47,69,38],techniqu:31,note:[0,55,36,1,40,39,42,28,68,45,57,48,8,51,38,67,60,18,74,33],satellit:[47,29],take:[55,62,39],probem:74,sure:39,normal:[17,37,38,24,47,30,34,29,6,32],track:[70,74],dataexchangemodel_nodataexchang:13,beta:18,implicitcoupl:[36,64],cfdemcompcfdem:39,later:39,quantiti:[36,61,74,54],fsmooth:[18,10],runtim:51,probemodel_particleprob:13,regionmodel_xi:0,viscou:[49,52],viscos:55,show:13,forcemodel_archimedesib:13,permiss:39,threshold:[12,73],onli:[1,3,75,49,6,12,51,50,25,34,38,30,32,73,35,36,37,65,19,41,52,46,47,54,55,61,64,67,72,74],ratio:66,therefror:71,activ:[55,48,61,52,38,67,74],written:[75,19,42,28,46,12,13,59,21,73],allregion:[0,40],locatemodel_enginesearch:13,variou:67,get:[55,13,39],secondari:74,ssl:39,cannot:[4,54],ssh:39,trade:[11,62,13,20],requir:[13,38,29],averagingmodel_dilut:13,cfdemsolverpiso:[62,13],gradpforceprop:24,email:13,scalarfield:[12,59,4,73],where:[26,30,56,41,59,43,62,52,46,25,66,27,12,74,73],speciescfluid:38,fieldstoreprop:4,concern:39,review:38,behind:39,ibvoidfract:62,between:[36,50,19,43,23,45,62,26,38,31,13,14],"import":[47,36,74],paramet:[29,22,44,65,38,13,15],comp:52,screen:[55,12,61,5],interpolatedat:54,scaledrag:[6,3,34],come:13,jfm:[13,49,34,24],region:[0,50,29,22,44,40],parttempnam:[37,38],improv:13,kerbl:28,acceler:66,pow:[37,38],period:[47,50],explicitcoupl:72,goniva:[11,62,13,20],cfdemsystest:39,mark:[11,62,13,50,20],cfdemsolverib:13,workshop:[11,20],fieldstor:4,addit:[11,72,74,20,39],restartcfdem:46,resolut:18,usegeneralcorrel:38,hashtag:39,those:[43,22,50,44,73],"case":[43,36,18,39,61,62,56,25,75,10,13,54],readliggghtsdataprops0:51,commithashtag:39,voidfractionmodel_centrevoidfract:13,forcemodel_checkcouplinginterv:13,keepcfdforc:9,cluster:[62,13],uncom:39,locatemodel:13,lengthscalereffield:10,develop:[13,3,19],alphabet:13,upperthreshold:[12,73],same:[38,39,73],bfull:13,generalmanualprop:54,finish:43,minalphap:64,treesearch:[47,69],mani:[46,74],controldict:13,appropri:[54,29],cpvolumetricfieldnam:54,choos:[30,46,13,66],nomeshmot:[60,53],dimension:[41,2,52],ddtuinterpolationtyp:14,execut:[1,39,42,66,9,31,13],touch:29,blow:[50,22,44,29],hint:39,clockdata:43,except:[27,39],treatment:[36,30,51],versa:29,momentum:[35,36,20,64,38,11,72],around:39,read:[51,71,19,38,10],regim:[25,56],temperatur:[37,38,54],grid:[55,18],usind:65,integ:[43,74],either:[62,22,39],output:[55,43,75,38,2,59,49,3,24,5,34,29,10,6,12,74,73],scalartransportproperti:[38,54],ligght:38,ascend:43,gravityfieldnam:[41,2],ddt:14,readliggghtsdata:51,treatexplicit:[55,71],refer:[36,13,62,52,10],nusselt:38,broken:66,starttim:[32,43,5,12,74,59,51,73],fulli:[13,52],treatforcedem:[2,55,49,14,24],src:[13,74,38,39],coupl:[0,55,36,13,20,39,40,30,62,1,27,38,10,11,31,18,42,51,66],voidfractionnext:41,scalargeneralexchangeprop:38,agglomer:[22,44,29,15],stand:13,"3d8da0e960c717ff582f1517a27724144f086b83":39,act:[17,49,2,41,42,61,3,24,9,6,52,74,14,34],industri:62,mean:[36,7],processor:[47,75,19,29],routin:[43,13,39],effici:[25,62],paraview:[4,39],your:[43,4,39],parscal:38,log:[71,42,74],overwrit:46,start:[74,43,47,5,12,32,59,51,73],cfdem_liggghts_makefile_nam:39,divtauinterpolationtyp:49,diffus:38,vectorfield:[59,4,73],momcouplemodel_implicitcoupl:13,cfdemsolverpimpleimex:38,possibl:13,"default":[0,48,2,3,1,8,9,10,6,12,18,14,17,28,24,34,29,33,73,36,37,38,41,42,67,45,46,47,5,49,50,51,52,54,55,57,60,61,64,66,68,69,71,72,74,75],creat:[50,39],certain:[0,13,54,29],nocoupl:35,felic:34,file:[75,19,39,71,42,43,5,23,64,46,62,8,70,31,12,13,74,51],cgwarnonli:42,fill:10,smoothingmodel_constdiffsmooth:13,field:[49,3,4,10,6,12,18,14,17,22,24,34,38,33,73,36,37,29,41,42,44,52,47,62,50,54,55,2,59,61,64,66,70,72,74],zerogradi:[18,10],valid:14,you:[43,13,74,4,39],symbol:[30,51],averagingmodel_xi:57,particlevolum:5,directori:[75,18,39,43,23,46,10,13,74],goe:[37,38],mass:[49,38,14,24],represent:[50,65,22,44,29,13],all:[36,39,42,50,47,62,29,10,13,74,73],consider:55,rhomixfieldnam:54,voidfractionfieldnam:[17,37,41,3,64,34,38,6,54],scalar:[37,4,47,54,38,10,11,59,14,73],correl:[6,17,3,34,38],sct:54,veloctii:36,writelast:46,articl:39,cfdtool:39,laeuscalartempprop:37,parcel:[55,18],fals:[49,3,9,10,6,12,51,50,24,14,38,73,37,69,42,52,47,5,29,34,54,55,2,61],urel:14,mpi:[31,13,1,66],util:[70,39],mechan:61,failur:39,veri:[16,65],modeltyp:13,unalt:[50,22,44,29],cfdemuseonli:29,list:[0,55,36,37,18,74,42,28,45,57,48,8,68,38,67,60,13,1,33],adjust:[22,44,29,15],small:[13,18,39,64],cfdem_add_libs_dir:39,zero:[22,9],pressur:[62,52,24],design:[47,62,50,38,55],pass:[55,13],further:[47,12,39],forcemodel_virtualmassforc:13,gunn:38,sub:[55,37,38,2,41,22,3,61,50,52,71,9,29,49,6,24,13,14,34],liggghtspath:31,section:[13,39],delet:[74,9],version:[0,55,13,40,39],convectiveheatflux:[37,38],"public":[13,39],contrast:54,movement:62,modular:13,free:39,tinterpolationtyp:37,modifi:39,valu:[17,37,55,64,50,3,24,66,71,54,38,10,6,12,73,14,34],search:[22,50,44,47,69,68],xstep:74,writenam:46,versioninfo:39,speciescflux:38,magnitud:[12,73],myforcemod:74,diamet:[37,38,22,3,44,50,62,34,29,6,18],via:[48,19,42,67,10,31,72,13,74,33],cfdem_add_lib_path:39,timestep:[13,51,23],transit:[50,65],filenam:[19,23],minallowedvcellbyvparcel:66,writetim:[12,59,73],select:[0,42,46,9,13,32],laeuscalartemp:37,tackl:62,two:[19,2,41,52,38,13],formul:[17,49,3,24,52,6,13],more:[36,22,43,44,50,13],desir:[43,39],forcemodel_archimed:13,nrdemstep:27,flag:[17,37,38,39,42,50,3,24,47,66,34,29,10,6,51],known:[47,56,69],none:[0,7,58,3,4,48,8,9,49,6,12,18,1,15,17,22,23,24,26,28,29,30,31,32,33,34,36,75,69,40,42,43,44,45,46,57,5,50,16,54,55,2,59,60,61,63,21,67,70,71,53,74,68,76],dev:39,remain:[50,22,44,29],dem:[30,3,6,1,9,49,11,51,13,14,17,19,20,23,24,26,34,38,31,33,36,37,39,41,42,45,46,62,52,55,2,60,61,66,74],sphere:[47,62],minimum:[22,65,50,44,64,66,29,15],dmolecular:38,switch5:[6,49,3,34,38],forcemodel_particlevolum:13,divid:[13,29],rather:[25,56],anoth:[47,65],couplingproperi:13,number4:[22,44],number2:[50,22,44,29,10,12,15],number3:[50,12,22,44,29],number1:[50,65,22,44,29,10,12,15],phinam:54,momcouplemodel_xi:36,trilinear:65,stash:39,caus:27,media:11,help:39,myprobemodel:67,metallurg:62,treatdem:[55,71],dataexchangemodel:[62,13],thermal:[37,38],through:39,hollowaydrag:74,fieldtimeaverageprop:59,style:13,fvoptionst:54,pimpleimex:[18,10],timeevalful:43,usevolumefract:73,might:[0,55,36,1,39,42,28,45,57,48,8,68,67,13,27,18,74,33,60],turbulencemodeltyp:13,timestamp:[46,30],framework:[11,62,13,20],detach:39,archimedesprop:2,bigger:[13,22,50,44],troubleshoot:39,convect:[11,37,38],easili:13,found:13,weight:[73,22,44,29,15],procedur:[13,39],runeverycouplingstep:[30,51],oil:62,expect:66,upperlimit:10,safeti:43,execute_1:30,execute_0:30,difelicedragprop:34,hill:6,print:74,naumann:17,advanc:39,reason:[13,39,66],voidfractionnam:54,put:43,forcemodel_schillernaumanndrag:13,kochhilldragprop:6,smoothingmodel_nosmooth:13,veloc:[49,3,75,10,6,14,17,24,25,34,38,36,37,52,57,62,54,55,56,61,64,66],omit:43,success:13,cfdem_ut_dir:[43,39],feel:39,exchang:[35,36,18,19,20,23,45,26,64,38,10,11,31,72,13,54],number:[55,43,30,19,39,22,23,64,50,47,66,44,38,10,74,51],cadd:14,stabl:36,gpl:13,superpos:[42,72],differ:[39,2,41,47,62,71,69,13,54],script:[43,13,39],interact:[17,49,2,41,42,61,3,24,9,6,52,74,14,34],least:[13,39],statement:43,smoothen:18,molecular:38,cfd:[1,30,9,11,12,13,15,19,20,22,23,25,27,29,31,32,33,35,36,75,38,39,40,41,43,44,45,46,47,62,50,16,52,55,56,60,64,65,26,21,69,72,74,68],evinc:13,option:[49,3,71,9,10,6,12,14,15,17,22,24,27,34,38,73,37,29,39,41,44,52,46,47,5,50,54,55,2,61,66,69,59],verbosetofil:74,part:[28,39,22,47,38,13],preno:27,timeinterv:[66,32,51],mclaughlin:61,grep:74,noblank:30,remov:39,store:[46,43,4,23],meshmot:53,toward:62,gidaspowdragprop:3,comput:[37,39,52,47,62,38,13],gedit:39,packag:[13,39],fluidscalarfield:38,self:52,violat:42,also:[39,9,29],cfdemtesttut:39,cellpoint:[17,37,61,3,34,38,6],ergun:3,distribut:[47,13,65,44],lowerthreshold:[12,73],writetofil:[12,5,73],implforcedemaccumul:[6,55],previou:[62,29],reach:13,mixtur:54,beetstradrag:74,most:[42,74,54,39],rho:42,cover:[13,62,22,50,44],liggghtscommandmodel_runliggght:13,clean:65,lvtkfilter:39,particlecellvolum:12,engineib:[47,29],find:[68,47,13,69,39],access:39,firewal:39,particlevolumeprop:5,factor:3,cfdemsolverpisoscalar:13,voidfractionmodel:13,ubuntuvtk_fp:39,model_i:[55,42,1],express:61,cfdem_add_libs_nam:39,model_x:[55,42,1],cfdem_project_dir:[13,39],restart:46,ofvers:39,volweightedaverag:73,relativepath:23,certif:39,set:[55,36,30,38,39,42,22,44,50,47,62,66,27,9,29,69,71,72,13,32,54],dump:[27,39],transportproperti:13,see:[37,20,39,2,41,61,3,24,11,67,9,38,49,6,71,52,74,14,34],iomodel_trackio:13,close:13,analog:12,piso:[11,20],someth:39,voidfractionmodel_gaussvoidfract:13,smallest:66,altern:[46,42,54,39,38],concentr:54,numer:[6,38],solv:[36,20,62,11,13,54],cfdem_src_dir:39,both:[13,39],voidfract:[50,3,4,7,10,6,18,65,17,22,34,38,15,33,73,37,29,41,44,54,64,59,21],last:[46,47,30,9,69],immers:[41,47,62,52,35],tempor:[47,59,73],whole:[62,40],point:[47,29],warnonli:66,pneumat:[37,38],trilinearprop:65,due:66,timeaverage_scalarfield:59,implicit:[17,36,3,64,38,10,6,18,21],imag:[47,50],demand:[55,71],spliturelcalcul:14,look:[0,55,36,1,18,39,42,28,45,57,60,8,68,13,33],twowayfilesprop:19,straight:16,erron:27,"while":[62,39],abov:[30,3,39],error:[13,18,39,10],loos:13,loop:43,pack:51,readi:42,centr:[55,22,65,50,44,47,33,15],readm:39,octav:13,minim:[47,50],executeprops0:30,executeprops1:30,conflict:36,updatemixtureproperti:54,wherea:[36,13],pressurefieldnam:52,forcesubmodel_imex:13,user:[55,13,54,66],koch:6,robust:16,implement:[36,62,29,67,11,13,74,54],lower:[12,73,10],particul:3,older:39,runeverywritestep:30,enginesearch:69,cfdem_lpp_dir:39,vorticityinterpolationtyp:61,partspeciesfluxnam:38,tempfieldnam:[37,38],theoret:3,voidfracfieldnamesprev:29,input:[31,13],euler:10,format:39,impldem:[55,71],fedora_fp:39,lost:39,semi:55,resolv:[41,52],flux:[37,54,14,38],pirker:[11,62,20],engineibprop:47,some:[47,13,71,69,39],sampl:74,poros:[22,44,29,15],scale:[37,38,22,3,44,5,34,29,10,6,13,15],id2:74,id3:74,per:[22,74,61],id1:74,mathemat:52,larg:[13,54],slash:[30,51],xprecis:74,proc:[11,62,75,20],liggghtscommmand:[30,46,1,27,32,51],clockmodel_standardclock:13,run:[43,1,19,39,28,46,30,27,38,31,13,32,51,76],particleid:74,stem:[41,2],forcemodel_volweightedaverag:13,step:[55,30,19,39,74,43,23,46,62,66,27,29,13,32,51],voidfractionmodel_ibvoidfract:13,writeliggght:1,impos:36,folder_of_new_additionallibs_fil:39,cfdemproject:[13,39],block:39,within:[55,1,39,22,62,13,73],ensur:[47,54],chang:[36,39,43,66,27,10],artifici:[50,22,44,29],occupi:[22,44,29,15],lowerlimit:10,question:39,"long":39,custom:39,includ:[35,39,64,40,72,13,74,54],suit:[41,52],forward:16,properli:39,gauss:44,newer:39,atom:38,line:[30,51,39],info:74,zhu:3,archimedesib:[41,62],lvtkcommon:39,constant:[50,22,44,62,29,70,13,54],repres:[37,41,52,47,62,38,12,33],incomplet:[55,42,8],lpp:39,sequenti:[42,19],forcemodel_fieldtimeaverag:13,printeveri:74,librari:39,tech:[37,38],smoothingmodel_xi:18,meaning:36,cfdemsolverscalar:37,cfdem_tut_dir:39,algorithm:[20,28,52,47,62,69,10,11,16],vice:29,depth:52,uinterpolationtyp:[17,61,3,34,38,6,14],code:[43,39,20,28,23,45,19,62,26,50,38,11,31,13,54],gran_pizza_17aug10:39,cfdem_project_user_dir:39,fieldtimeaverag:59,superfici:54,forcemodel_laeuscalartemp:13,forcemodel_gidaspowdrag:13,send:13,granular:[37,64,11,25,56,34,38,6],aris:39,shirgaonkaribprop:52,deactiv:74,account:[55,49,20,22,44,24,29,11,15],volum:[49,3,4,6,11,12,14,15,17,20,22,24,34,38,33,73,37,29,41,44,52,47,5,50,54,2,61,64,65,66,59],stackoverflow:39,implicitli:[55,36],relev:[36,13,18,39],tri:61,cpvolumetr:54,"try":39,pleas:[0,55,36,1,39,42,28,45,57,48,8,68,67,13,18,74,33,60],cfl:66,smaller:[13,66],prandtl:54,"g\u00f6teborg":[11,20],gmbh:13,investig:[37,38],download:39,compat:39,index:51,compar:18,cell:[55,36,50,69,22,3,62,44,56,65,47,25,66,68,29,10,16,12,73,54,15],experiment:6,github_:39,bodi:[62,22],checkcouplinginterv:66,ubuntu:39,becom:66,sinc:43,convert:39,larger:[66,10],cert:39,typic:[36,66],particletrack:70,appli:[0,55,36,1,20,42,28,68,45,57,25,56,8,9,11,71,18,74,33,60],forcemodel_meilift:13,apt:39,cloud:[25,13,56],from:[55,19,39,2,41,62,23,47,25,29,31,65],commun:[55,9],doubl:43,particl:[48,2,3,4,6,75,8,9,10,11,12,18,14,15,17,13,20,22,23,24,25,27,34,29,31,33,73,36,37,38,19,41,42,44,52,47,5,49,50,54,55,56,57,59,61,64,65,66,67,70,74,68],next:29,doubt:3,usr:39,postprocess:[39,5,66,12,13,59,73],name_:46,casepath:75,sampleal:74,"transient":[37,38],iii:66,smoothinglengthreferencefield:10,alia:[43,39],alic:[62,22,50],tau:49,process:[36,43,62],sudo:39,gidaspowdrag:3,serial:75,virtualmassforc:14,surfac:[47,50,54],filepath:51,probemodel_noprob:13,instead:[47,39],switchingvoidfract:3,voidfractionmodel_dividedvoidfract:13,forcemodel_nodrag:13,attent:[18,10],physic:[7,54,52],correspond:[38,47,69,16,74,68],element:13,allow:[65,67,62,66,38,29,13],velocityfieldnam:[66,49,24],move:47,fluidscalarfieldinterpolationtyp:38,chosen:42,liggghtscommandmodel_xi:1,cfdem_add_lib:39,fluidiz:6,therefor:[66,39],engineprop:69,greater:[12,73],cfdem_vers:39,handl:[55,74],auto:38,probemodel:13,scalargeneralexchang:38,shirgaonkar:52,disregard:62,our:39,scalarviscos:[55,37,61,3,34,38,49,6],special:[62,30,50,51],out:[43,10],variabl:[36,43,9,39],speciesconvect:38,influenc:[37,38,22,4,44,5,66,50,29,12,59,73],scalarfieldnam:[59,4,73],suitabl:38,rel:[46,23],wich:39,communi:55,cfdemcomplig:39,constdiffsmooth:[18,10],archimed:[42,13,2],insid:[56,22,44,25,50,15],manipul:[60,39],heatfluid:[37,38],releas:39,afterward:43,speciesc:38,unwant:74,keep:[50,22,74,44,29],averagingmodel:13,length:[38,10],organis:13,navier:[11,36,62,20],gradpforc:[42,13,74,24],softwar:[11,62,13,20],downof_:39,christoph:13,qualiti:66,date:51,"1e3":72,"1e2":72,"1e4":72,owner:[11,62,13,20],publickei:39,licens:13,wierink:62,system:[11,13,3,39],viscforc:[13,42,49,74],termin:[42,74,39],meshmotionmodel:13,"var":39,bed:6,meshmotionmodel_nomeshmot:13,result:[22,39,66],caclul:9,hager:[11,62,22,50,20],have:[55,39,43,57,29,13,73],need:[30,39,42,43,66,70,13,51],probedebug:74,min:66,discret:[20,49,3,24,11,13],which:[48,58,3,4,9,10,13,22,27,29,36,60,39,43,44,62,50,70,72,74,68,76],deenet:38,graviti:[41,32,2],singl:25,forcemodel_particlecellvolum:13,"1e10":[72,10],xysplit:47,"class":[0,43,36,1,18,28,68,60,8,33,13,54],iomodel_basicio:13,dens:[57,25,56,36,38],face:[54,39],deni:39,determin:13,gain:62,cfdem_pizza_dir:39,vtk_out:[19,23],text:74,verbos:[55,37,38,2,74,61,3,52,46,5,30,27,34,29,10,6,12,32,51,73],word1:[66,54,73],word3:54,word2:54,locat:[39,43,47,62,69,16,13,68],vectorfieldnam:[59,4,73],dispers:54,suppos:[22,65,50,44,25,56,29],ksl:[18,10],local:[18,39,64],contribut:[62,22,50],pull:39,increas:[50,51,22,44,29],enginesearchib:[47,62],organ:13,checkcouplingintervalprop:66,integr:9,contain:[62,43],grad:[49,24],runliggghtsprop:27,statu:39,correctli:[4,39],boundari:[35,41,4,52,47,62,29,10,18],state:39,chemic:38,cfdem_bashrc:39,partheatfluxnam:[37,38],generalmanu:[38,54],predefin:[38,39],kei:[13,39],zsplit:47,fvoption:54,equal:[43,13,65,10],etc:[62,13,54,39],admit:39,instanc:30,grain:42,equat:[55,36,37,20,62,11,13,54],freeli:13,meilift:[61,74],comment:39,partspeciestranscoeffnam:38,scalar3:[37,3,66,34,6,51,32,54],scalar2:[37,19,49,3,5,66,34,6,51,32,54,73],scalar1:[37,19,61,3,5,24,52,66,54,49,6,51,73,32,14,34],testtutori:39,scalar7:38,scalar6:[66,38],scalar5:[37,3,38,66],scalar4:[37,3,51,66],respect:[55,43,39,50,62,28],addition:[70,72,30,21,39],treat:36,trajectori:[11,20],partial:[62,50],neighbour:65,write_restart:[46,30],present:[62,39,10],deen:38,multi:62,nodrag:9,couplingfilenam:[19,23],defin:[0,7,2,3,4,1,8,9,10,6,12,18,14,15,16,17,13,19,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,5,49,50,51,52,53,54,55,56,57,58,60,61,63,64,65,66,68,69,70,71,72,73,59,75,76],version2x:39,layer:47,volweightedaverageprop:73,impforc:36,site:13,demt:[13,19,23],archiv:22,"7_2":11,parti:13,python:[43,39],phi:[3,54,14],http:[13,39],dividedprop:29,cubic:65,effect:55,phy:52,eulerian:[57,25,56,38,55],expand:13,off:[48,58,3,30,8,6,18,51,17,24,34,38,32,35,37,29,46,55,63,67,74,76],nevertheless:39,well:[11,74,10],exampl:13,command:13,averagingmodel_dens:13,interpol:[17,37,38,55,61,3,24,34,29,49,6,14,65],dsphere:[5,22,44,29,15],latest:[13,39],distanc:[47,50],opencfd:[11,62,13,20],less:36,obtain:36,tcp:39,cellvolum:12,makefil:39,wen:3,add:[13,74,39],densiti:[41,42,66,54,2],imex:[55,71],realiz:[62,38],know:54,"2nd":38,recurs:[47,69],iomodel_xi:8,twowayfil:[19,45],like:43,cshrc:39,constdiffsmoothingprop:10,gradpinterpolationtyp:24,necessari:[22,39,43,52,70,13],porou:11,schillernaumanndrag:17,momcouplemodel:13,liggght:[30,39,20,46,62,27,51,38,11,13,32,14],"export":39,home:39,transport:[11,55,37,38,54],cfdem_liggghts_src_dir:39,vparticl:[49,22,44,24,50,29,15],restart_:30,avoid:[36,74],estim:66,setsourcefield:72,journal:[61,52],usag:[55,43,13],voidfractionmodel_trilinearvoidfract:13,disabl:67,own:[66,39],automat:[30,27,39],partspeciesfluidnam:38,van:6,transfer:[11,37,38],demtim:66,biggest:66,"function":[39,20,11,12,13,59,72,73],twowaympi:[31,45],gaussian:44,basicio:[75,21],matplot:43,temp:[37,38],displac:[11,20],whether:54,smooth:[36,50,65,58,10,18],troubl:[27,39],below:[13,48,74,39,67],limit:[37,38,20,22,44,65,62,50,29,10,11,72,13,15],umaxexpect:66,otherwis:[74,13,18,39,10],problem:[36,13,62,39],evalu:[25,43,76],"int":[62,43],dure:[30,74,46,27,13,32,51],voidfractionmodel_xi:33,courant:66,detail:[37,39,2,41,61,3,24,52,9,38,49,6,13,74,14,34],virtual:14,other:[0,55,36,1,18,39,42,28,45,57,60,8,68,13,74,33],rememb:43,varieti:54,buijtenen:6,repeat:51,zhou:[13,49,34,24],june:[11,20],rhomix:54,printonlyatstep:74,"8th":62},objtypes:{},objnames:{},filenames:["regionModel","liggghtsCommandModel","forceModel_Archimedes","forceModel_GidaspowDrag","forceModel_fieldStore","forceModel_particleVolume","forceModel_KochHillDrag","voidFractionModel_noVoidFraction","IOModel","forceModel_noDrag","smoothingModel_constDiffSmoothing","cfdemSolverPisoScalar","forceModel_particleCellVolume","CFDEMcoupling_Manual","forceModel_virtualMassForce","voidFractionModel_centreVoidFraction","locateModel_standardSearch","forceModel_SchillerNaumannDrag","smoothingModel","dataExchangeModel_twoWayFiles","cfdemSolverPiso","IOModel_sophIO","voidFractionModel_bigParticleVoidFraction","dataExchangeModel_oneWayVTK","forceModel_gradPForce","averagingModel_dilute","dataExchangeModel_noDataExchange","liggghtsCommandModel_runLiggghts","clockModel","voidFractionModel_dividedVoidFraction","liggghtsCommandModel_execute","dataExchangeModel_twoWayMPI","liggghtsCommandModel_setDEMGravity","voidFractionModel","forceModel_DiFeliceDrag","momCoupleModel_noCouple","momCoupleModel","forceModel_LaEuScalarTemp","forceModel_scalarGeneralExchange","githubAccess_public","regionModel_allRegion","forceModel_ArchimedesIB","forceModel","clockModel_standardClock","voidFractionModel_GaussVoidFraction","dataExchangeModel","liggghtsCommandModel_writeLiggghts","locateModel_engineSearchIB","probeModel_noProbe","forceModel_viscForce","voidFractionModel_IBVoidFraction","liggghtsCommandModel_readLiggghtsData","forceModel_ShirgaonkarIB","meshMotionModel_noMeshMotion","scalarTransportModel","forceSubModel","averagingModel_dense","averagingModel","smoothingModel_noSmoothing","forceModel_fieldTimeAverage","meshMotionModel","forceModel_MeiLift","cfdemSolverIB","IOModel_noIO","momCoupleModel_implicitCouple","voidFractionModel_trilinearVoidFraction","forceModel_checkCouplingInterval","probeModel","locateModel","locateModel_engineSearch","IOModel_trackIO","forceSubModel_ImEx","momCoupleModel_explicitCouple","forceModel_volWeightedAverage","probeModel_particleProbe","IOModel_basicIO","clockModel_noClock"],titles:["regionModel command","liggghtsCommandModel command","forceModel_Archimedes command","forceModel_GidaspowDrag command","forceModel_fieldStore command","forceModel_particleVolume command","forceModel_KochHillDrag command","voidfractionModel_noVoidFractionVoidFraction command","IOModel command","forceModel_noDrag command","smoothingModel_constDiffSmoothing command","cfdemSolverPisoScalar command","forceModel_particleCellVolume command","CFDEMcoupling Documentation","forceModel_virtualMassForce command","voidfractionModel_centreVoidFraction command","locateModel_standardSearch command","forceModel_SchillerNaumannDrag command","smoothingModel command","dataExchangeModel_twoWayFiles command","cfdemSolverPiso command","IOModel_sophIO command","voidfractionModel_bigParticleVoidFraction command","dataExchangeModel_oneWayVTK command","forceModel_gradPForce command","averagingModel_dilute command","dataExchangeModel_noDataExchange command","liggghtsCommandModel_runLiggghts command","clockModel command","voidfractionModel_dividedVoidFraction command","liggghtsCommandModel_execute command","dataExchangeModel_twoWayMPI command","liggghtsCommandModel_setDEMGravity command","voidfractionModel command","forceModel_DiFeliceDrag command","momCoupleModel_noCouple command","momCoupleModel command","forceModel_LaEuScalarTemp command","forceModel_scalarGeneralExchange command","githubAccess_public","regionModel_allRegion command","forceModel_ArchimedesIB command","forceModel command","clockModel_standardClock command","voidfractionModel_GaussVoidFraction command","dataExchangeModel command","liggghtsCommandModel_writeLiggghts command","locateModel_engineSearchIB command","probeModel_noProbe command","forceModel_viscForce command","voidfractionModel_IBVoidFraction command","liggghtsCommandModel_readLiggghtsData command","forceModel_ShirgaonkarIB command","meshMotionModel_noMeshMotion command","scalarTransportModel command","forceSubModel command","averagingModel_dense command","averagingModel command","smoothingModel_noSmoothing command","forceModel_fieldTimeAverage command","meshMotionModel command","forceModel_MeiLift command","cfdemSolverIB command","IOModel_noIO command","momCoupleModel_implicitCouple command","voidfractionModel_trilinearVoidFraction command","forceModel_checkCouplingInterval command","probeModel command","locateModel command","locateModel_engineSearch command","IOModel_trackIO command","forceSubModel_ImEx command","momCoupleModel_explicitCouple command","forceModel_volWeightedAverage command","probeModel_particleProbe command","IOModel_basicIO command","clockModel_noClock command"],objects:{},titleterms:{execut:30,forcemodel_archimedesib:41,syntax:[0,1,2,3,4,7,8,9,10,6,12,18,14,15,17,16,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,19,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,5,63,64,65,66,67,68,69,70,71,72,73,74,75,76],voidfractionmodel_bigparticlevoidfract:22,githubaccess_publ:39,regionmodel:0,forcemodel_laeuscalartemp:37,forcemodel_gidaspowdrag:3,locatemodel_enginesearch:69,cfdemsolverpisoscalar:11,voidfractionmodel:33,liggghtscommandmodel:1,voidfractionmodel_novoidfractionvoidfract:7,probemodel:67,dataexchangemodel:45,averagingmodel_dilut:25,cfdemsolverpiso:20,solver:13,forcemodel:42,forcemodel_difelicedrag:34,dataexchangemodel_twowaympi:31,iomodel_trackio:70,clockmodel_noclock:76,momcouplemodel:36,replac:30,clockmodel:28,forcemodel_kochhilldrag:6,forcemodel_virtualmassforc:14,liggghtscommandmodel_readliggghtsdata:51,forcesubmodel:55,content:13,voidfractionmodel_gaussvoidfract:44,liggghtscommand:13,forcemodel_viscforc:49,forcemodel_volweightedaverag:73,voidfractionmodel_trilinearvoidfract:65,dictionari:13,writeliggght:30,forcemodel_schillernaumanndrag:17,about:13,smoothingmodel_nosmooth:58,forcemodel_scalargeneralexchang:38,averagingmodel:57,tutori:13,readliggght:30,voidfractionmodel_ibvoidfract:50,forcemodel_meilift:61,restrict:[0,1,2,3,4,7,8,9,10,6,12,18,14,15,17,16,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,19,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,5,63,64,65,66,67,68,69,70,71,72,73,74,75,76],instal:13,scalartransportmodel:54,liggghtscommandmodel_setdemgrav:32,cfdemsolverib:62,iomodel:8,regionmodel_allregion:40,locatemodel_standardsearch:16,forcemodel_gradpforc:24,couplingproperti:13,meshmotionmodel:60,dataexchangemodel_twowayfil:19,forcemodel_archimed:2,relat:[7,2,3,4,30,8,9,10,6,12,14,15,17,16,22,23,24,25,26,27,34,29,31,32,73,35,37,38,19,40,41,42,43,44,45,46,47,5,49,50,51,52,54,55,56,57,58,61,63,64,65,66,21,69,70,71,72,53,59,75,76],iomodel_noio:63,iomodel_sophio:21,momcouplemodel_implicitcoupl:64,cfdemcoupl:13,dataexchangemodel_onewayvtk:23,can:30,meshmotionmodel_nomeshmot:53,voidfractionmodel_centrevoidfract:15,smoothingmodel:18,forcemodel_checkcouplinginterv:66,forcemodel_shirgaonkarib:52,locatemodel_enginesearchib:47,locatemodel:68,forcemodel_particlevolum:5,smoothingmodel_constdiffsmooth:10,liggghtscommandmodel_execut:30,momcouplemodel_nocoupl:35,rather:30,liggghtscommandmodel_writeliggght:46,forcemodel_fieldtimeaverag:59,probemodel_noprob:48,complex:30,document:13,forcemodel_particlecellvolum:12,clockmodel_standardclock:43,dataexchangemodel_nodataexchang:26,voidfractionmodel_dividedvoidfract:29,forcesubmodel_imex:71,forcemodel_nodrag:9,iomodel_basicio:75,momcouplemodel_explicitcoupl:72,forcemodel_fieldstor:4,descript:[0,1,2,3,4,5,6,7,8,9,10,11,12,18,14,15,16,17,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76],liggghtscommandmodel_runliggght:27,exampl:[0,1,2,3,4,7,8,9,10,6,12,18,14,15,17,16,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,19,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,5,63,64,65,66,67,68,69,70,71,72,73,74,75,76],command:[0,1,2,3,4,5,6,7,8,9,10,11,12,18,14,15,17,16,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,19,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76],averagingmodel_dens:56,model:13,probemodel_particleprob:74}}) \ No newline at end of file +Search.setIndex({envversion:42,terms:{maxsourc:[38,30],whose:[51,20,22,45,11,13,15],accur:22,under:17,preprocess:17,digit:78,localpsizediffsmooth:60,everi:[47,31,40,21,44,67,5,70,27,76,17,78,80],"void":[37,49,29],govern:49,exacttim:76,clockmodel_xi:28,solid:[49,22,51,30],vector:[56,63,4,77],speci:[30,81],clockmodel:17,direct:[40,29,30],second:[38,65,30,29],follow:[16,40,3,35,29,6,17],liggghtscommandmodel_readliggghtsdata:17,even:[48,76,40],flimit:56,conduct:[42,38,2,30,52],"new":[37,31,40,67,52,17,76],manipul:[64,40],checkperiodiccel:[48,51],here:[45,40],openfoam:[17,40,20,49,30,11,13],path:[47,53,76,46,40],interpret:4,forum:[17,40],studi:6,cfdem_solver_dir:40,bashrc:40,total:[12,66,49],describ:[17,40],would:[37,17],granvelfieldnam:[6,3,35,68],iomodel:17,recommend:[48,73],type:[16,44,38,30,40,65,3,24,35,29,50,6,17,14],until:[5,67],forcemodel_gradpforc:17,relax:70,warn:[39,40,43,70,27,30],postporcessor:4,exce:[5,49,70],"9000e":10,hold:58,must:[60,29,30,10,17,33,81],swtich:58,springer:11,mylpp:40,word:[31,76,40],setup:[17,40],work:[1,39,40,70],smoothingmodel:17,root:40,particleprobeprop:78,xeveri:78,overrid:78,trackio:74,give:[17,60,40,10],forcesubmodel_xi:58,indic:[76,40,14],want:40,type1:[16,38,65,3,24,35,30,50,6,14],type3:30,type2:[16,65,3,35,30,6,14],end:[33,76],travel:39,locatemodel_xi:72,iiii:70,fvscheme:17,maxaccnr:70,env:40,verifi:40,perspect:[11,13,20],updat:[17,40],after:[37,44,40],befor:40,wrong:40,mesh:[49,12,22,39,64],patankar:52,explicitcoupleprop:56,nodragprop:9,law:[6,37,3,35],parallel:[17,39,40,20,48,49,11,13],averag:[59,20,61,44,3,48,25,10,11,13,63,77],maxcellsperparticl:[22,51,45],third:[37,17],spout:6,momcouplemodel_nocoupl:17,maintain:40,environ:40,incorpor:49,first:[31,70,27,29,17,33,76],order:[17,44,37,65,30],oper:[60,10],meiliftprop:65,endors:[11,49,13,20,17],over:[48,39,10],becaus:[44,60,10],maxcfl:70,heatflux:[38,30],vari:67,fix:[5,67,18],writeliggghtsprop:47,additionallibs30x:40,schmidt:81,easier:44,them:[74,9,40],thei:[12,63],trondheim:49,choic:[58,75],dotdot:[31,76],volumefractionnam:77,each:[65,3,5,31,9,6,17,76,16,24,14,30,35,29,40,42,43,52,48,49,58,2,50,78],nodataexchang:[26,54],went:40,side:[6,16,3,58],clockmodel_noclock:17,dataexchangemodel_xi:54,gradient:24,imexsplitfactor:37,mason:[38,30],adapt:40,bigparticleprop:22,linear:[48,65,73],situat:10,omiss:17,standard:[40,44,30,32,12,17,63,77],switch3:[38,2,65,3,24,31,9,30,50,6,14,35],switch2:[38,2,65,3,24,47,66,31,9,30,50,6,12,52,14,35],switch1:[31,3,9,50,6,12,14,24,35,30,33,77,38,73,42,52,47,48,66,29,2,65],switch0:77,switch7:[6,3],switch6:[6,3,35,30],forcemodel_scalargeneralexchang:17,switch4:[50,65,3,24,31,35,6,14],advect:[57,81],writeprecis:78,rang:[39,29],mkdir:40,pisofoam:[11,13,20],cfdemtut:17,capac:[38,30,81],instruct:40,alreadi:40,allrun:[17,40],scalartransportmodel:17,nomenclatur:17,top:40,sometim:40,startindex:76,similarli:29,cfdemsolverpisostm:17,iomodel_noio:17,tool:[40,4,66,70,12,63,77],locatemodel_standardsearch:17,compof_:40,keyword:[58,80,2,42,65,52,75,67,18,77],provid:[36,58,68,75,56,17],particletrackproperti:74,tree:[48,73],project:[17,40],momcouplemodel_explicitcoupl:17,fashion:37,ran:44,locatemodel_enginesearchib:17,shell:[17,40],manner:52,meshmotionmodel_xi:64,strength:17,unresolv:49,procboundarycorrect:29,liggghtscommandmodel_writeliggght:17,gaussprop:45,shall:57,object:[53,12,63,77],kloss:[11,49,13,20,17],phase:[11,49,13,57,81],doi:11,doc:[17,40],flow:[10,37,38,65,4,24,30,50,17],cshrc:40,doe:[37,38,62,44,4,66,7,79,30,12,77,63,70],dummi:[36,23,62,26,69,55,79],bejan:11,kochhilldrag:6,heattranscoeff:[38,30],prio:76,probe:[7,2,63,50,3,24,35,30,71,6,12,78,77],radiu:29,radii:80,regionmodel:17,speciestransportmodel:30,runlast:31,voidfractioninterpolationtyp:[6,16,3,35,30],stop:[44,43,70],fluid:[50,3,5,6,9,11,17,14,16,13,22,24,35,30,37,38,42,43,52,49,67,57,58,2,65,68,70,78,81],report:[65,40],toolbox:[49,17],method:[42,48,49,17,52],bad:70,novoidfract:23,shirgaonkarib:[49,52],structur:[48,17,39,73],respons:18,fail:[51,22,45,40],dirctori:17,loth:65,approach:[49,17,60,29],accord:[64,40,22,45,27,51,29,11,17],cfdem_doc_dir:40,rasproperti:17,particleprob:[7,78,71],howev:[37,30,40],com:[17,40],archimedesibprop:42,serialoutput:80,assum:70,partspeciesnam:30,numpi:40,three:29,been:37,accumul:[58,44],velfieldnam:[16,38,65,3,52,35,30,6,68,14],basic:[80,40,44,29,10,17],relnotes_:40,suppress:[2,50,3,24,35,30,6,81],xxx:17,cfdemparticl:[25,59,40],gidaspow:3,argument:67,partheatfluidnam:[38,30],lift:[42,65,2],gnu:17,properti:[17,19,43,46,8,30,11,53,13,78,18],calcul:[50,3,5,6,9,10,11,12,13,14,15,16,20,22,24,25,35,30,77,38,29,42,43,44,45,52,49,51,67,18,58,59,2,65,66,68,70],dataexchang:70,stairstep:22,conf:49,sever:[48,70,9],dilut:[59,3,61,25,10,57,81],perform:[7,10,3,9,50,6,17,14,16,40,46,24,25,35,29,53,37,19,42,43,54,61,52,59,2,65,26,71,78],suggest:17,make:40,additionallib:40,split:14,complet:[0,58,37,1,43,28,72,54,61,7,8,34,71,64,60,78,57],vizclock:44,schiller:16,jku:[51,49,22,28],josef:28,liggghtscommandmodel_execut:17,kept:76,bewar:40,thu:[11,67],forcemodel_fieldstor:17,contact:40,thi:[0,7,4,5,1,8,10,11,12,17,13,18,20,22,25,28,29,30,34,77,37,38,39,40,41,42,43,44,54,48,49,51,52,57,58,59,60,61,63,64,65,66,67,70,71,78,72,81],cellid:[48,72,73,32],protocol:40,just:[49,70,40],wm_project_vers:40,newton:37,yet:39,previous:[9,46],propuls:52,debug:[58,77,78,29,10],save:[47,78,40],applic:[17,49,50,40,24],liggghtscommandmodel:[53,17],ibprop:51,runliggght:[47,33,1,27],measur:[44,79],specif:[17,38,78,30],manual:[17,78],uselimason:30,forcemodel_difelicedrag:17,nield:11,maciv:52,www:[17,40],interv:[58,31,78,70,27,17,33,76],maxim:[49,38,30],resolv:[42,52],txt:[44,40],fpic:40,condit:[49,60,4,10],twowaympiprop:53,core:17,forcemodel_viscforc:17,repositori:[17,40],post:46,voidfracfieldnamesnext:29,surround:49,simul:[0,31,3,12,17,76,40,46,24,30,53,33,77,37,80,19,42,43,44,52,66,63,50,70,78,21],libvtk5:40,difelicedrag:[43,35],done:[37,17,40],coars:[58,43],commit:40,produc:[17,20,44,49,11,13],scaleupvol:51,bound:[44,70,10],volaverage_field:77,storag:78,liggghtscommandmodel_setdemgrav:17,standardclock:[44,28],git:[17,40],casedir:[47,44,17],support:40,centreprop:15,width:19,regionmodel_allregion:17,call:[44,17,27,30],head:40,offer:[11,49,13,20,17],forc:[49,17,21,18],heat:[11,38,13,30,81],"true":[50,3,75,9,6,12,76,24,27,14,73,77,37,38,30,40,42,48,66,35,58,2,65,70],expforc:37,reset:29,myprobemodelprop:71,maximum:[22,19,44,45,51,70,46],dataexchangemodel_onewayvtk:17,vortic:65,featur:[44,17,78,40,71],forcemodel_shirgaonkarib:17,exist:57,arraypo:44,check:[7,40,48,70,71,78,81],when:[58,37,51,39,40,22,45,48,25,29,67],test:[60,40,10],noclock:79,intend:44,consid:[58,37,39,51,48,12,67,77],stoke:[37,20,49,70,11,13],bigparticl:[22,45],longer:[0,41],treatvoidcellsasexplicitforc:37,phifieldnam:[14,81],turbul:[38,20,30,11,13,81],geometr:[48,73],maxnumberofparticl:[19,46],time:[31,5,10,12,17,76,60,28,46,27,29,33,77,37,80,19,44,49,67,18,58,63,66,70,79,78,21,81],push:18,backward:40,particlerelaxationtim:70,global:81,signific:78,computation:25,usesecondorderterm:65,alphamin:[22,39,51,45,29,15],depend:[58,67,49,75,29,17],speciesctranscoeff:30,readabl:40,centroid:29,sourc:[36,38,20,40,17,68,49,9,11,56,13,57,81],string:44,fvoptionsc:81,exact:49,drag:[16,37,58,3,52,35,6,67],reproduc:29,forcemodel_xi:43,div:50,git_ssl_no_verifi:40,dir:74,upper:[12,77,10],lvtkio:40,sign:40,useaddedmass:[50,24],port:40,suppressprob:[2,50,3,24,35,30,6,78],couplinginterv:[31,17,76],current:[0,58,7,40,41,71,78,77],deriv:57,gener:[72,74,17,30,40],coeffici:[58,38,50,24,30,67],disclaim:30,modif:48,coincid:29,lengthscal:10,viscforceprop:50,treatforceexplicit:[58,50,42,65,3,24,9,6,52,14,35],prefer:40,volumetr:[42,2,81],should:[25,70,76,40,10],useparcelsizedependentfiltereddrag:58,memori:17,cfdemcompcfdemal:40,value2:[48,30],value1:[48,30],criteria:70,myforcemodel3:[7,78],myforcemodel2:[7,78],myforcemodel1:[7,78],checkout:40,setdemgrav:33,generalcorrelationparamet:30,finit:[50,3,4,6,11,13,14,16,20,24,35,30,77,38,42,52,48,2,65,68,63,81],visual:[44,17],endtim:[33,76],examin:28,ksl:[60,10],effort:40,graphic:44,prepar:40,pfieldnam:24,onewayvtk:[70,46,54],can:[3,5,6,75,11,12,17,13,40,46,24,35,30,53,77,19,43,44,67,58,2,50,70,63],onewayvtkprop:46,twodimension:[42,2,52],purpos:49,runfirst:[33,31,27,76],agent:40,ssl3_get_server_certif:40,occur:78,alwai:[58,10],multipl:6,write:[80,40,47,31,8,74,21],criterion:70,pure:[58,17],map:[61,25,59,10],cranknicolson:67,clone:40,mai:[58,43,44,8,40],data:[58,26,38,59,19,40,78,44,46,54,61,25,80,8,21,30,53,27,17,67,76],explicit:[58,37,56,21,10],virtualmassforceprop:14,inform:[49,44,17,30,40],"switch":[31,3,9,50,6,12,14,24,27,35,73,33,77,37,38,30,42,52,47,66,58,2,65,70,78],combin:[5,58,17,3,67],liggghts_init:[53,17],approx:22,approv:[11,49,13,20,17],includeposit:78,voidfractionmodel_bigparticlevoidfract:17,still:40,dynam:[49,17],conjunct:[60,10],group:[5,67,18],how:[17,40],vtk:[19,74,46,40],norwai:49,main:[17,78,28],particleidstosampl:78,non:[40,29],initi:[49,44,60,10],partheattranscoeffnam:[38,30],voidfractionmodel_novoidfractionvoidfract:17,now:[58,40],enabl:[17,7,78,40],term:[36,58,65,68,5,9,56,17],name:[0,1,2,3,4,5,64,8,50,6,12,60,14,16,67,18,28,24,35,30,34,77,37,38,29,42,43,44,54,47,48,52,57,58,61,65,68,70,63,72,81],forcemodel:17,separ:17,implforcedem:[6,16,3,35,58],dataexchangemodel_twowaympi:17,pizza:40,compil:40,domain:[22,66,45,49,27,29,34,15],beetstra:58,replac:40,individu:30,continu:40,scienc:30,forcemodel_kochhilldrag:17,happen:17,setdemgravityprops1:33,setdemgravityprops0:33,forcesubmodel:[38,2,42,43,65,3,24,52,9,30,50,6,17,14,35],correcl:30,cellpointfac:[16,50,65,3,24,35,30,6,14],lagrangian:[58,80,40,61,25,59,10],correct:[31,40,3,49,29,17,76],accordingli:[78,40],scalartransportmodel_xi:57,particlecellvolumeprop:12,schillernaumanndragprop:16,usefiltereddragmodel:58,chemengsci:[6,3],base:[0,1,3,6,64,8,50,11,60,16,13,20,28,46,24,35,30,34,37,38,29,65,70,21,74,72],wai:[37,30],motion:[58,49,64],place:[5,49,44,60,10],lambda:[38,30],origin:[12,63,77],onc:[44,40],arrai:44,fast:52,open:[17,40,20,49,11,13],angular:49,size:[58,39,44,46,49,70,29],avail:[58,40],given:[67,48,70,73,32,12,17],bool1:[16,70,76,30],bool3:76,bool2:[16,76],lognam:40,nosmooth:62,m_voidspac:81,"1500e":10,githubaccess:17,dataexchangemodel_twowayfil:17,fraction:[49,68,29,77],eulerianfield:81,especi:[42,48,37,4],copi:40,specifi:[60,30,40,63,65,27,29,10,17,78,57,81],github:[17,40],mostli:77,than:[44,22,45,70,51,10,12,17,77],iomodel_sophio:17,speciesflux:30,sophio:[74,21],were:[49,9,40],posit:[44,80,29,65,48,49,30,73,32,78,72],seri:[19,46],pre:[67,27],dorgan:65,ani:[17,43,7],prt:81,nodemforc:9,cfdemproject_gitcfdem:40,engin:[72,48,73,30],techniqu:53,note:[0,58,37,1,41,40,43,28,72,54,61,7,8,34,30,71,64,76,60,78,57],satellit:48,take:[5,58,49,40],probem:78,sure:40,normal:[16,38,30,24,48,31,35,29,6,33],track:[74,78],dataexchangemodel_nodataexchang:17,beta:60,implicitcoupl:[37,68],cfdemcompcfdem:40,later:[40,29],quantiti:[37,65,78,57,81],fsmooth:[60,10],runtim:76,probemodel_particleprob:17,regionmodel_xi:0,viscou:[50,52],viscos:58,show:17,forcemodel_archimedesib:17,permiss:40,threshold:[12,77],onli:[1,3,5,80,50,6,12,76,51,25,27,35,30,31,33,77,36,37,38,39,19,42,52,47,48,67,58,65,68,71,56,78,81],ratio:70,therefror:75,activ:[58,7,65,52,5,30,71,67,78],written:[80,19,43,28,47,12,17,63,21,77],allregion:[0,41],locatemodel_enginesearch:17,variou:71,get:[58,17,40],secondari:78,ssl:40,cannot:[4,81],ssh:40,trade:[11,49,13,20,17],requir:[17,30,29],averagingmodel_dilut:17,cfdemsolverpiso:[49,17],gradpforceprop:24,email:17,scalarfield:[12,63,4,77],where:[26,31,59,42,63,44,49,52,47,25,70,27,12,78,77],speciescfluid:30,fieldstoreprop:4,concern:40,implicitcoupleprop:68,review:30,behind:40,ibvoidfract:49,between:[37,67,29,19,44,46,54,51,49,26,18,30,53,17,14],"import":[48,37,78],paramet:[39,22,45,30,29,17,15],comp:52,screen:[58,12,65,66],interpolatedat:81,scaledrag:[6,3,35],come:17,jfm:[17,50,35,24],region:[0,51,29,22,45,41],parttempnam:[38,30],improv:17,kerbl:28,acceler:70,pow:[38,30],period:[48,51],explicitcoupl:56,goniva:[11,49,13,20,17],cfdemsystest:40,mark:[17,20,51,49,11,13],cfdemsolverib:17,workshop:[11,13,20],fieldstor:4,addit:[40,20,11,56,13,78],restartcfdem:47,resolut:60,usegeneralcorrel:30,hashtag:40,those:[44,22,51,45,77],"case":[44,37,80,60,40,65,49,25,59,10,17,81],readliggghtsdataprops0:76,commithashtag:40,voidfractionmodel_centrevoidfract:17,forcemodel_checkcouplinginterv:17,keepcfdforc:9,cluster:[49,17],uncom:40,locatemodel:17,lengthscalereffield:10,develop:[17,3,19],alphabet:17,upperthreshold:[12,77],same:[30,40,77],bfull:17,generalmanualprop:81,finish:44,minalphap:68,treesearch:[48,73],mani:[47,78],extern:29,appropri:[57,29,81],cpvolumetricfieldnam:81,choos:[31,47,17,70],nomeshmot:[64,55],dimension:[42,2,52],ddtuinterpolationtyp:14,execut:[1,40,43,70,9,53,17],rest:29,blow:[51,22,45,29],hint:40,clockdata:44,except:[27,40],treatment:[37,31,76],versa:29,momentum:[36,37,20,68,30,11,56,13],around:40,read:[76,75,19,30,10],regim:[25,59],temperatur:[38,30,81],grid:[58,60],usind:39,integ:[44,78],either:[49,22,40],output:[58,44,80,30,2,63,50,3,24,66,35,29,10,6,12,78,77],scalartransportproperti:[30,57,81],ligght:30,ascend:44,gravityfieldnam:[42,2],ddt:14,readliggghtsdata:76,treatexplicit:[58,75],refer:[37,17,49,52,10],nusselt:30,broken:70,starttim:[33,44,66,12,78,63,76,77],fulli:[17,52],treatforcedem:[2,58,50,14,24],src:[17,78,30,40],voidfractionnext:42,scalargeneralexchangeprop:30,agglomer:[22,45,29,15],stand:17,"3d8da0e960c717ff582f1517a27724144f086b83":40,act:[16,50,2,42,43,65,3,24,9,6,52,78,14,35],industri:49,mean:[37,23],processor:[48,80,19,29],routin:[44,17,40],effici:[25,49],paraview:[4,40],your:[44,4,40],parscal:30,log:[75,43,78],overwrit:47,start:[78,44,48,66,12,33,63,76,77],cfdem_liggghts_makefile_nam:40,divtauinterpolationtyp:50,diffus:30,vectorfield:[63,4,77],momcouplemodel_implicitcoupl:17,cfdemsolverpimpleimex:30,possibl:17,"default":[61,28,8,80,54],creat:[51,40],certain:[0,17,29,81],nocoupl:36,felic:35,file:[80,19,40,75,43,44,66,46,68,47,49,8,74,53,12,17,78,76],cgwarnonli:43,fill:10,smoothingmodel_constdiffsmooth:17,field:[50,3,4,10,6,12,60,14,16,22,24,35,30,34,77,37,38,29,42,43,45,52,48,49,51,58,2,63,65,68,70,74,56,78,81],zerogradi:[60,10],valid:14,you:[44,17,78,4,40],symbol:[31,76],averagingmodel_xi:61,particlevolum:66,directori:[80,60,40,44,46,47,10,17,78],nicolson:67,goe:[38,30],mass:[50,67,30,14,24],execute_0:31,represent:[51,39,22,45,29,17],all:[37,67,40,43,51,5,48,49,29,10,17,78,18,77],consider:58,rhomixfieldnam:81,voidfractionfieldnam:[16,38,42,3,68,35,30,6,81],scalar:[38,4,81,48,57,30,10,11,13,63,14,77],correl:[6,16,3,35,30],sct:81,veloctii:37,writelast:47,articl:40,cfdtool:40,laeuscalartempprop:38,parcel:[58,60],fals:[50,3,9,10,6,12,76,51,24,27,14,30,77,38,73,43,52,48,66,29,35,58,2,65,81],urel:14,mpi:[1,5,70,17,53,67,18],util:[74,40],mechan:65,failur:40,veri:[32,39],modeltyp:17,unalt:[51,22,45,29],cfdemuseonli:29,list:[0,58,37,38,60,78,43,28,72,67,54,61,7,8,34,30,71,64,17,1,57],adjust:[22,45,29,15],small:[17,60,40,68],cfdem_add_libs_dir:40,zero:[22,9],pressur:[49,52,24],design:[48,49,51,30,58],pass:[5,58,17],further:[48,12,40],forcemodel_virtualmassforc:17,gunn:30,sub:[58,38,30,2,42,22,3,65,51,52,75,9,29,50,6,24,17,14,35],liggghtspath:53,section:[17,40],delet:[78,9],version:[0,58,17,41,40],convectiveheatflux:[38,30],"public":[17,40],contrast:81,movement:49,modular:17,free:40,tinterpolationtyp:38,modifi:40,valu:[16,38,58,68,51,3,24,70,75,35,30,10,6,12,81,14,77],search:[22,51,45,48,73,72],xstep:78,writenam:47,versioninfo:40,speciescflux:30,magnitud:[12,77],myforcemod:78,diamet:[38,30,22,3,45,51,49,35,29,6,60],via:[7,19,43,71,10,53,56,17,78,34],cfdem_add_lib_path:40,timestep:[17,76,46],transit:[51,39],filenam:[19,46],minallowedvcellbyvparcel:70,writetim:[12,63,77],select:[0,43,47,9,17,33],laeuscalartemp:38,tackl:49,two:[29,19,2,42,52,30,17,18],formul:[16,50,3,24,52,6,17],more:[37,22,44,45,51,17],desir:[44,40],forcemodel_archimed:17,nrdemstep:27,flag:[16,38,30,40,43,51,3,24,48,70,35,29,10,6,76],known:[48,59,73],none:[0,23,62,3,4,5,7,8,9,50,6,12,60,1,15,16,18,22,46,24,26,28,29,31,32,33,34,35,37,80,73,41,43,44,45,54,47,61,66,51,53,67,57,58,2,63,64,65,69,21,71,74,75,55,78,79,72,81],dev:40,remain:[51,22,45,29],dem:[31,3,5,6,1,9,50,11,76,17,14,16,13,19,20,46,24,26,35,30,53,34,37,38,40,42,43,54,47,49,52,18,58,2,64,65,67,70,78],sphere:[48,49,29],minimum:[51,39,22,45,68,70,29,15],dmolecular:30,switch5:[6,50,3,35,30],forcemodel_particlevolum:17,divid:[17,29],rather:[25,59],anoth:[48,39],couplingproperi:17,number4:[22,45],number2:[51,22,45,29,10,12,15],number3:[51,12,22,45,29],number1:[51,39,22,45,29,10,12,15],phinam:81,momcouplemodel_xi:37,trilinear:39,stash:40,caus:27,spheric:29,media:11,help:40,myprobemodel:71,metallurg:49,treatdem:[58,75],dataexchangemodel:[49,17],thermal:[38,30],through:40,hollowaydrag:78,fieldtimeaverageprop:63,style:[5,17,18,67],fvoptionst:81,pimpleimex:[60,10],timeevalful:44,usevolumefract:77,might:[0,58,37,1,60,40,43,28,72,54,61,7,8,34,71,64,27,17,78,57],turbulencemodeltyp:17,timestamp:[47,31],framework:[11,49,13,20,17],detach:40,archimedesprop:2,bigger:[17,22,51,45],troubleshoot:40,convect:[11,38,13,30],easili:[17,29],radial:29,found:[17,29],weight:[77,22,45,29,15],procedur:[17,40],runeverycouplingstep:[31,76],oil:49,expect:70,upperlimit:10,safeti:44,execute_1:31,couplin:67,difelicedragprop:35,hill:6,print:78,naumann:16,advanc:40,reason:[17,40,70],voidfractionnam:81,put:44,forcemodel_schillernaumanndrag:17,kochhilldragprop:6,smoothingmodel_nosmooth:17,veloc:[50,3,80,10,6,14,16,24,25,35,30,37,38,52,61,49,67,58,59,65,68,70,81],omit:44,cfdem_ut_dir:[44,40],feel:40,exchang:[36,37,17,60,19,20,46,54,26,68,30,10,11,53,56,13,57,81],number:[58,44,31,18,19,40,22,46,68,51,48,70,45,30,10,78,76],controldict:17,cadd:14,stabl:37,gpl:17,superpos:[43,56],differ:[40,2,42,48,49,75,73,17,57],script:[44,17,40],interact:[16,50,2,42,43,65,3,24,9,6,52,78,14,35],least:[17,40],statement:44,smoothen:60,scheme:67,cfd:[26,17,59,19,20,44,49,46,54,25,80,11,53,13,21],evinc:17,option:[50,3,75,9,10,6,12,14,15,16,22,24,27,35,30,77,38,73,40,42,45,52,47,48,66,51,29,67,58,2,65,70,63,81],verbosetofil:78,part:[28,40,22,48,30,17],fix_couple_cfd:5,preno:27,timeinterv:[70,33,76],mclaughlin:65,molecular:30,grep:78,noblank:31,remov:40,store:[47,44,4,46],meshmot:55,toward:49,gidaspowdragprop:3,comput:[38,40,52,48,49,30,17],gedit:40,packag:[17,40],fluidscalarfield:30,runeverywritestep:31,violat:43,also:[40,9,29],cfdemtesttut:40,cellpoint:[16,38,65,3,35,30,6],ergun:3,distribut:[48,17,39,45],lowerthreshold:[12,77],writetofil:[12,66,77],implforcedemaccumul:[6,58],previou:[49,29],reach:17,mixtur:81,beetstradrag:78,most:[43,78,40],rho:43,cover:[17,49,22,51,45],liggghtscommandmodel_runliggght:17,clean:39,lvtkfilter:40,particlecellvolum:12,engineib:[48,29],find:[72,48,17,73,40],access:40,firewal:40,particlevolumeprop:66,factor:3,cfdemsolverpisoscalar:17,voidfractionmodel:17,ubuntuvtk_fp:40,model_i:[58,43,1],express:65,cfdem_add_libs_nam:40,transfer_typ:67,model_x:[58,43,1],cfdem_project_dir:[17,40],restart:47,obligatori:18,ofvers:40,volweightedaverag:77,relativepath:46,certif:40,set:[58,37,31,30,40,43,22,45,51,48,49,70,27,9,29,73,75,56,17,33,81],dump:[27,40],transportproperti:17,see:[38,20,40,2,42,65,3,24,11,52,71,9,30,50,6,75,13,78,14,35],arg:67,iomodel_trackio:17,close:17,analog:12,piso:[11,13,20],someth:40,voidfractionmodel_gaussvoidfract:17,smallest:70,altern:[47,43,30,40,81],concentr:81,numer:[6,30],solv:[37,17,20,49,11,13,57,81],cfdem_src_dir:40,both:[17,40],voidfract:[51,3,4,23,10,6,60,15,16,22,35,29,30,34,77,38,39,42,45,68,63,21,81],last:[47,48,31,9,73],immers:[42,48,49,52,36],tempor:[48,63,77],whole:[49,41],point:[48,29],warnonli:70,scalartransportmodel_generalmanu:17,caddrhofluid:67,pneumat:[38,30],trilinearprop:39,due:70,timeaverage_scalarfield:63,implicit:[17,21],imag:[48,51],demand:[58,75],spliturelcalcul:14,look:[0,58,37,1,60,40,43,28,72,54,61,64,8,34,17,57],twowayfilesprop:19,straight:32,erron:27,"while":[49,40],abov:[31,3,40],error:[17,60,40,10],loos:17,loop:44,pack:76,readi:43,centr:[58,51,39,22,45,48,34,15],readm:40,octav:17,minim:[48,51],executeprops0:31,executeprops1:31,conflict:37,updatemixtureproperti:81,wherea:[37,17],pressurefieldnam:52,forcesubmodel_imex:17,user:[58,17,81,70],koch:6,robust:32,implement:[37,49,29,71,11,17,78,57],lower:[12,77,10],particul:3,older:40,latter:80,enginesearch:73,cfdem_lpp_dir:40,vorticityinterpolationtyp:65,partspeciesfluxnam:30,tempfieldnam:[38,30],theoret:3,voidfracfieldnamesprev:29,input:[53,17],euler:10,format:40,impldem:[58,75],fedora_fp:40,success:17,semi:58,smoothinglength:10,flux:[38,30,14,81],pirker:[11,49,13,20],engineibprop:48,some:[48,17,75,73,40],sampl:78,gradpinterpolationtyp:24,scale:[38,30,22,3,45,66,35,29,10,6,17,15],id2:78,id3:78,per:[22,78,65],id1:78,mathemat:52,larg:[17,81],slash:[31,76],xprecis:78,proc:[11,80,13,49,20],liggghtscommmand:[31,47,1,27,33,76],clockmodel_standardclock:17,run:[44,1,19,40,28,47,31,27,30,53,17,33,76,79],particleid:78,stem:[42,2],forcemodel_volweightedaverag:17,step:[47,31,19,40,58,78,67,44,46,5,49,70,27,18,29,17,33,76],voidfractionmodel_ibvoidfract:17,writeliggght:1,impos:37,folder_of_new_additionallibs_fil:40,cfdemproject:40,block:40,within:[58,1,40,22,49,17,77],ensur:[48,81],chang:[37,40,44,70,27,10],artifici:[51,22,45,29],occupi:[22,45,29,15],lowerlimit:10,question:40,"long":40,custom:40,includ:[36,40,68,41,56,17,78,57,81],suit:[42,52],forward:32,properli:40,gauss:45,crank:67,newer:40,atom:30,line:[31,76,40],info:78,zhu:3,archimedesib:[42,49],lvtkcommon:40,constant:[51,22,45,5,49,29,74,17,81],repres:[38,42,52,48,49,30,12,34],incomplet:[58,43,8],lpp:40,sequenti:[43,19],forcemodel_fieldtimeaverag:17,printeveri:78,transport:[58,38,30,11,13,57,81],tech:[38,30],smoothingmodel_xi:60,meaning:37,cfdemsolverscalar:38,cfdem_tut_dir:40,algorithm:[20,28,52,48,49,73,10,11,32,13],vice:29,depth:52,uinterpolationtyp:[16,65,3,35,30,6,14],code:[44,17,40,20,28,46,54,19,49,26,51,30,11,53,13,81],gran_pizza_17aug10:40,cfdem_project_user_dir:40,fieldtimeaverag:63,superfici:81,forcemodel_laeuscalartemp:17,forcemodel_gidaspowdrag:17,send:17,granular:[38,68,11,25,59,35,30,6,13],aris:40,shirgaonkaribprop:52,deactiv:78,account:[58,50,20,22,45,24,29,11,13,15],volum:[50,3,4,6,11,12,13,14,15,16,20,22,24,35,29,30,34,77,38,39,42,45,52,48,66,51,2,65,68,70,63,81],stackoverflow:40,implicitli:[58,37],relev:[37,17,60,40],tri:65,cpvolumetr:81,"try":40,pleas:[0,58,37,1,60,40,43,28,72,54,61,7,8,34,71,64,17,78,57],cfl:70,smaller:[17,70],prandtl:81,"g\u00f6teborg":[11,13,20],gmbh:17,investig:[38,30],download:40,compat:40,index:76,compar:60,cell:[58,37,59,39,22,3,49,81,51,48,25,70,45,29,10,73,32,12,77,72,15],experiment:6,github_:40,bodi:[49,22],checkcouplinginterv:70,ubuntu:40,becom:70,sinc:44,convert:40,larger:[70,10],cert:40,typic:[37,70],particletrack:74,appli:[0,1,8,9,11,60,13,20,28,25,34,37,64,43,54,61,67,57,58,59,75,78,72],forcemodel_meilift:17,apt:40,cloud:[25,17,59],from:[58,39,40,2,42,19,49,46,5,48,25,29,53],commun:[58,9],doubl:44,couple_everi:[5,67,18],particl:[7,2,3,4,5,6,80,8,9,10,11,12,17,14,15,16,13,20,22,46,24,25,27,35,29,30,53,34,77,37,38,39,19,42,43,45,52,48,66,50,51,67,57,58,59,60,61,63,65,68,70,71,74,78,72,81],next:[5,67,29],doubt:3,usr:40,postprocess:[40,66,70,12,17,63,77],name_:47,casepath:80,sampleal:78,"transient":[38,30],iii:[17,70],smoothinglengthreferencefield:10,alia:[44,40],alic:[49,22,51],tau:50,process:[37,44,49],sudo:40,gidaspowdrag:3,serial:80,virtualmassforc:14,surfac:[48,51,81],filepath:76,probemodel_noprob:17,instead:[48,40],switchingvoidfract:3,voidfractionmodel_dividedvoidfract:17,forcemodel_nodrag:17,attent:[60,10],physic:[23,57,52],correspond:[30,48,73,32,78,72],element:[17,29],allow:[39,71,49,70,30,29,17],velocityfieldnam:[70,50,24],move:48,fluidscalarfieldinterpolationtyp:30,chosen:[43,27],liggghtscommandmodel_xi:1,cfdem_add_lib:40,fluidiz:6,therefor:[70,40],engineprop:73,greater:[12,77],cfdem_vers:40,handl:[58,78],auto:30,probemodel:17,scalargeneralexchang:30,shirgaonkar:52,disregard:49,our:40,scalarviscos:[58,38,65,3,35,30,50,6],special:[49,31,51,76],out:[44,10],variabl:[37,44,9,40],speciesconvect:30,influenc:[38,30,22,4,45,66,70,51,29,12,63,77],scalarfieldnam:[63,4,77],suitabl:30,rel:[47,67,46],wich:40,communi:58,cfdemcomplig:40,constdiffsmooth:[60,10],archimed:[43,17,2],insid:[59,22,45,25,51,15],rhop:70,heatfluid:[38,30],releas:40,afterward:44,speciesc:30,unwant:78,keep:[51,22,78,45,29],averagingmodel:17,length:[30,10],organis:17,navier:[11,37,13,49,20],gradpforc:[43,17,78,24],softwar:[11,49,13,20,17],downof_:40,christoph:17,qualiti:70,date:76,"1e3":56,"1e2":56,"1e4":56,owner:[11,49,13,20,17],publickei:40,licens:17,wierink:49,system:[11,13,3,40,17],viscforc:[17,43,50,78],termin:[43,78,40],meshmotionmodel:17,"var":40,bed:6,meshmotionmodel_nomeshmot:17,result:[22,40,70],caclul:9,hager:[51,20,22,49,11,13],have:[58,40,44,61,29,17,77],need:[31,40,43,44,70,74,17,76],border:29,probedebug:78,min:70,discret:[17,20,50,3,24,11,13],which:[7,62,3,4,5,9,10,17,22,27,29,37,64,40,44,45,49,51,74,56,78,72,79],deenet:30,graviti:[42,33,2],singl:25,forcemodel_particlecellvolum:17,"1e10":[56,10],xysplit:48,"class":[0,44,37,1,60,28,72,64,8,34,17,57],iomodel_basicio:17,dens:[61,25,59,37,30],face:[40,81],deni:40,determin:17,gain:49,cfdem_pizza_dir:40,vtk_out:[19,46],text:78,verbos:[58,38,30,2,78,65,3,52,47,66,31,27,35,29,10,6,12,33,76,77],word1:[70,81,77],word3:81,word2:81,locat:[40,44,66,48,49,73,32,17,72],vectorfieldnam:[63,4,77],dispers:[57,81],suppos:[59,39,22,45,25,51,29],noio:69,local:[60,40,68],contribut:[5,49,22,51],pull:[18,40],increas:[51,76,22,45,29],enginesearchib:[48,49],organ:17,checkcouplingintervalprop:70,integr:[67,9],contain:[5,49,44],grad:[50,24],runliggghtsprop:27,statu:40,correctli:[4,40],boundari:[36,42,4,52,48,49,29,10,60],state:40,chemic:30,cfdem_bashrc:40,partheatfluxnam:[38,30],generalmanu:[30,57,81],predefin:[30,40],kei:[17,40],zsplit:48,fvoption:[57,81],equal:[44,17,39,29,10],etc:[49,17,57,40,81],admit:40,instanc:31,grain:43,equat:[58,37,38,20,17,49,11,13,57,81],freeli:17,meilift:[65,78],comment:40,partspeciestranscoeffnam:30,scalar3:[38,3,70,35,6,33,76,81],scalar2:[38,19,50,3,66,70,35,6,81,33,76,77],scalar1:[38,19,65,3,66,24,52,70,35,50,6,76,81,33,14,77],testtutori:40,scalar7:30,scalar6:[70,30],scalar5:[38,3,30,70],scalar4:[38,3,76,70],respect:[58,44,40,51,49,28],addition:[74,56,31,21,40],treat:37,trajectori:[11,13,20],partial:[49,51],neighbour:39,write_restart:[47,31],present:[49,67,40,10],deen:30,multi:49,nodrag:9,couplingfilenam:[19,46],defin:[0,23,2,3,4,1,8,9,10,6,12,17,14,15,16,60,19,21,22,46,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,54,47,48,66,50,51,53,52,55,56,57,58,59,61,62,64,65,69,68,70,72,73,74,75,76,77,63,79,80,81],version2x:40,layer:[48,29],volweightedaverageprop:77,impforc:37,site:17,demt:[17,19,46],archiv:22,"7_2":11,parti:17,python:[44,40],phi:[3,14,81],http:[17,40],dividedprop:29,cubic:39,effect:58,phy:52,subspher:29,eulerian:[61,25,59,30,58],expand:17,off:[7,62,3,31,8,6,60,76,16,24,35,30,33,36,38,29,47,58,69,71,78,79],center:29,nevertheless:40,well:[11,13,78,10],cfd2:[5,67],exampl:17,command:17,averagingmodel_dens:17,interpol:[16,38,39,58,65,3,24,35,29,50,6,30,14],dsphere:[66,22,45,15],latest:[17,40],distanc:[48,51],opencfd:[11,49,13,20,17],less:37,obtain:[37,67,29],tcp:40,cellvolum:12,makefil:40,wen:3,add:[17,78,40],densiti:[42,43,70,2,81],imex:[58,75],realiz:[49,30],know:81,"2nd":30,recurs:[48,73],iomodel_xi:8,twowayfil:[19,54],like:44,lost:40,constdiffsmoothingprop:10,poros:[22,45,29,15],necessari:[22,40,44,52,74,17],porou:11,schillernaumanndrag:16,momcouplemodel:17,liggght:[47,17,20,40,67,5,49,31,27,76,30,11,13,33,14],self:52,"export":40,home:40,librari:40,cfdem_liggghts_src_dir:40,vparticl:[50,22,45,24,51,29,15],restart_:31,avoid:[37,78],overlap:29,estim:70,setsourcefield:56,journal:[65,52],usag:[58,44,17,67],voidfractionmodel_trilinearvoidfract:17,disabl:71,own:[70,40],automat:[31,27,40],partspeciesfluidnam:30,van:6,transfer:[38,13,5,30,11,67],demtim:70,biggest:70,"function":[17,40,20,11,12,13,63,56,77],twowaympi:[53,54],gaussian:45,basicio:[80,21],matplot:44,cfdemcoupl:[0,17,40,20,49,41,11,13],temp:[38,30],displac:[11,13,20],whether:81,smooth:[37,51,39,62,10,60],troubl:[27,40],below:[17,7,78,40,71],limit:[38,39,20,17,22,45,49,51,29,10,11,30,13,56,15],umaxexpect:70,otherwis:[78,17,60,40,10],problem:[37,17,49,40],evalu:[25,44,79],"int":[49,44],dure:[31,78,47,27,17,33,76],voidfractionmodel_xi:34,courant:70,detail:[38,40,2,42,65,3,24,52,9,30,50,6,17,78,14,35],virtual:14,other:[0,58,37,1,60,40,43,28,72,54,61,64,8,34,17,78,57],rememb:[44,29],varieti:57,buijtenen:6,repeat:76,zhou:[17,50,35,24],june:[11,13,20],rhomix:81,printonlyatstep:78,"8th":49},objtypes:{},objnames:{},filenames:["regionModel","liggghtsCommandModel","forceModel_Archimedes","forceModel_GidaspowDrag","forceModel_fieldStore","fix_couple_cfd_force","forceModel_KochHillDrag","probeModel_noProbe","IOModel","forceModel_noDrag","smoothingModel_constDiffSmoothing","cfdemSolverPisoScalar","forceModel_particleCellVolume","cfdemSolverPisoSTM","forceModel_virtualMassForce","voidFractionModel_centreVoidFraction","forceModel_SchillerNaumannDrag","CFDEMcoupling_Manual","fix_couple_cfd","dataExchangeModel_twoWayFiles","cfdemSolverPiso","IOModel_sophIO","voidFractionModel_bigParticleVoidFraction","voidFractionModel_noVoidFraction","forceModel_gradPForce","averagingModel_dilute","dataExchangeModel_noDataExchange","liggghtsCommandModel_runLiggghts","clockModel","voidFractionModel_dividedVoidFraction","forceModel_scalarGeneralExchange","liggghtsCommandModel_execute","locateModel_standardSearch","liggghtsCommandModel_setDEMGravity","voidFractionModel","forceModel_DiFeliceDrag","momCoupleModel_noCouple","momCoupleModel","forceModel_LaEuScalarTemp","voidFractionModel_trilinearVoidFraction","githubAccess_public","regionModel_allRegion","forceModel_ArchimedesIB","forceModel","clockModel_standardClock","voidFractionModel_GaussVoidFraction","dataExchangeModel_oneWayVTK","liggghtsCommandModel_writeLiggghts","locateModel_engineSearchIB","cfdemSolverIB","forceModel_viscForce","voidFractionModel_IBVoidFraction","forceModel_ShirgaonkarIB","dataExchangeModel_twoWayMPI","dataExchangeModel","meshMotionModel_noMeshMotion","momCoupleModel_explicitCouple","scalarTransportModel","forceSubModel","averagingModel_dense","smoothingModel","averagingModel","smoothingModel_noSmoothing","forceModel_fieldTimeAverage","meshMotionModel","forceModel_MeiLift","forceModel_particleVolume","fix_couple_cfd_force_implicit","momCoupleModel_implicitCouple","IOModel_noIO","forceModel_checkCouplingInterval","probeModel","locateModel","locateModel_engineSearch","IOModel_trackIO","forceSubModel_ImEx","liggghtsCommandModel_readLiggghtsData","forceModel_volWeightedAverage","probeModel_particleProbe","clockModel_noClock","IOModel_basicIO","scalarTransportModel_generalManual"],titles:["regionModel command","liggghtsCommandModel command","forceModel_Archimedes command","forceModel_GidaspowDrag command","forceModel_fieldStore command","couple/cfd/force command","forceModel_KochHillDrag command","probeModel_noProbe command","IOModel command","forceModel_noDrag command","smoothingModel_constDiffSmoothing command","cfdemSolverPisoScalar command","forceModel_particleCellVolume command","cfdemSolverPisoSTM command","forceModel_virtualMassForce command","voidfractionModel_centreVoidFraction command","forceModel_SchillerNaumannDrag command","CFDEM(R)coupling Documentation","couple/cfd command","dataExchangeModel_twoWayFiles command","cfdemSolverPiso command","IOModel_sophIO command","voidfractionModel_bigParticleVoidFraction command","voidfractionModel_noVoidFractionVoidFraction command","forceModel_gradPForce command","averagingModel_dilute command","dataExchangeModel_noDataExchange command","liggghtsCommandModel_runLiggghts command","clockModel command","voidfractionModel_dividedVoidFraction command","forceModel_scalarGeneralExchange command","liggghtsCommandModel_execute command","locateModel_standardSearch command","liggghtsCommandModel_setDEMGravity command","voidfractionModel command","forceModel_DiFeliceDrag command","momCoupleModel_noCouple command","momCoupleModel command","forceModel_LaEuScalarTemp command","voidfractionModel_trilinearVoidFraction command","githubAccess_public","regionModel_allRegion command","forceModel_ArchimedesIB command","forceModel command","clockModel_standardClock command","voidfractionModel_GaussVoidFraction command","dataExchangeModel_oneWayVTK command","liggghtsCommandModel_writeLiggghts command","locateModel_engineSearchIB command","cfdemSolverIB command","forceModel_viscForce command","voidfractionModel_IBVoidFraction command","forceModel_ShirgaonkarIB command","dataExchangeModel_twoWayMPI command","dataExchangeModel command","meshMotionModel_noMeshMotion command","momCoupleModel_explicitCouple command","scalarTransportModel command","forceSubModel command","averagingModel_dense command","smoothingModel command","averagingModel command","smoothingModel_noSmoothing command","forceModel_fieldTimeAverage command","meshMotionModel command","forceModel_MeiLift command","forceModel_particleVolume command","couple/cfd/force/implicit command","momCoupleModel_implicitCouple command","IOModel_noIO command","forceModel_checkCouplingInterval command","probeModel command","locateModel command","locateModel_engineSearch command","IOModel_trackIO command","forceSubModel_ImEx command","liggghtsCommandModel_readLiggghtsData command","forceModel_volWeightedAverage command","probeModel_particleProbe command","clockModel_noClock command","IOModel_basicIO command","scalarTransportModel_generalManual command"],objects:{},titleterms:{execut:31,forcemodel_archimedesib:42,syntax:[0,1,2,3,4,5,7,8,9,10,6,12,60,14,15,16,67,18,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,19,41,42,43,44,45,46,47,48,66,50,51,52,53,54,55,56,57,58,59,61,62,63,64,65,69,68,70,71,72,73,74,75,76,77,78,79,80,81],voidfractionmodel_bigparticlevoidfract:22,githubaccess_publ:40,regionmodel:0,forcemodel_laeuscalartemp:38,forcemodel_gidaspowdrag:3,locatemodel_enginesearch:73,cfdemsolverpisoscalar:11,voidfractionmodel:34,liggghtscommandmodel:1,voidfractionmodel_novoidfractionvoidfract:23,probemodel:71,dataexchangemodel:54,averagingmodel_dilut:25,cfdemsolverpiso:20,solver:17,forcemodel:43,forcemodel_difelicedrag:35,dataexchangemodel_twowaympi:53,iomodel_trackio:74,clockmodel_noclock:79,momcouplemodel:37,replac:31,cfd:[5,67,18],clockmodel:28,forcemodel_kochhilldrag:6,forcemodel_virtualmassforc:14,liggghtscommandmodel_readliggghtsdata:76,forcesubmodel:58,content:17,voidfractionmodel_gaussvoidfract:45,scalartransportmodel_generalmanu:81,liggghtscommand:17,forcemodel_viscforc:50,forcemodel_volweightedaverag:77,cfdem:17,voidfractionmodel_trilinearvoidfract:39,dictionari:17,writeliggght:31,implicit:67,forcemodel_schillernaumanndrag:16,about:17,smoothingmodel_nosmooth:62,forcemodel_scalargeneralexchang:30,averagingmodel:61,tutori:17,readliggght:31,voidfractionmodel_ibvoidfract:51,forcemodel_meilift:65,restrict:[0,1,2,3,4,5,7,8,9,10,6,12,60,14,15,16,67,18,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,19,41,42,43,44,45,46,47,48,66,50,51,52,53,54,55,56,57,58,59,61,62,63,64,65,69,68,70,71,72,73,74,75,76,77,78,79,80,81],instal:17,scalartransportmodel:57,liggghtscommandmodel_setdemgrav:33,coupl:[5,17,18,67],cfdemsolverib:49,iomodel:8,regionmodel_allregion:41,locatemodel_standardsearch:32,cfdemsolverpisostm:13,forcemodel_gradpforc:24,couplingproperti:17,meshmotionmodel:64,dataexchangemodel_twowayfil:19,forc:[5,67],forcemodel_archimed:2,relat:[23,2,3,4,31,8,9,10,6,12,14,15,16,22,46,24,25,26,27,35,29,30,32,33,77,36,38,39,19,41,42,43,44,45,54,47,48,66,50,51,53,52,56,58,59,61,62,65,69,68,70,21,73,74,75,76,55,63,79,80,81],iomodel_noio:69,iomodel_sophio:21,momcouplemodel_implicitcoupl:68,"default":[5,67,18],dataexchangemodel_onewayvtk:46,can:31,meshmotionmodel_nomeshmot:55,voidfractionmodel_centrevoidfract:15,smoothingmodel:60,forcemodel_checkcouplinginterv:70,forcemodel_shirgaonkarib:52,locatemodel_enginesearchib:48,locatemodel:72,forcemodel_particlevolum:66,smoothingmodel_constdiffsmooth:10,liggghtscommandmodel_execut:31,momcouplemodel_nocoupl:36,rather:31,liggghtscommandmodel_writeliggght:47,forcemodel_fieldtimeaverag:63,probemodel_noprob:7,complex:31,document:17,forcemodel_particlecellvolum:12,clockmodel_standardclock:44,dataexchangemodel_nodataexchang:26,voidfractionmodel_dividedvoidfract:29,forcesubmodel_imex:75,forcemodel_nodrag:9,iomodel_basicio:80,momcouplemodel_explicitcoupl:56,forcemodel_fieldstor:4,descript:[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,67,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,69,68,70,71,72,73,74,75,76,77,78,79,80,81],liggghtscommandmodel_runliggght:27,exampl:[0,1,2,3,4,5,7,8,9,10,6,12,60,14,15,16,67,18,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,19,41,42,43,44,45,46,47,48,66,50,51,52,53,54,55,56,57,58,59,61,62,63,64,65,69,68,70,71,72,73,74,75,76,77,78,79,80,81],command:[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,67,18,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,19,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,69,68,70,71,72,73,74,75,76,77,78,79,80,81],averagingmodel_dens:59,model:17,probemodel_particleprob:78}}) \ No newline at end of file diff --git a/doc/_build/html/voidFractionModel_dividedVoidFraction.html b/doc/_build/html/voidFractionModel_dividedVoidFraction.html index 8c7dab5..e42fdfa 100644 --- a/doc/_build/html/voidFractionModel_dividedVoidFraction.html +++ b/doc/_build/html/voidFractionModel_dividedVoidFraction.html @@ -175,9 +175,17 @@ dividedProps

        Description

        -

        The divided voidFraction model is supposed to be used when a particle (or its representation) is in the size range of a CFD cell. Satellite points are used to divide the particle’s volume to the touched cells.

        +

        The divided voidFraction model is supposed to be used when a particle (or its representation) is in the size range of a CFD cell. The particle has radius R and it’s volume is divided in 29 non-overlapping regions of equal volume. The centroids of these volumes are then used to reproduce each volume. The first volume is a sphere with the center coinciding with the particle center. Radius of this subsphere can be found as follows:

        +_images/voidfractionModel_divided_pic2.png +

        The rest volume is a spherical layer that must is divided in 2 layers of equal volume. Position of the border between these two spherical layers in radial direction can be easily obtained:

        +_images/voidfractionModel_divided_pic3.png +

        Each of these spherical layers is later divided in 14 elements of equal volume. Position of the centroid point in radial direction of each volume in the first spherical layer is as follows

        +_images/voidfractionModel_divided_pic4.png +

        Similarly, for the second spherical layer remembering that the external radius is the particle radius:

        +_images/voidfractionModel_divided_pic5.png

        The region of influence of a particle can be increased artificially by “porosity”, which blows up the particles, but keeps their volume (for voidfraction calculation) constant.

        -

        The particle volume occupied in the CFD domain can be adjusted by the parameter “weight”, using Vparticle=dsphere^3*pi/6*weight.

        +

        The particle volume occupied in the CFD domain can be adjusted by the parameter “weight”, using

        +_images/voidfractionModel_divided_pic6.png

        In the basic implementation of solvers, the void fraction is calculated based on all particles. Depending on the solver used, the void fraction calculation is also performed for a certain type of particles. The void fraction calculation is based on a three-step approach (reset, set and interpolate), i.e., the void fraction is time interpolated from a previous and a next void fraction field. Appropriate names for these fields have to be specified in the sub-dictionaries voidFracFieldNamesPrev and voidFracFieldNamesNext in the couplingProperties dictionary.

        diff --git a/doc/cfdemSolverPisoSTM.txt b/doc/cfdemSolverPisoSTM.txt new file mode 100644 index 0000000..62e9b15 --- /dev/null +++ b/doc/cfdemSolverPisoSTM.txt @@ -0,0 +1,21 @@ +"CFDEMproject WWW Site"_lws - "CFDEM Commands"_lc :c + +:link(lws,http://www.cfdem.com) +:link(lc,CFDEMcoupling_Manual.html#comm) + +:line + +cfdemSolverPisoSTM command :h3 + +[Description:] + +"cfdemSolverPisoSTM" is a coupled CFD-DEM solver using CFDEMcoupling, an open source parallel coupled CFD-DEM framework. Based on pisoFoam(R)(*), a finite volume based solver for turbulent Navier-Stokes equations applying PISO algorithm, "cfdemSolverPisoSTM" has additional functionality for a coupling to the DEM code "LIGGGHTS" as well as a scalar transport equation. The volume averaged Navier-Stokes Equations are solved accounting for momentum exchange and volume displacement of discrete particles, whose trajectories are calculated in the DEM code LIGGGHTS. Scalar transport equations coupled to scalar properties of the particle phase, (e.g. convective heat transfer) in a fluid granular system can be modeled with "cfdemSolverPisoSTM". + +see: + +GONIVA, C., KLOSS, C., HAGER,A. and PIRKER, S. (2010): "An Open Source CFD-DEM Perspective", Proc. of OpenFOAM Workshop, Göteborg, June 22.-24. + +:line +(*) This offering is not approved or endorsed by OpenCFD Limited, the producer of the OpenFOAM software and owner of the OPENFOAM® and OpenCFD® trade marks. + +:line diff --git a/doc/fix_couple_cfd.txt b/doc/fix_couple_cfd.txt new file mode 100644 index 0000000..733d2eb --- /dev/null +++ b/doc/fix_couple_cfd.txt @@ -0,0 +1,38 @@ +"CFDEMproject WWW Site"_lws - "CFDEM Commands"_lc :c + +:link(lws,http://www.cfdem.com) +:link(lc,CFDEMcoupling_Manual.html#comm) + +:line + +couple/cfd command :h3 + +[Syntax:] + +fix ID group-ID couple/cfd couple_every N mpi :pre + +ID, group-ID are documented in "fix"_fix.html command :ulb,l +couple/cfd = style name of this fix command :l +couple_every = obligatory keyword :l +N = number of DEM time steps between two coupling steps :l +mpi = mandatory keyword :ls +:ule + +[Examples:] + +fix cfd all couple/cfd couple_every 1000 mpi + +[Description:] + +This fix is responsible for the coupling between CFD and DEM calculation, i.e. for pushing and pulling of properties. + +[Restrictions:] + +None. + +[Related Commands:] +"fix couple/cfd/force"_fix_couple_cfd_force.html + +[Default:] + +None diff --git a/doc/fix_couple_cfd_force.txt b/doc/fix_couple_cfd_force.txt new file mode 100644 index 0000000..26fe1dc --- /dev/null +++ b/doc/fix_couple_cfd_force.txt @@ -0,0 +1,37 @@ +"CFDEMproject WWW Site"_lws - "CFDEM Commands"_lc :c + +:link(lws,http://www.cfdem.com) +:link(lc,CFDEMcoupling_Manual.html#comm) + +:line + +couple/cfd/force command :h3 + +[Syntax:] + +fix ID group-ID couple/cfd/force :pre + +ID, group-ID are documented in "fix"_fix.html command :ulb,l +couple/cfd = style name of this fix command :l + +:ule + +[Examples:] +fix cfd all couple/cfd couple_every 100 mpi +fix cfd2 all couple/cfd/force + +[Description:] + +The command couple/cfd/force can only be used in combination with "fix_couple_cfd"_fix_couple_cfd.html. This model transfers the force that the fluid exceeds on each particle to the DEM calculation. At every coupling time step the force term, which contains contributions from all force models active in the CFD calculation, is passed on to LIGGGHTS(R). This (constant) term is then used in the particle calculations at every DEM time step until the next coupling takes place. + + +[Restrictions:] + +None + +[Related Commands:] +"fix couple/cfd"_fix_couple_cfd.html + +[Default:] + +None diff --git a/doc/fix_couple_cfd_force_implicit.txt b/doc/fix_couple_cfd_force_implicit.txt new file mode 100644 index 0000000..da0bf11 --- /dev/null +++ b/doc/fix_couple_cfd_force_implicit.txt @@ -0,0 +1,48 @@ +"CFDEMproject WWW Site"_lws - "CFDEM Commands"_lc :c + +:link(lws,http://www.cfdem.com) +:link(lc,CFDEMcoupling_Manual.html#comm) + +:line + +couple/cfd/force/implicit command :h3 + +[Syntax:] + +fix ID group-ID couple/cfd/force/implicit args:pre + +ID, group-ID are documented in "fix"_fix.html command :ulb,l +couple/cfd = style name of this fix command :l +args = list of optional arguments :l + +:ule + +[Examples:] +fix cfd all couple/cfd couple_every 100 mpi +fix cfd2 all couple/cfd/force/implicit + +fix cfd all couple/cfd couple_every 100 mpi +fix cfd2 all couple/cfd/force/implicit transfer_type yes + +fix cfd all couple/cfd couple_every 100 mpi +fix cfd2 all couple/cfd/force/implicit CrankNicolson 0.5 CAddRhoFluid 0.4 + +[Description:] + +The usage of the couple/cfd/force/implicit can only be used in combination with a "fix couple/cfd"_fix_couple_cfd.html command. At every coupling time step the drag coefficient and the fluid velocity is transferred to LIGGGHTS(R). Depending on the varying particle velocity (and thus relative velocity between fluid and particles) the drag force on the particles is calculated at every DEM time step until new data is obtained in the next coupline time step. + +If the Crank-Nicolson keyword is present, Crank-Nicolson integration scheme with given CN is applied. + +When the CAddRhoFluid keyword is active, couple/cfd/force/implicit will consider added mass. + + +[Restrictions:] + +None + +[Related Commands:] +"fix couple/cfd"_fix_couple_cfd.html + +[Default:] + +None diff --git a/doc/forceModel_particleVolume.txt b/doc/forceModel_particleVolume.txt index 2386b40..b621ab5 100644 --- a/doc/forceModel_particleVolume.txt +++ b/doc/forceModel_particleVolume.txt @@ -42,7 +42,7 @@ particleVolumeProps [Description:] -This "forceModel" does not influence the particles or the simulation - it is a postprocessing tool! The total volume of the particles is calculated. +This "forceModel" does not influence the particles or the simulation - it is a postprocessing tool! The total volume of the particles located in the CFD domain is calculated. [Restrictions:] diff --git a/doc/liggghtsCommandModel_runLiggghts.txt b/doc/liggghtsCommandModel_runLiggghts.txt index a1f0ef4..e82ee40 100644 --- a/doc/liggghtsCommandModel_runLiggghts.txt +++ b/doc/liggghtsCommandModel_runLiggghts.txt @@ -20,6 +20,7 @@ runLiggghtsProps \{ preNo true; verbose; (optional) + runFirst true; (optional, default false) \} :pre [Examples:] @@ -31,7 +32,7 @@ liggghtsCommandModels [Description:] -The liggghtsCommand models can be used to execute a LIGGGHTS command during a CFD run. The "runLiggghts" command executes the command "run $nrDEMsteps", where $nrDEMsteps is automatically set according to the coupling intervals, every coupling step. Optionally a dictionary called runLiggghtsProps can be specified where the "preNo" switch can be set, which uses the command "run $nrDEMsteps pre no" for every time step except the first. +The liggghtsCommand models can be used to execute a LIGGGHTS command during a CFD run. The "runLiggghts" command executes the command "run $nrDEMsteps", where $nrDEMsteps is automatically set according to the coupling intervals, every coupling step. Optionally a dictionary called runLiggghtsProps can be specified where the "preNo" switch can be set, which uses the command "run $nrDEMsteps pre no" for every time step except the first. If the runFirst option is chosen the run command is executed only at the first coupling step. [Restrictions:] Warning: the "pre no" option can cause troubles (dump data of particles changing the domain might be erroneous)! diff --git a/doc/scalarTransportModel.txt b/doc/scalarTransportModel.txt index 9e16117..644a8d5 100644 --- a/doc/scalarTransportModel.txt +++ b/doc/scalarTransportModel.txt @@ -9,70 +9,22 @@ scalarTransportModel command :h3 [Syntax:] -Defined in scalarTransportProperties dictionary. A variety of derived classes exist that implement different physics of the scalarTransportModel. Here, the most general one, i.e., 'generalManual' is discussed. If no scalar transport shall be used, use the model 'none'. +Defined in scalarTransportProperties dictionary. A variety of derived classes exist that implement different physics of the scalarTransportModel. If no scalar transport shall be used, use the model 'none'. -generalManualProps -\{ - phiFieldName {phiName}; - voidfractionFieldName {voidfractionName}; - ScT {scalar1}; - PrT {scalar2}; - cpVolumetric {scalar3}; - cpVolumetricFieldName {word1}; - rhoMixFieldName {word2}; - eulerianFields - ( - {C} - {T} - ); :pre -\} :pre - -{phiName} = (optional) name of the surface field for the SUPERFICIAL flux, default "phi". :ulb,l -{voidfractionName} = (optional) name of the finite volume voidfraction field, default "voidfraction". :l -{scalar1} = (optional, default 0.7) turbulent Schmidt Nr, set to large value to suppress turbulent species transport :l -{scalar2} = (optional, default 0.7) turbulent Prandtl Nr, set to large value to suppress turbulent heat transport :l -{scalar3} = (optional, alternatively define word1) volumetric heat capacity as a global constant (in contrast to cpVolumetricFieldName for a field). This is the mixture density times the heat capacity [J/K/(m_voidspace)^3], will only be used if cpVolumetricFieldName, or updateMixtureProperties = false :l -{word1} = (optional, alternatively define scalar3) volumetric heat capacity as a field :l -{word3} = mixture density field :l -{C} = concentration field name :l -{T} = temperature field name :l -:ule +scalarTransportModel model; :pre +model = name of the scalarTransportModel to be applied :ul [Examples:] -generalManualProps -\{ - phiFieldName "phi"; - ScT 0.7; - PrT 0.7; - cpVolumetric 1196; - rhoMixFieldName "rhoMix"; - eulerianFields - ( - C - T - ); :pre +scalarTransportModel generalManual; :pre - fvOptionsC - \{ - \}; :pre - fvOptionsT - \{ - \}; :pre - -\} :pre +Note: This examples list might not be complete - please look for other models (scalarTransportModel_XY) in this documentation. [Description:] Solves the advection-dispersion transport equation for a dilute scalar quantity in the fluid phase. fvOptions can be specified to model sources, etc. in the fluid phase. Exchange models with a particle phase can be included by including appropriate forceModels in couplingProperties. +[Restrictions:] none. -[Restrictions:] -The user MUST ensure the "phi" field is SUPERFICIAL (i.e., the fluid-phase velocity times voidfraction interpolatedat the cells' faces). The code cannot know or check whether this is the case, so the user of a certain solver has to ensure this. - - -[Related commands:] - -none. - +[Default:] none. diff --git a/doc/scalarTransportModel_generalManual.txt b/doc/scalarTransportModel_generalManual.txt new file mode 100644 index 0000000..6a64454 --- /dev/null +++ b/doc/scalarTransportModel_generalManual.txt @@ -0,0 +1,78 @@ +"CFDEMproject WWW Site"_lws - "CFDEM Commands"_lc :c + +:link(lws,http://www.cfdem.com) +:link(lc,CFDEMcoupling_Manual.html#comm) + +:line + +scalarTransportModel_generalManual command :h3 + +[Syntax:] + +Defined in scalarTransportProperties dictionary. + +scalarTransportModel generalManual; + +generalManualProps +\{ + phiFieldName {phiName}; + voidfractionFieldName {voidfractionName}; + ScT {scalar1}; + PrT {scalar2}; + cpVolumetric {scalar3}; + cpVolumetricFieldName {word1}; + rhoMixFieldName {word2}; + eulerianFields + ( + {C} + {T} + ); :pre +\} :pre + +{phiName} = (optional) name of the surface field for the SUPERFICIAL flux, default "phi". :ulb,l +{voidfractionName} = (optional) name of the finite volume voidfraction field, default "voidfraction". :l +{scalar1} = (optional, default 0.7) turbulent Schmidt Nr, set to large value to suppress turbulent species transport :l +{scalar2} = (optional, default 0.7) turbulent Prandtl Nr, set to large value to suppress turbulent heat transport :l +{scalar3} = (optional, alternatively define word1) volumetric heat capacity as a global constant (in contrast to cpVolumetricFieldName for a field). This is the mixture density times the heat capacity [J/K/(m_voidspace)^3], will only be used if cpVolumetricFieldName, or updateMixtureProperties = false :l +{word1} = (optional, alternatively define scalar3) volumetric heat capacity as a field :l +{word3} = mixture density field :l +{C} = concentration field name :l +{T} = temperature field name :l +:ule + +[Examples:] + +generalManualProps +\{ + phiFieldName "phi"; + ScT 0.7; + PrT 0.7; + cpVolumetric 1196; + rhoMixFieldName "rhoMix"; + eulerianFields + ( + C + T + ); :pre + + fvOptionsC + \{ + \}; :pre + fvOptionsT + \{ + \}; :pre + +\} :pre + +[Description:] + +Solves the advection-dispersion transport equation for a dilute scalar quantity in the fluid phase. fvOptions can be specified to model sources, etc. in the fluid phase. Exchange models with a particle phase can be included by including appropriate forceModels in couplingProperties. + +[Restrictions:] +The user MUST ensure the "phi" field is SUPERFICIAL (i.e., the fluid-phase velocity times voidfraction interpolatedat the cells' faces). The code cannot know or check whether this is the case, so the user of a certain solver has to ensure this. + + +[Related commands:] + +none. + diff --git a/doc/voidFractionModel_dividedVoidFraction.txt b/doc/voidFractionModel_dividedVoidFraction.txt index 7b55fc9..7917d55 100644 --- a/doc/voidFractionModel_dividedVoidFraction.txt +++ b/doc/voidFractionModel_dividedVoidFraction.txt @@ -42,11 +42,27 @@ dividedProps [Description:] -The divided voidFraction model is supposed to be used when a particle (or its representation) is in the size range of a CFD cell. Satellite points are used to divide the particle's volume to the touched cells. +The divided voidFraction model is supposed to be used when a particle (or its representation) is in the size range of a CFD cell. The particle has radius R and it's volume is divided in 29 non-overlapping regions of equal volume. The centroids of these volumes are then used to reproduce each volume. The first volume is a sphere with the center coinciding with the particle center. Radius of this subsphere can be found as follows: + +:c,image(Eqs/voidfractionModel_divided_pic2.png) + +The rest volume is a spherical layer that must is divided in 2 layers of equal volume. Position of the border between these two spherical layers in radial direction can be easily obtained: + +:c,image(Eqs/voidfractionModel_divided_pic3.png) + +Each of these spherical layers is later divided in 14 elements of equal volume. Position of the centroid point in radial direction of each volume in the first spherical layer is as follows + +:c,image(Eqs/voidfractionModel_divided_pic4.png) + +Similarly, for the second spherical layer remembering that the external radius is the particle radius: + +:c,image(Eqs/voidfractionModel_divided_pic5.png) The region of influence of a particle can be increased artificially by "porosity", which blows up the particles, but keeps their volume (for voidfraction calculation) constant. -The particle volume occupied in the CFD domain can be adjusted by the parameter "weight", using Vparticle=dsphere^3*pi/6*weight. +The particle volume occupied in the CFD domain can be adjusted by the parameter "weight", using + +:c,image(Eqs/voidfractionModel_divided_pic6.png). In the basic implementation of solvers, the void fraction is calculated based on all particles. Depending on the solver used, the void fraction calculation is also performed for a certain type of particles. The void fraction calculation is based on a three-step approach (reset, set and interpolate), i.e., the void fraction is time interpolated from a previous and a next void fraction field. Appropriate names for these fields have to be specified in the sub-dictionaries voidFracFieldNamesPrev and voidFracFieldNamesNext in the couplingProperties dictionary. diff --git a/src/eulerian/fvOptionsCFDEM/Make/files b/src/eulerian/fvOptionsCFDEM/Make/files new file mode 100644 index 0000000..b87f893 --- /dev/null +++ b/src/eulerian/fvOptionsCFDEM/Make/files @@ -0,0 +1,13 @@ +/* sources */ +derivedSources=sources/derived +derivedConstraints=constraints/derived + +$(derivedSources)/pressureGradientExplicitSourceIB/pressureGradientExplicitSourceIB.C +$(derivedSources)/pressureGradientExplicitSourceIB/pressureGradientExplicitSourceIBIO.C +$(derivedSources)/pressureGradientTorus/pressureGradientTorus.C +$(derivedSources)/pressureGradientTorus/pressureGradientTorusIO.C +$(derivedSources)/meanSupVelocityForce/meanSupVelocityForce.C + +$(derivedConstraints)/fixedBulkConstraint/fixedBulkConstraint.C + +LIB = $(CFDEM_LIB_DIR)/libfvOptionsCFDEM diff --git a/src/eulerian/fvOptionsCFDEM/Make/options b/src/eulerian/fvOptionsCFDEM/Make/options new file mode 100644 index 0000000..395b3b4 --- /dev/null +++ b/src/eulerian/fvOptionsCFDEM/Make/options @@ -0,0 +1,26 @@ +sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) +sinclude $(RULES)/mplib$(WM_MPLIB) + +GIT_VERSION := $(shell git describe --dirty --always --tags) +PFLAGS+= -DGITVERSION=\"$(GIT_VERSION)\" +PFLAGS+= -DDEBUGFLAG=\"$(DEBUG)\" +PFLAGS+= -DCFDEMWMPROJECTVERSION="$(CFDEM_WM_PROJECT_VERSION)" + +include $(CFDEM_ADD_LIBS_DIR)/$(CFDEM_ADD_LIBS_NAME) + +EXE_INC = \ + $(PFLAGS) \ + $(PINC) \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/fvOptions/lnInclude \ + -I$(CFDEM_OFVERSION_DIR) \ + + +LIB_LIBS = \ + $(PLIBS) \ + -lfiniteVolume \ + -lsampling \ + -lmeshTools \ + -lfvOptions diff --git a/src/eulerian/fvOptionsCFDEM/sources/derived/meanSupVelocityForce/meanSupVelocityForce.C b/src/eulerian/fvOptionsCFDEM/sources/derived/meanSupVelocityForce/meanSupVelocityForce.C new file mode 100644 index 0000000..c00437a --- /dev/null +++ b/src/eulerian/fvOptionsCFDEM/sources/derived/meanSupVelocityForce/meanSupVelocityForce.C @@ -0,0 +1,249 @@ +/*---------------------------------------------------------------------------*\ + CFDEMcoupling - Open Source CFD-DEM coupling + + CFDEMcoupling is part of the CFDEMproject + www.cfdem.com + Christoph Goniva, christoph.goniva@cfdem.com + Copyright (C) 2011 OpenFOAM Foundation + Copyright (C) 2012- DCS Computing GmbH,Linz +------------------------------------------------------------------------------- +License + This file is part of CFDEMcoupling. + + CFDEMcoupling is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + CFDEMcoupling is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with CFDEMcoupling. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "meanSupVelocityForce.H" +#include "addToRunTimeSelectionTable.H" + +#include "DimensionedField.H" +#include "fvMatrices.H" + +// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // + +namespace Foam +{ +namespace fv +{ + defineTypeNameAndDebug(meanSupVelocityForce, 0); + + addToRunTimeSelectionTable + ( + option, + meanSupVelocityForce, + dictionary + ); +} +} + +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::fv::meanSupVelocityForce::meanSupVelocityForce +( + const word& sourceName, + const word& modelType, + const dictionary& dict, + const fvMesh& mesh +) +: + meanVelocityForce(sourceName, modelType, dict, mesh), + voidfractionName_( coeffs_.lookup("voidfractionField") ), + voidfraction_( mesh.lookupObject(voidfractionName_) ), + modelName_(modelType), + twoPhase_( coeffs_.lookupOrDefault("twoPhase",false) ), + alpha_ + ( + IOobject + ( + "voidfractionPrev", + mesh_.time().timeName(), + mesh_, + IOobject::NO_READ,//MUST_READ, + IOobject::NO_WRITE + ), + mesh_, + dimensionedScalar("ones", dimensionSet(0,0,0,0,0), 1) + ) + +{ + Warning << "THE FVOPTION meanSupVelocityForce has not been tested/validated!!! " << endl; +} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // +void Foam::fv::meanSupVelocityForce::correct(volVectorField& U) +{ + if (twoPhase_) + { + word alphaName = coeffs_.lookup("alphaField"); + alpha_ = mesh_.lookupObject(alphaName); + } + + // making sure that alpha is only set almost-only fluid regions + forAll(alpha_,cellI) + { + if(alpha_[cellI]<0.9999) + alpha_[cellI]=0; + } + + const scalarField& rAU = rAPtr_().internalField(); + + // Integrate flow variables over cell set + scalar rAUave = 0.0; + const scalarField& cv = mesh_.V(); + scalar totV = 0.0; + forAll(cells_,i) + { + label cellI = cells_[i]; + scalar volCell = cv[cellI]; + totV += volCell*alpha_[cellI]; + rAUave += rAU[cellI]*volCell*alpha_[cellI]; + } + + // Collect accross all processors + reduce(rAUave, sumOp()); + reduce(totV, sumOp()); + V_=totV; + + // Volume averages + rAUave /= V_; + + scalar magUbarAve = this->magUbarAve(U); + + // Calculate the pressure gradient increment needed to adjust the average + // flow-rate to the desired value + dGradP_ = relaxation_*(mag(Ubar_) - magUbarAve)/rAUave; + + // Apply correction to velocity field + if (modelName_=="B" || modelName_=="Bfull") + { + forAll(cells_, i) + { + label cellI = cells_[i]; + U[cellI] += flowDir_*rAU[cellI]*dGradP_*alpha_[cellI]; + } + } + else + { + forAll(cells_, i) + { + label cellI = cells_[i]; + U[cellI] += voidfraction_[cellI]*flowDir_*rAU[cellI]*dGradP_*alpha_[cellI]; + } + } + + scalar gradP = gradP0_ + dGradP_; + + Info<< "Pressure gradient source: uncorrected Ubar = " << magUbarAve + << ", pressure gradient = " << gradP << endl; + + writeProps(gradP); + + Warning << "Pressure gradient force is neglected in this model!!" << endl; + + // The following lines would compensate the error that occurs due to the splitting + // of the pressure gradient. However, the particleCloud_ object is currently not + // accessible here. + /*scalar ds(0.0); + scalar Vs(0.0); + label cellI=0; + for(int index = 0;index < particleCloud_.numberOfParticles(); index++) + { + //if(mask[index][0]) + //{ + cellI = particleCloud_.cellIDs()[index][0]; + + if (cellI > -1) // particle found on this processor + { + //Calc the particle volume + ds = 2*particleCloud_.radius(index); + Vs = ds*ds*ds*M_PI/6; + + // set force on particle + for(int j=0;j<3;j++) + { + // calc particle's static pressure gradient force + particleCloud_.DEMForces()[index][j] -= Vs*gradP*flowDir_[j]; + } + } + }*/ + + +} + +void Foam::fv::meanSupVelocityForce::addSup +( + fvMatrix& eqn, + const label fieldI +) +{ + DimensionedField Su + ( + IOobject + ( + name_ + fieldNames_[fieldI] + "Sup", + mesh_.time().timeName(), + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + mesh_, + dimensionedVector("zero", eqn.dimensions()/dimVolume, vector::zero) + ); + + scalar gradP = gradP0_ + dGradP_; + + if (modelName_=="B" || modelName_=="Bfull") + { + UIndirectList(Su, cells_) = flowDir_*gradP; + } + else + { + UIndirectList(Su, cells_) = voidfraction_*flowDir_*gradP*alpha_; + } + + eqn += Su; + +} + +Foam::scalar Foam::fv::meanSupVelocityForce::magUbarAve +( + const volVectorField& U +) const +{ + scalar magUbarAve = 0.0; + + const scalarField& cv = mesh_.V(); + forAll(cells_, i) + { + label cellI = cells_[i]; + scalar volCell = cv[cellI]; + magUbarAve += (flowDir_ & U[cellI])*volCell*alpha_[cellI]*voidfraction_[cellI]; + } + + reduce(magUbarAve, sumOp()); + + magUbarAve /= V_; + + return magUbarAve; +} + + + + +// ************************************************************************* // diff --git a/src/eulerian/fvOptionsCFDEM/sources/derived/meanSupVelocityForce/meanSupVelocityForce.H b/src/eulerian/fvOptionsCFDEM/sources/derived/meanSupVelocityForce/meanSupVelocityForce.H new file mode 100644 index 0000000..b1a529a --- /dev/null +++ b/src/eulerian/fvOptionsCFDEM/sources/derived/meanSupVelocityForce/meanSupVelocityForce.H @@ -0,0 +1,144 @@ +/*---------------------------------------------------------------------------*\ + CFDEMcoupling - Open Source CFD-DEM coupling + + CFDEMcoupling is part of the CFDEMproject + www.cfdem.com + Christoph Goniva, christoph.goniva@cfdem.com + Copyright (C) 2011 OpenFOAM Foundation + Copyright (C) 2012- DCS Computing GmbH,Linz +------------------------------------------------------------------------------- +License + This file is part of CFDEMcoupling. + + CFDEMcoupling is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + CFDEMcoupling is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with CFDEMcoupling. If not, see . + +Description + This code is based on meanSupVelocity model of OpenFOAM 3.0.x + It is extended to account for the presence of a particle phase. + + Calculates and applies the force necessary to maintain the specified mean + velocity. + + Note: Currently only handles kinematic pressure (incompressible solvers). + + \heading Source usage + Example usage: + \verbatim + meanSupVelocityForceCoeffs + { + selectionMode all; // Apply force to all cells + fieldNames (U); // Name of velocity field + Ubar (10.0 0 0); // Desired mean velocity + relaxation 0.2; // Optional relaxation factor + } + \endverbatim + +\*---------------------------------------------------------------------------*/ + +#ifndef meanSupVelocityForce_H +#define meanSupVelocityForce_H + +#include "meanVelocityForce.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace fv +{ + +/*---------------------------------------------------------------------------*\ + Class meanSupVelocityForce Declaration +\*---------------------------------------------------------------------------*/ + +class meanSupVelocityForce +: + public meanVelocityForce +{ +protected: + + // Protected data + + + // Protected Member Functions + + virtual scalar magUbarAve(const volVectorField& U) const; + + +private: + + // Private Member Functions + + //- Disallow default bitwise copy construct + meanSupVelocityForce(const meanSupVelocityForce&); + + //- Disallow default bitwise assignment + void operator=(const meanSupVelocityForce&); + + const word voidfractionName_; + + const volScalarField& voidfraction_; + + const word modelName_; + + const bool twoPhase_; + + volScalarField alpha_; + + +public: + + //- Runtime type information + TypeName("meanSupVelocityForce"); + + + // Constructors + + //- Construct from explicit source name and mesh + meanSupVelocityForce + ( + const word& sourceName, + const word& modelType, + const dictionary& dict, + const fvMesh& mesh + ); + + + // Member Functions + + // Evaluate + + virtual void correct(volVectorField& U); + + virtual void addSup + ( + fvMatrix& eqn, + const label fieldI + ); + + // IO + +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace fv +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/eulerian/scalarTransportModelsCFDEM/Make/files b/src/eulerian/scalarTransportModelsCFDEM/Make/files index f77abd3..07fbf6a 100644 --- a/src/eulerian/scalarTransportModelsCFDEM/Make/files +++ b/src/eulerian/scalarTransportModelsCFDEM/Make/files @@ -3,6 +3,7 @@ scalarTransportModel/newScalarTransportModel.C /*Sub-Level*/ temperatureModel/temperatureModel.C +solidTemperatureModel/solidTemperatureModel.C generalManual/generalManual.C noTransport/noTransport.C generalPhaseChange/generalPhaseChange.C diff --git a/src/eulerian/scalarTransportModelsCFDEM/Make/options b/src/eulerian/scalarTransportModelsCFDEM/Make/options index 303cf78..089ebc0 100644 --- a/src/eulerian/scalarTransportModelsCFDEM/Make/options +++ b/src/eulerian/scalarTransportModelsCFDEM/Make/options @@ -9,14 +9,16 @@ PFLAGS+= -DCFDEMWMPROJECTVERSION="$(CFDEM_WM_PROJECT_VERSION)" include $(CFDEM_ADD_LIBS_DIR)/$(CFDEM_ADD_LIBS_NAME) EXE_INC = \ - $(PFLAGS) \ - $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \ + $(PFLAGS) \ + $(PINC) \ + $(CFDEM_ADD_INCOMPTURBMOD_PATHS) \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ + -I$(CFDEM_LIGGGHTS_SRC_DIR) LIB_LIBS = \ -L$(CFDEM_LIB_DIR)\ diff --git a/src/eulerian/scalarTransportModelsCFDEM/eulerianScalarField/eulerianScalarField.C b/src/eulerian/scalarTransportModelsCFDEM/eulerianScalarField/eulerianScalarField.C index dca778f..dde2857 100644 --- a/src/eulerian/scalarTransportModelsCFDEM/eulerianScalarField/eulerianScalarField.C +++ b/src/eulerian/scalarTransportModelsCFDEM/eulerianScalarField/eulerianScalarField.C @@ -20,6 +20,7 @@ License #include "error.H" #include "eulerianScalarField.H" +#include "OFversion.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -199,7 +200,7 @@ void eulerianScalarField::pullCloudFields() const // ************************************************************ void eulerianScalarField::update(surfaceScalarField phi, volScalarField voidfraction, volScalarField nuEff, scalar Sc, bool limitDiffusion) const { - scalar oneByCpVolumetric = 1./cpVolumetric_; + scalar oneByCpVolumetric = 1./(cpVolumetric_+SMALL); //Normalize source in case we have a temperature field if(fieldType_=="temperature") { @@ -211,8 +212,14 @@ void eulerianScalarField::update(surfaceScalarField phi, volScalarField voidfrac else { const volScalarField& cpVolumetricField_(particleCloud_.mesh().lookupObject (cpVolumetricFieldName_)); - mSource_ /= cpVolumetricField_; - mSourceKImpl_ /= cpVolumetricField_; + + #if defined(version40) || defined(versionv1612plus) + mSource_ /= cpVolumetricField_+SMALL; + mSourceKImpl_ /= cpVolumetricField_+SMALL; + #else + mSource_.internalField() /= cpVolumetricField_.internalField()+SMALL; + mSourceKImpl_.internalField() /= cpVolumetricField_.internalField()+SMALL; + #endif } } diff --git a/src/eulerian/scalarTransportModelsCFDEM/generalManual/generalManual.C b/src/eulerian/scalarTransportModelsCFDEM/generalManual/generalManual.C index 8ac530b..464daef 100644 --- a/src/eulerian/scalarTransportModelsCFDEM/generalManual/generalManual.C +++ b/src/eulerian/scalarTransportModelsCFDEM/generalManual/generalManual.C @@ -121,6 +121,10 @@ void generalManual::setSources() for (int i=0;i("allowAdjustTimeStep", false)), solveFlow_(true), solveScalarTransport_(true), - verbose_(false), + verbose_(couplingProperties_.lookupOrDefault("verbose", false)), debug_(false), allowCFDsubTimestep_(true), ignore_(false), @@ -127,6 +128,7 @@ Foam::cfdemCloud::cfdemCloud dimensionedScalar("zero", dimensionSet(0,0,-1,0,0), 0) // 1/s ), checkPeriodicCells_(false), + meshHasUpdated_(false), turbulence_ ( #if defined(version24Dev) @@ -264,6 +266,9 @@ Foam::cfdemCloud::cfdemCloud averagingM().applyDebugSettings(debugMode()); //-- + //push dummy to type-specific cg factor since types start with 1 + cgTypeSpecific_.push_back(-1); + cgTypeSpecificDifferent=false; dataExchangeM().setCG(); Info << "If BC are important, please provide volScalarFields -imp/expParticleForces-" << endl; @@ -283,7 +288,6 @@ Foam::cfdemCloud::cfdemCloud if (couplingProperties_.found("treatVoidCellsAsExplicitForce")) treatVoidCellsAsExplicitForce_ = readBool(couplingProperties_.lookup("treatVoidCellsAsExplicitForce")); - if (couplingProperties_.found("verbose")) verbose_=true; if (couplingProperties_.found("ignore")) ignore_=true; if (turbulenceModelType_=="LESProperties") { @@ -320,6 +324,11 @@ Foam::cfdemCloud::cfdemCloud forceModel_[i]().applyDebugSettings(debugMode()); } + if (nrForceModels()[momCoupleModels_.size()]; for (int i=0;i("adjustTimeStep", false) && !allowAdjustTimeStep_ ) + { + FatalError << "cfdemCloud:: you want to adjustTimeStep in controlDict. This is not allowed in this version of CFDEM." + << abort(FatalError); + } } // * * * * * * * * * * * * * * * * Destructors * * * * * * * * * * * * * * // @@ -477,6 +493,21 @@ void Foam::cfdemCloud::setNumberOfParticles(int nP) } } +void Foam::cfdemCloud::setNumberOfClumps(int nC) +{ + //Info << "Foam::cfdemCloud::setNumberOfClumps(int nC) ... do nothing" << endl; +} + +void Foam::cfdemCloud::setPositionsCM(label n,double* pos) +{ + //Info << "Foam::cfdemCloud::setPositionsCM(int nC) ... do nothing" << endl; +} + +void Foam::cfdemCloud::setCellIDsCM(label n,int* ID) +{ + //Info << "Foam::cfdemCloud::setCellIDsCM(int nC) ... do nothing" << endl; +} + void Foam::cfdemCloud::findCells() { locateM().findCell(NULL,positions_,cellIDs_,numberOfParticles()); @@ -717,6 +748,10 @@ bool Foam::cfdemCloud::evolve // IMPLICIT FORCE CONTRIBUTION AND SOLVER USE EXACTLY THE SAME AVERAGED // QUANTITIES AT THE GRID! Info << "\n timeStepFraction() = " << dataExchangeM().timeStepFraction() << endl; + if( dataExchangeM().timeStepFraction() > 1.000000000000000001) + { + FatalError << "cfdemCloud::dataExchangeM().timeStepFraction()>1: Do not do this, since dangerous. This might be due to the fact that you used a adjustable CFD time step. Please use a fixed CFD time step." << abort(FatalError); + } clockM().start(24,"interpolateEulerFields"); // update voidFractionField diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H index 42077ca..f15b412 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H @@ -89,11 +89,13 @@ protected: IOdictionary liggghtsCommandDict_; + Switch allowAdjustTimeStep_; + Switch solveFlow_; Switch solveScalarTransport_; - bool verbose_; + Switch verbose_; bool debug_; @@ -154,6 +156,8 @@ protected: mutable bool isLES_; mutable scalar cg_; + + mutable std::vector cgTypeSpecific_; bool cgOK_; @@ -171,6 +175,8 @@ protected: mutable Switch checkPeriodicCells_; + bool meshHasUpdated_; + #if defined(version24Dev) const turbulenceModel& turbulence_; #elif defined(version21) || defined(version16ext) @@ -217,6 +223,12 @@ protected: virtual void setNumberOfParticles(int); + virtual void setNumberOfClumps(int); + + virtual void setPositionsCM(label,double*); + + virtual void setCellIDsCM(label,int*); + virtual void findCells(); virtual void setForces(); @@ -285,8 +297,14 @@ public: label liggghtsCommandModelIndex(word); inline void setCG(double) const; + + inline void setCGTypeSpecific(int, double) const; + + mutable bool cgTypeSpecificDifferent; inline const scalar& cg() const; + + inline const scalar& cg(int) const; inline const bool& impDEMdrag() const; @@ -300,6 +318,8 @@ public: inline const fvMesh& mesh() const; + inline bool allowAdjustTimeStep() const; + inline bool solveFlow() const; inline bool solveScalarTransport() const; @@ -353,7 +373,11 @@ public: virtual inline bool multipleTypesDMin() {return false;} virtual inline double ** particleDensity() const {return NULL;}; virtual inline int ** particleTypes() const {return NULL;}; - virtual label particleType(label index) const {return -1;}; + virtual label particleType(label index) const + { + FatalError << "cfdemCloud::particleType(index): you are attempting to get the particle type, but this array is not transferred to CFDEM for this cloud. Use a different cloud, or avoid asking for the particle type." << abort(FatalError); + return -1; + }; //access to the particle's rotation and torque data virtual inline double ** DEMTorques() const {return NULL;}; @@ -531,6 +555,8 @@ public: void accessParticleDatFieldsUserCFDEMToExt(word fieldToAccess, double **& fieldData); //=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*= bool checkPeriodicCells() { return checkPeriodicCells_; } + bool meshHasUpdated() { return meshHasUpdated_; } + void setMeshHasUpdatedFlag(bool hasUpdated) { meshHasUpdated_ = hasUpdated; } }; diff --git a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H index 22cc99f..32d5a4d 100644 --- a/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H +++ b/src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H @@ -50,6 +50,21 @@ inline void cfdemCloud::setCG(double cg) const Info << "cg is set to: " << cg_ << endl; }; +inline void cfdemCloud::setCGTypeSpecific(int type, double cg) const +{ + if(int(cgTypeSpecific_.size())!=type) + FatalError << "setCGTypeSpecific attempts to set at location " + << cgTypeSpecific_.size() + << ", but caller requests to set at " + << type + << ". This is fatal. " + << abort(FatalError); + cgTypeSpecific_.push_back(cg); + if(cgcg_*1.00001) cgTypeSpecificDifferent = true; + + Info << "type specific cg for type " << type << " is set to: " << cg << endl; +} + inline const bool& cfdemCloud::impDEMdrag() const { return impDEMdrag_; @@ -75,6 +90,11 @@ inline const scalar& cfdemCloud::cg() const return cg_; }; +inline const scalar& cfdemCloud::cg(int type) const +{ + return cgTypeSpecific_[type]; +}; + inline const bool& cfdemCloud::ignore() const { return ignore_; @@ -216,7 +236,8 @@ inline double cfdemCloud::d32(bool recalc) Ntot+=2*r*r*r; Dtot+=r*r; } - d32_=Ntot/Dtot; + if(Ntot>SMALL) d32_ = Ntot/Dtot; + else d32_ = 0.; } return d32_; diff --git a/src/lagrangian/cfdemParticle/etc/OFversion/OFversion.H b/src/lagrangian/cfdemParticle/etc/OFversion/OFversion.H deleted file mode 100644 index 951fceb..0000000 --- a/src/lagrangian/cfdemParticle/etc/OFversion/OFversion.H +++ /dev/null @@ -1,49 +0,0 @@ -#if(CFDEMWMPROJECTVERSION == 40) - #define version40 -#elif(CFDEMWMPROJECTVERSION == 24) - #define version24 -#elif(CFDEMWMPROJECTVERSION == 30) - #define version30 -#elif(CFDEMWMPROJECTVERSION == 132) - #define versionExt32 -#endif - -//define anisotropicRotation cloud models -//#define anisotropicRotation - -// features of 16ext work also in extend 3.2 -#if defined(versionExt32) - #define version16ext -#endif - -// features of 3.0 work also in 4.0 -#if defined(version40) - #define version30 -#endif - -// features of 2.4Dev work also in Dev -#if defined(version30) - #define version24Dev -#endif - -// basically use 24x settings + some dev features (e.g. new turbulence model structure) -#if defined(version24Dev) - #define version24 -#endif - -// features of 2.4 work also in 2.3 -#if defined(version24) - #define version23 -#endif - -// features of 2.1 work also in 2.3 -#if defined(version23) - #define version21 - #define version221 -#endif - -// features of 2.1 work also in 2.2 -#if defined(version22) - #define version21 - #define version221 -#endif diff --git a/src/lagrangian/cfdemParticle/etc/additionalLibs_2.4.x b/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_2.4.x similarity index 76% rename from src/lagrangian/cfdemParticle/etc/additionalLibs_2.4.x rename to src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_2.4.x index bda1adf..f363cdb 100644 --- a/src/lagrangian/cfdemParticle/etc/additionalLibs_2.4.x +++ b/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_2.4.x @@ -1,13 +1,18 @@ -# paths for additional libraries -CFDEM_ADD_LIB_PATHS = \ - -# additional libraries to be linked to solvers -CFDEM_ADD_LIBS = \ +# Specify additional include and library paths, as well as libraries for the compilation +# +# CFDEM_ADD_INC = +# CFDEM_ADD_LIB_PATHS = +# CFDEM_ADD_LIBS = # additional static libraries to be linked to lagrangian library CFDEM_ADD_STATICLIBS = \ -lmpi_cxx \ +# If you don't want VTK comment the following line and use the appropriate LIGGGHTS Makefile +# via setting CFDEM_LIGGGHTS_MAKEFILE_NAME that does not contain VTK. +include $(CFDEM_ADD_LIBS_DIR)/additionalLibs_vtk +include $(CFDEM_ADD_LIBS_DIR)/additionalLibs_superquadric + ################################################################# ## SETTINGS FOR 2.4.x ## ################################################################# diff --git a/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_3.0.x b/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_3.0.x new file mode 100644 index 0000000..47d2e37 --- /dev/null +++ b/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_3.0.x @@ -0,0 +1,53 @@ +# Specify additional include and library paths, as well as libraries for the compilation +# +#CFDEM_ADD_INC = \ +#CFDEM_ADD_LIB_PATHS = \ +#CFDEM_ADD_LIBS = \ + +# additional static libraries to be linked to lagrangian library +CFDEM_ADD_STATICLIBS = \ +-lmpi_cxx \ + +# If you don't want VTK comment the following line and use the appropriate LIGGGHTS Makefile +# via setting CFDEM_LIGGGHTS_MAKEFILE_NAME that does not contain VTK. +include $(CFDEM_ADD_LIBS_DIR)/additionalLibs_vtk +include $(CFDEM_ADD_LIBS_DIR)/additionalLibs_superquadric + + +# If you don't want ParSCale comment the following line +#include $(CFDEM_ADD_LIBS_DIR)/additionalLibs_ParScale + +################################################################# +## SETTINGS FOR 3.0.x ## +################################################################# +#---------------------------------------------------------------- +# incompressible turbulence model settings +#---------------------------------------------------------------- +# paths for incompressible turbulence models to use +CFDEM_ADD_INCOMPTURBMOD_PATHS = \ +-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ +-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ +-I$(LIB_SRC)/fvOptions/lnInclude \ +###-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + +# libs for turbulence models to use +CFDEM_ADD_INCOMPTURBMOD_LIBS = \ +-lturbulenceModels \ +-lincompressibleTurbulenceModels \ +-lfvOptions \ + +#---------------------------------------------------------------- +# compressible turbulence model settings +#---------------------------------------------------------------- +# paths for compressible turbulence models to use +CFDEM_ADD_COMPTURBMOD_PATHS = \ +-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ +-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ +-I$(LIB_SRC)/transportModels/compressible/lnInclude \ +-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + +# libs for turbulence models to use +CFDEM_ADD_COMPTURBMOD_LIBS = \ +-lturbulenceModels \ +-lcompressibleTurbulenceModels \ +################################################################# diff --git a/src/lagrangian/cfdemParticle/etc/additionalLibs_3.2 b/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_3.2 similarity index 75% rename from src/lagrangian/cfdemParticle/etc/additionalLibs_3.2 rename to src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_3.2 index c5bdc5a..530c4d7 100644 --- a/src/lagrangian/cfdemParticle/etc/additionalLibs_3.2 +++ b/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_3.2 @@ -1,20 +1,18 @@ -# paths for additional libraries -CFDEM_ADD_LIB_PATHS = \ --L/usr/include/vtk \ --L/usr/lib64/vtk \ - -# additional libraries to be linked to solvers -CFDEM_ADD_LIBS = \ --lvtkCommonCore \ --lvtkIOCore \ --lvtkIOXML \ --lvtkIOLegacy \ --lvtkCommonDataModel \ +# Specify additional include and library paths, as well as libraries for the compilation +# +# CFDEM_ADD_INC = +# CFDEM_ADD_LIB_PATHS = +# CFDEM_ADD_LIBS = # additional static libraries to be linked to lagrangian library CFDEM_ADD_STATICLIBS = \ -lmpi_cxx \ +# If you don't want VTK comment the following line and use the appropriate LIGGGHTS Makefile +# via setting CFDEM_LIGGGHTS_MAKEFILE_NAME that does not contain VTK. +include $(CFDEM_ADD_LIBS_DIR)/additionalLibs_vtk +include $(CFDEM_ADD_LIBS_DIR)/additionalLibs_superquadric + ################################################################# ## SETTINGS FOR Extend 3.2 ## ################################################################# diff --git a/src/lagrangian/cfdemParticle/etc/additionalLibs_4.x b/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_4.x similarity index 78% rename from src/lagrangian/cfdemParticle/etc/additionalLibs_4.x rename to src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_4.x index 91bbfb3..c0b59cf 100644 --- a/src/lagrangian/cfdemParticle/etc/additionalLibs_4.x +++ b/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_4.x @@ -1,13 +1,18 @@ -# paths for additional libraries -CFDEM_ADD_LIB_PATHS = \ - -# additional libraries to be linked to solvers -CFDEM_ADD_LIBS = \ +# Specify additional include and library paths, as well as libraries for the compilation +# +# CFDEM_ADD_INC = +# CFDEM_ADD_LIB_PATHS = +# CFDEM_ADD_LIBS = # additional static libraries to be linked to lagrangian library CFDEM_ADD_STATICLIBS = \ -lmpi_cxx \ +# If you don't want VTK comment the following line and use the appropriate LIGGGHTS Makefile +# via setting CFDEM_LIGGGHTS_MAKEFILE_NAME that does not contain VTK. +include $(CFDEM_ADD_LIBS_DIR)/additionalLibs_vtk +include $(CFDEM_ADD_LIBS_DIR)/additionalLibs_superquadric + ################################################################# ## SETTINGS FOR 3.0.x ## ################################################################# diff --git a/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_ParScale b/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_ParScale new file mode 100644 index 0000000..5901c81 --- /dev/null +++ b/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_ParScale @@ -0,0 +1,39 @@ +# ParScale library, OPTIONAL +# + +ifeq ($(PASCAL_SRC_DIR),"") + #ParScale variables seem not to be set + PARSCALE_PATH = \ + + PARSCALE_LIB = \ + + PARSCALE_STATICLIB = \ + +else + PARSCALE_PATH = -L$(PASCAL_THIRDPARTY_DIR)/chemkinReader/src \ + -L$(PASCAL_INST_DIR)/lib \ + -L$(PASCAL_INST_DIR)/lib64 \ + -L$(PASCAL_SRC_DIR) \ + -L$(PASCAL_HDF5_DIR)/lib \ + -L$(PASCAL_QT5_DIR)/lib + + PARSCALE_LIB = -lboost_regex \ + -lQt5Core \ + -lhdf5_cpp \ + -lhdf5 \ + -lchemkinreader + + PARSCALE_STATICLIB = -L$(CFDEM_POEMSLIB_PATH) \ + -lpoems \ + -Wl,--whole-archive -l$(PASCAL_LIB_NAME) -Wl,--no-whole-archive \ + -Wl,--whole-archive -lsundials_cvode -Wl,--no-whole-archive \ + -lsundials_nvecserial +endif + + +CFDEM_ADD_LIB_PATHS += $(PARSCALE_PATH) + +CFDEM_ADD_LIBS += $(PARSCALE_LIB) + +CFDEM_ADD_STATICLIBS += $(PARSCALE_STATICLIB) + diff --git a/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_superquadric b/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_superquadric new file mode 100644 index 0000000..c6ade8e --- /dev/null +++ b/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_superquadric @@ -0,0 +1,5 @@ +sinclude $(CFDEM_LIGGGHTS_SRC_DIR)/MAKE/Makefile.user +ifeq ($(USE_SUPERQUADRICS), "ON") + PFLAGS+=-DSUPERQUADRIC_ACTIVE_FLAG -DNONSPHERICAL_ACTIVE_FLAG +endif + diff --git a/src/lagrangian/cfdemParticle/etc/additionalLibs_3.0.x b/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_v1606+ similarity index 78% rename from src/lagrangian/cfdemParticle/etc/additionalLibs_3.0.x rename to src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_v1606+ index 91bbfb3..1eb644f 100644 --- a/src/lagrangian/cfdemParticle/etc/additionalLibs_3.0.x +++ b/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_v1606+ @@ -1,13 +1,18 @@ -# paths for additional libraries -CFDEM_ADD_LIB_PATHS = \ - -# additional libraries to be linked to solvers -CFDEM_ADD_LIBS = \ +# Specify additional include and library paths, as well as libraries for the compilation +# +#CFDEM_ADD_INC = \ +#CFDEM_ADD_LIB_PATHS = \ +#CFDEM_ADD_LIBS = \ # additional static libraries to be linked to lagrangian library CFDEM_ADD_STATICLIBS = \ -lmpi_cxx \ +# If you don't want VTK comment the following line and use the appropriate LIGGGHTS Makefile +# via setting CFDEM_LIGGGHTS_MAKEFILE_NAME that does not contain VTK. +include $(CFDEM_ADD_LIBS_DIR)/additionalLibs_vtk +include $(CFDEM_ADD_LIBS_DIR)/additionalLibs_superquadric + ################################################################# ## SETTINGS FOR 3.0.x ## ################################################################# diff --git a/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_v1612+ b/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_v1612+ new file mode 100644 index 0000000..1eb644f --- /dev/null +++ b/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_v1612+ @@ -0,0 +1,48 @@ +# Specify additional include and library paths, as well as libraries for the compilation +# +#CFDEM_ADD_INC = \ +#CFDEM_ADD_LIB_PATHS = \ +#CFDEM_ADD_LIBS = \ + +# additional static libraries to be linked to lagrangian library +CFDEM_ADD_STATICLIBS = \ +-lmpi_cxx \ + +# If you don't want VTK comment the following line and use the appropriate LIGGGHTS Makefile +# via setting CFDEM_LIGGGHTS_MAKEFILE_NAME that does not contain VTK. +include $(CFDEM_ADD_LIBS_DIR)/additionalLibs_vtk +include $(CFDEM_ADD_LIBS_DIR)/additionalLibs_superquadric + +################################################################# +## SETTINGS FOR 3.0.x ## +################################################################# +#---------------------------------------------------------------- +# incompressible turbulence model settings +#---------------------------------------------------------------- +# paths for incompressible turbulence models to use +CFDEM_ADD_INCOMPTURBMOD_PATHS = \ +-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ +-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ +-I$(LIB_SRC)/fvOptions/lnInclude \ + +# libs for turbulence models to use +CFDEM_ADD_INCOMPTURBMOD_LIBS = \ +-lturbulenceModels \ +-lincompressibleTurbulenceModels \ +-lfvOptions \ + +#---------------------------------------------------------------- +# compressible turbulence model settings +#---------------------------------------------------------------- +# paths for compressible turbulence models to use +CFDEM_ADD_COMPTURBMOD_PATHS = \ +-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ +-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ +-I$(LIB_SRC)/transportModels/compressible/lnInclude \ +-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + +# libs for turbulence models to use +CFDEM_ADD_COMPTURBMOD_LIBS = \ +-lturbulenceModels \ +-lcompressibleTurbulenceModels \ +################################################################# diff --git a/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_vtk b/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_vtk new file mode 100644 index 0000000..7d610a9 --- /dev/null +++ b/src/lagrangian/cfdemParticle/etc/addLibs_universal/additionalLibs_vtk @@ -0,0 +1,50 @@ +# VTK library, OPTIONAL +# +# VTK_INC = path for VTK header files (not needed in coupling, only in here to identify VTK version) +# VTK_PATH = path for VTK library +# VTK_LIB = name of VTK library +# +# If the automatic detection does not work for you, e.g. because of a custom installation of VTK, +# then you should set VTK_INC, VTK_PATH and VTK_LIB in your shell environment (e.g. via export in +# your ~/.bashrc). + +VTK_INC ?= -I$(shell ls -d /usr/include/vtk* | tail -n 1) +VTK_TMP := $(shell grep -d skip VTK_MAJOR_VERSION $(subst -I,,$(VTK_INC))/* | grep define) +VTK_MAJOR_VERSION := $(word $(words $(VTK_TMP)),$(VTK_TMP)) +VTK_TMP := $(shell grep -d skip VTK_MINOR_VERSION $(subst -I,,$(VTK_INC))/* | grep define) +VTK_MINOR_VERSION := $(word $(words $(VTK_TMP)),$(VTK_TMP)) +VTK_VERSION=$(VTK_MAJOR_VERSION).$(VTK_MINOR_VERSION) +ifeq ($(VTK_MAJOR_VERSION),5) + VTK_LIB = -lvtkCommon \ + -lvtkFiltering \ + -lvtkIO \ + -lvtkParallel \ + -lvtkGraphics + VTK_PATH ?= -L$(dir $(shell find /usr/lib* -name 'libvtkCommon.so' | tail -n 1)) +else + ifeq ($(VTK_MAJOR_VERSION),$(filter $(VTK_MAJOR_VERSION),6 7)) + VTK_LIB = -lvtkCommonCore-$(VTK_VERSION) \ + -lvtkIOCore-$(VTK_VERSION) \ + -lvtkIOXML-$(VTK_VERSION) \ + -lvtkIOLegacy-$(VTK_VERSION) \ + -lvtkCommonDataModel-$(VTK_VERSION) \ + -lvtkParallelCore-$(VTK_VERSION) \ + -lvtkParallelMPI-$(VTK_VERSION) \ + -lvtkCommonExecutionModel-$(VTK_VERSION) \ + -lvtkFiltersCore-$(VTK_VERSION) \ + -lvtkFiltersHybrid-$(VTK_VERSION) + # For VTK >= 6.2 we need to use lvtkIOParallelXML + MINOR_GE_6_2 := $(shell [ $(VTK_MAJOR_VERSION) -gt 6 ] || [ $(VTK_MINOR_VERSION) -ge 2 ] && echo true) + ifeq ($(MINOR_GE_6_2),true) + VTK_LIB += -lvtkIOParallelXML-$(VTK_VERSION) + else + VTK_LIB += -lvtkIOParallel-$(VTK_VERSION) + endif + VTK_PATH ?= -L$(dir $(shell find /usr/lib* -name 'libvtkCommonCore-$(VTK_VERSION).so' | tail -n 1)) + else + TMP:=$(error Unsupported VTK major version $(VTK_VERSION)) + endif +endif + +CFDEM_ADD_LIB_PATHS += $(VTK_PATH) +CFDEM_ADD_LIBS += $(VTK_LIB) diff --git a/src/lagrangian/cfdemParticle/etc/bashrc b/src/lagrangian/cfdemParticle/etc/bashrc index 121c107..24bd800 100755 --- a/src/lagrangian/cfdemParticle/etc/bashrc +++ b/src/lagrangian/cfdemParticle/etc/bashrc @@ -36,14 +36,24 @@ #------------------------------------------------------------------------------ #- export environment variables (adapt to your paths) #------------------------------------------------------------------------------ +echo "************************************" #check if default lammps lib path should be used if [[ $CFDEM_LAMMPS_LIB_DIR == "" ]]; then - export CFDEM_LAMMPS_LIB_DIR=$CFDEM_LIGGGHTS_SRC_DIR/../lib/ + export CFDEM_LAMMPS_LIB_DIR=$CFDEM_LIGGGHTS_SRC_DIR/../lib else echo "using CFDEM_LAMMPS_LIB_DIR=$CFDEM_LAMMPS_LIB_DIR defined by user." fi +#test CFDEM_LAMMPS_LIB_DIR +if [ -f "$CFDEM_LAMMPS_LIB_DIR/poems/Makefile.lammps" ]; then + : +else + echo "" + echo " !!! WARNING CFDEM_LAMMPS_LIB_DIR = $CFDEM_LAMMPS_LIB_DIR seems to be wrong !!!" + echo "" +fi + #- LIGGGHTS lib name export CFDEM_LIGGGHTS_LIB_NAME=lmp_$CFDEM_LIGGGHTS_MAKEFILE_NAME @@ -54,18 +64,20 @@ export CFDEM_LIB_NAME=lagrangianCFDEM-$CFDEM_VERSION-$WM_PROJECT_VERSION export CFDEM_LIB_COMP_NAME=lagrangianCFDEMcomp-$CFDEM_VERSION-$WM_PROJECT_VERSION #check if additional libraries should be compiled together with solvers -if [[ $CFDEM_ADD_LIBS_NAME == "" ]]; then - export CFDEM_ADD_LIBS_NAME=additionalLibs_$WM_PROJECT_VERSION - echo "using CFDEM_ADD_LIBS_NAME=$CFDEM_ADD_LIBS_NAME ." -else - echo "using CFDEM_ADD_LIBS_NAME=$CFDEM_ADD_LIBS_NAME defined by user." -fi if [[ $CFDEM_ADD_LIBS_DIR == "" ]]; then - export CFDEM_ADD_LIBS_DIR=$CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc + export CFDEM_ADD_LIBS_DIR=$CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/addLibs_universal + echo "using default CFDEM_ADD_LIBS_DIR=$CFDEM_ADD_LIBS_DIR" else echo "using CFDEM_ADD_LIBS_DIR=$CFDEM_ADD_LIBS_DIR defined by user." fi +if [[ $CFDEM_ADD_LIBS_NAME == "" ]]; then + export CFDEM_ADD_LIBS_NAME=additionalLibs_$WM_PROJECT_VERSION + echo "using default CFDEM_ADD_LIBS_NAME=$CFDEM_ADD_LIBS_NAME" +else + echo "using CFDEM_ADD_LIBS_NAME=$CFDEM_ADD_LIBS_NAME defined by user." +fi + # check addLibs path and file name if [[ ! -f $CFDEM_ADD_LIBS_DIR/$CFDEM_ADD_LIBS_NAME ]]; then echo "!!! ERROR !!!: CFDEM_ADD_LIBS_DIR/CFDEM_ADD_LIBS_NAME=$CFDEM_ADD_LIBS_DIR/$CFDEM_ADD_LIBS_NAME does not exist." @@ -79,23 +91,15 @@ export CFDEM_Many2ManyLIB_PATH=$CFDEM_SRC_DIR/lagrangian/cfdemParticle/subModels export CFDEM_Many2ManyLIB_MAKEFILENAME=$CFDEM_LIGGGHTS_MAKEFILE_NAME #- LMP M2M lib path and makefile -export CFDEM_M2MLIB_PATH=$CFDEM_SRC_DIR/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library +export CFDEM_M2MLIB_PATH=$CFDEM_SRC_DIR/lagrangian/cfdemParticle/subModels/dataExchangeModel/M2M/library export CFDEM_M2MLIB_MAKEFILENAME=$CFDEM_LIGGGHTS_MAKEFILE_NAME -#- LMP POEMS lib path and makefile +#- LMP M2MMS lib path and makefile +export CFDEM_M2MMSLIB_PATH=$CFDEM_SRC_DIR/lagrangian/cfdemParticle/subModels/dataExchangeModel/M2M/library +export CFDEM_M2MMSLIB_MAKEFILENAME=$CFDEM_LIGGGHTS_MAKEFILE_NAME + +#- LMP POEMS lib default path export CFDEM_POEMSLIB_PATH=$CFDEM_LAMMPS_LIB_DIR/poems -export CFDEM_POEMSLIB_MAKEFILENAME=Install - -#- LMP ASPHERE lib path and makefile -export CFDEM_ASPHERELIB_PATH=$CFDEM_LAMMPS_LIB_DIR/ASPHERE -export CFDEM_ASPHERELIB_MAKEFILENAME=Install - -#- PARSCALE lib path and makefile -export CFDEM_PARSCALELIB_PATH=$CFDEM_LAMMPS_LIB_DIR/PASCAL -export CFDEM_PARSCALELIB_MAKEFILENAME=Install - -#-C3PO library -export C3PO_SRC_DIR=$CFDEM_SRC_DIR/c3po #----------------------------------------------------- #- path to test harness @@ -250,6 +254,22 @@ if [[ $WM_PROJECT_VERSION == 4.* ]]; then sleep 1.5 elif [[ $WM_PROJECT_VERSION == 3.0.* ]]; then export CFDEM_WM_PROJECT_VERSION=30 +elif [[ $WM_PROJECT_VERSION == v1606+ ]]; then + export CFDEM_WM_PROJECT_VERSION=1606 + echo "************************************" + echo "WARNING from your CFDEM code!" + echo "WARNING: Coupling with your OpenFOAM(R) version is currently under development!" + echo "In doubt switch to another version." + echo "************************************" + sleep 1.5 +elif [[ $WM_PROJECT_VERSION == v1612+ ]]; then + export CFDEM_WM_PROJECT_VERSION=1612 + echo "************************************" + echo "WARNING from your CFDEM code!" + echo "WARNING: Coupling with your OpenFOAM(R) version is currently under development!" + echo "In doubt switch to another version." + echo "************************************" + sleep 1.5 elif [[ $WM_PROJECT_VERSION == 2.4.* ]]; then export CFDEM_WM_PROJECT_VERSION=24 elif [[ $WM_PROJECT_VERSION == "3.2" && $WM_FORK == "extend" ]]; then @@ -263,3 +283,5 @@ else echo "************************************" sleep 1.5 fi + +echo "************************************" diff --git a/src/lagrangian/cfdemParticle/etc/cfdemSystemTest.sh b/src/lagrangian/cfdemParticle/etc/cfdemSystemTest.sh index eb05dcf..391d76a 100755 --- a/src/lagrangian/cfdemParticle/etc/cfdemSystemTest.sh +++ b/src/lagrangian/cfdemParticle/etc/cfdemSystemTest.sh @@ -12,7 +12,7 @@ source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh checkGPP="true" #- sys check for add on -checkAddOn="true" +checkAddOn="false" #- system settings printHeader @@ -50,6 +50,23 @@ echo '$WM_LABEL_SIZE = '"$WM_LABEL_SIZE" if [ $WM_LABEL_SIZE != 32 ]; then echo "!!!! Warning: WM_LABEL_SIZE must be 32!!!!! (Please correct in $FOAM_ETC/bashrc.)" fi +echo "" +echo "Additional lib settings" +cat < .Makefile_vtk_tmp +include $CFDEM_ADD_LIBS_DIR/$CFDEM_ADD_LIBS_NAME + +.PHONY: all + +all: + @echo "VTK_PATH = \$(VTK_PATH)" + @echo "VTK_LIB = \$(VTK_LIB)" + @echo "VTK_INC = \$(VTK_INC)" + @echo "CFDEM_ADD_LIB_PATHS = \$(CFDEM_ADD_LIB_PATHS)" + @echo "CFDEM_ADD_LIBS = \$(CFDEM_ADD_LIBS)" +EOT +make -f .Makefile_vtk_tmp +rm -f .Makefile_vtk_tmp +echo echo "*******************" @@ -85,4 +102,12 @@ if [ $checkAddOn == "true" ] else echo "$packageName does not exist." fi + + packageName=parScale + filePath=$PASCAL_SRC_DIR/.. + if [ $(checkDir $filePath) == "true" ]; then + source $filePath/etc/$packageName"SystemTest.sh" + else + echo "$packageName does not exist." + fi fi diff --git a/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_sol.sh b/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_sol.sh index ae807ee..84b0692 100755 --- a/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_sol.sh +++ b/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_sol.sh @@ -76,7 +76,7 @@ else #wait until prev. compilation is finished echo "waiting..." #until [ `ps -a | grep make | wc -l` -eq 0 ]; - until [ `ls -a | $logpath/grep *.tempXYZ | wc -l` -eq 0 ]; + until [ `ls -a | grep $logpath/*.tempXYZ | wc -l` -eq 0 ]; do sleep 2 done diff --git a/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_src.sh b/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_src.sh index 67c41a1..dc76c1d 100755 --- a/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_src.sh +++ b/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_src.sh @@ -18,14 +18,14 @@ logDir="log" cd $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc mkdir -p $logDir -#================================================================================# -# Must compile (but not clean) LIGGGHTS libraries, since it could have been -# compiled before with the compileLIGGGHTS command -# Then, check successful compilation -#================================================================================# -bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileLIGGGHTS_lib.sh noClean -echo "...now checking if LIGGGHTS libraries are compiled that are needed for CFDEM's src packages." -bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileLIGGGHTS_lib.sh false +##================================================================================# +## Must compile (but not clean) LIGGGHTS libraries, since it could have been +## compiled before with the compileLIGGGHTS command +## Then, check successful compilation +##================================================================================# +#bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileLIGGGHTS_lib.sh noClean +#echo "...now checking if LIGGGHTS libraries are compiled that are needed for CFDEM's src packages." +#bash $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/compileLIGGGHTS_lib.sh false #================================================================================# # compile src diff --git a/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_uti.sh b/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_uti.sh index 22a7cde..f6013b4 100755 --- a/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_uti.sh +++ b/src/lagrangian/cfdemParticle/etc/compileCFDEMcoupling_uti.sh @@ -72,7 +72,7 @@ else #wait until prev. compilation is finished echo "waiting..." #until [ `ps -a | grep make | wc -l` -eq 0 ]; - until [ `ls -a | $logpath/grep *.tempXYZ | wc -l` -eq 0 ]; + until [ `ls -a | grep $logpath/*.tempXYZ | wc -l` -eq 0 ]; do sleep 2 done diff --git a/src/lagrangian/cfdemParticle/etc/compileLIGGGHTS_lib.sh b/src/lagrangian/cfdemParticle/etc/compileLIGGGHTS_lib.sh index f0c9f60..eb1e12a 100755 --- a/src/lagrangian/cfdemParticle/etc/compileLIGGGHTS_lib.sh +++ b/src/lagrangian/cfdemParticle/etc/compileLIGGGHTS_lib.sh @@ -20,6 +20,7 @@ mkdir -p $logDir #================================================================================# whitelist="$CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/library-liggghts-list.txt" echo "" + echo "===========================================" echo "Compiling sub-libraries of LIGGGHTS now..." echo "Please provide the libraries to be compiled in the $CWD/$whitelist file." echo "Libraries must be in: $CFDEM_LAMMPS_LIB_DIR, or a path defined by the Line in the above file." @@ -71,3 +72,122 @@ mkdir -p $logDir compileLMPlib $logpath $logfileName $headerText $makeFileName $libraryPath $compilationModeSwitch done + + #=================================================================================== + whitelist="$CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/package-undo-liggghts-list.txt" + echo "" + echo "===========================================" + echo "deactivating all possible packages of LIGGGHTS now..." + echo "Please provide the packages to be compiled in the $CWD/$whitelist file." + echo "Packages must be in: $CFDEM_LAMMPS_LIB_DIR." + + if [ ! -f "$CWD/$whitelist" ];then + echo "$whitelist does not exist in $CWD. Nothing will be done." + NLINES=0 + COUNT=0 + else + NLINES=`wc -l < $CWD/$whitelist` + COUNT=0 + fi + + logpath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")/$logDir" + + # resetting Makefile.package + cp $CFDEM_LIGGGHTS_SRC_DIR/Makefile.package.empty $CFDEM_LIGGGHTS_SRC_DIR/Makefile.package + cp $CFDEM_LIGGGHTS_SRC_DIR/Makefile.package.settings.empty $CFDEM_LIGGGHTS_SRC_DIR/Makefile.package.settings + + while [ $COUNT -lt $NLINES ] + do + let COUNT++ + LINE=`head -n $COUNT $CWD/$whitelist | tail -1` + + # white lines + if [[ "$LINE" == "" ]]; then + echo "compile $LINE" + continue + # comments + elif [[ "$LINE" == \#* ]]; then + continue + # paths + elif [[ "$LINE" == */dir ]]; then + echo "will change path..." + LINE=$(echo "${LINE%????}") + path="$CFDEM_LIGGGHTS_SRC_DIR" + cd $path + echo $PWD + #continue + fi + + #--------------------------------------------------------------------------------# + #- define variables + logfileName="log_compile$LINE""lib" + #--------------------------------------------------------------------------------# + rm $logfileName 2>&1 | tee -a $logpath/$logfileName + + make no-$LINE 2>&1 | tee -a $logpath/$logfileName + done + + #=================================================================================== + whitelist="$CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/package-liggghts-list.txt" + echo "" + echo "===========================================" + echo "activating packages of LIGGGHTS now..." + echo "Please provide the packages to be compiled in the $CWD/$whitelist file." + echo "Packages must be in: $CFDEM_LAMMPS_LIB_DIR." + + if [ ! -f "$CWD/$whitelist" ];then + echo "$whitelist does not exist in $CWD. Nothing will be done." + NLINES=0 + COUNT=0 + else + NLINES=`wc -l < $CWD/$whitelist` + COUNT=0 + fi + + logpath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")/$logDir" + + while [ $COUNT -lt $NLINES ] + do + let COUNT++ + LINE=`head -n $COUNT $CWD/$whitelist | tail -1` + + # white lines + if [[ "$LINE" == "" ]]; then + echo "compile $LINE" + continue + # comments + elif [[ "$LINE" == \#* ]]; then + continue + # paths + elif [[ "$LINE" == */dir ]]; then + echo "will change path..." + LINE=$(echo "${LINE%????}") + path="$CFDEM_LIGGGHTS_SRC_DIR" + cd $path + echo $PWD + #continue + fi + + #--------------------------------------------------------------------------------# + #- define variables + logfileName="log_compile$LINE""lib" + #--------------------------------------------------------------------------------# + + make yes-$LINE 2>&1 | tee -a $logpath/$logfileName + + # assuming we need the poems lib if the package POEMS is activated + if [[ "$LINE" == "POEMS" ]]; then + echo "compile $LINE" + cd $CFDEM_POEMSLIB_PATH + make -f Makefile.g++ clean 2>&1 | tee -a $logpath/$logfileName + make -j $nProc -f Makefile.g++ lib 2>&1 | tee -a $logpath/$logfileName + cd $path + fi + + # special handling of PARSCALE + if [[ "$LINE" == "PASCAL" ]]; then + echo "compile $LINE" + #. $PASCAL_SRC_DIR/refresh 2>&1 | tee -a $logpath/$logfileName + . $PASCAL_SRC_DIR/refreshLibrary.sh 2>&1 | tee -a $logpath/$logfileName + fi + done diff --git a/src/lagrangian/cfdemParticle/etc/cshrc b/src/lagrangian/cfdemParticle/etc/cshrc index 0d413b7..bcb7de5 100755 --- a/src/lagrangian/cfdemParticle/etc/cshrc +++ b/src/lagrangian/cfdemParticle/etc/cshrc @@ -18,7 +18,7 @@ ##- source cfdem env vars #setenv CFDEM_VERSION PUBLIC #setenv CFDEM_PROJECT_DIR $HOME/CFDEM/CFDEMcoupling-$CFDEM_VERSION-$WM_PROJECT_VERSION -#setenv CFDEM_SRC_DIR $CFDEM_PROJECT_DIR/src/lagrangian/cfdemParticle +#setenv CFDEM_SRC_DIR $CFDEM_PROJECT_DIR/src #setenv CFDEM_SOLVER_DIR $CFDEM_PROJECT_DIR/applications/solvers #setenv CFDEM_DOC_DIR $CFDEM_PROJECT_DIR/doc #setenv CFDEM_UT_DIR $CFDEM_PROJECT_DIR/applications/utilities @@ -36,14 +36,25 @@ #------------------------------------------------------------------------------ #- export environment variables (adapt to your paths) #------------------------------------------------------------------------------ +echo "************************************" #check if default lammps lib path should be used if ( ! ($?CFDEM_LAMMPS_LIB_DIR) ) then - setenv CFDEM_LAMMPS_LIB_DIR $CFDEM_LIGGGHTS_SRC_DIR"/../lib/" + setenv CFDEM_LAMMPS_LIB_DIR $CFDEM_LIGGGHTS_SRC_DIR"/../lib" else echo "using CFDEM_LAMMPS_LIB_DIR=$CFDEM_LAMMPS_LIB_DIR defined by user." endif +#test CFDEM_LAMMPS_LIB_DIR +if ( -f "$CFDEM_LAMMPS_LIB_DIR/poems/Makefile.lammps" ) then + : +else + echo "" + echo " !!! WARNING CFDEM_LAMMPS_LIB_DIR = $CFDEM_LAMMPS_LIB_DIR seems to be wrong !!!" + echo "" +endif + + #- LIGGGHTS lib name setenv CFDEM_LIGGGHTS_LIB_NAME lmp_$CFDEM_LIGGGHTS_MAKEFILE_NAME @@ -54,20 +65,23 @@ setenv CFDEM_LIB_NAME lagrangianCFDEM-$CFDEM_VERSION-$WM_PROJECT_VERSION setenv CFDEM_LIB_COMP_NAME lagrangianCFDEMcomp-$CFDEM_VERSION-$WM_PROJECT_VERSION #check if additional libraries should be compiled together with solvers -if ( ! ($?CFDEM_ADD_LIBS_NAME) ) then - setenv CFDEM_ADD_LIBS_NAME additionalLibs_$WM_PROJECT_VERSION - echo "using CFDEM_ADD_LIBS_NAME=$CFDEM_ADD_LIBS_NAME ." -else - echo "using CFDEM_ADD_LIBS_NAME=$CFDEM_ADD_LIBS_NAME defined by user." -endif if ( ! ($?CFDEM_ADD_LIBS_DIR) ) then - setenv CFDEM_ADD_LIBS_DIR $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc + setenv CFDEM_ADD_LIBS_DIR $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/addLibs_universal + echo "using default CFDEM_ADD_LIBS_DIR=$CFDEM_ADD_LIBS_DIR" else echo "using CFDEM_ADD_LIBS_DIR=$CFDEM_ADD_LIBS_DIR defined by user." endif +if ( ! ($?CFDEM_ADD_LIBS_NAME) ) then + setenv CFDEM_ADD_LIBS_NAME additionalLibs_$WM_PROJECT_VERSION + echo "using default CFDEM_ADD_LIBS_NAME=$CFDEM_ADD_LIBS_NAME" +else + echo "using CFDEM_ADD_LIBS_NAME=$CFDEM_ADD_LIBS_NAME defined by user." +endif + # check addLibs path and file name -if ( ! -f $CFDEM_ADD_LIBS_DIR/$CFDEM_ADD_LIBS_NAME ) then +setenv h $CFDEM_ADD_LIBS_DIR/$CFDEM_ADD_LIBS_NAME +if ( ! ($?h) ) then echo "!!! ERROR !!!: CFDEM_ADD_LIBS_DIR/CFDEM_ADD_LIBS_NAME=$CFDEM_ADD_LIBS_DIR/$CFDEM_ADD_LIBS_NAME does not exist." endif @@ -79,12 +93,12 @@ setenv CFDEM_Many2ManyLIB_PATH $CFDEM_SRC_DIR/lagrangian/cfdemParticle/subModels setenv CFDEM_Many2ManyLIB_MAKEFILENAME $CFDEM_LIGGGHTS_MAKEFILE_NAME #- LMP M2M lib path -setenv CFDEM_M2MLIB_PATH $CFDEM_SRC_DIR/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayM2M/library +setenv CFDEM_M2MLIB_PATH $CFDEM_SRC_DIR/lagrangian/cfdemParticle/subModels/dataExchangeModel/M2M/library setenv CFDEM_M2MLIB_MAKEFILENAME $CFDEM_LIGGGHTS_MAKEFILE_NAME -#- LMP POEMS lib path -setenv CFDEM_POEMSLIB_PATH $CFDEM_LIGGGHTS_SRC_DIR/../lib/poems -setenv CFDEM_POEMSLIB_MAKEFILENAME g++ +#- LMP POEMS lib default path +setenv CFDEM_POEMSLIB_PATH $CFDEM_LAMMPS_LIB_DIR/poems +#----------------------------------------------------- #- path to test harness setenv CFDEM_TEST_HARNESS_PATH $CFDEM_PROJECT_USER_DIR/log/logFilesCFDEM-$CFDEM_VERSION-$WM_PROJECT_VERSION @@ -95,12 +109,14 @@ setenv CFDEM_LIB_DIR $FOAM_USER_LIBBIN #- path to apps setenv CFDEM_APP_DIR $FOAM_USER_APPBIN +#- path to OF version flag file +setenv CFDEM_OFVERSION_DIR $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/OFversion #------------------------------------------------------------------------------ #- settings for lpp postproc tool #------------------------------------------------------------------------------ #- nr of procs for lpp tool -setenv CFDEM_LPP_NPROCS 4 +setenv CFDEM_LPP_NPROCS 1 #- nr of procs for lpp tool setenv CFDEM_LPP_CHUNKSIZE 1 @@ -233,6 +249,22 @@ if ( $WM_PROJECT_VERSION =~ "4.*" ) then sleep 1.5 else if ( $WM_PROJECT_VERSION =~ "3.0.*" ) then setenv CFDEM_WM_PROJECT_VERSION 30 +else if ( $WM_PROJECT_VERSION =~ "v1606+" ) then + setenv CFDEM_WM_PROJECT_VERSION v1606 + echo "************************************" + echo "WARNING from your CFDEM code!" + echo "WARNING: Coupling with your OpenFOAM(R) version is currently under development!" + echo "In doubt switch to another version." + echo "************************************" + sleep 1.5 +else if ( $WM_PROJECT_VERSION =~ "v1612+" ) then + setenv CFDEM_WM_PROJECT_VERSION v1606 + echo "************************************" + echo "WARNING from your CFDEM code!" + echo "WARNING: Coupling with your OpenFOAM(R) version is currently under development!" + echo "In doubt switch to another version." + echo "************************************" + sleep 1.5 else if ( $WM_PROJECT_VERSION =~ "2.4.*" ) then setenv CFDEM_WM_PROJECT_VERSION 24 else if ( $WM_PROJECT_VERSION == "3.2" ) then @@ -243,8 +275,11 @@ else clear echo "************************************" echo "ERROR from your CFDEM code!" - echo "ERROR: your openFOAM(R)s version is not supported!" + echo "ERROR: your OpenFOAM(R) version is not supported!" echo "Please use a version that is supported, i.e., see the bashrc file in the source directory!" echo "************************************" sleep 1.5 endif + +echo "************************************" + diff --git a/src/lagrangian/cfdemParticle/etc/functions.sh b/src/lagrangian/cfdemParticle/etc/functions.sh index c219c87..0744c69 100755 --- a/src/lagrangian/cfdemParticle/etc/functions.sh +++ b/src/lagrangian/cfdemParticle/etc/functions.sh @@ -430,14 +430,63 @@ cleanCFDEMcase() #--------------------------------------------------------------------------------# #- define variables casepath="$1" + keepDEMrestart="$2" #--------------------------------------------------------------------------------# - echo "deleting data at: $casePath :\n" + echo "deleting data at: $casePath ? otherwise press Ctrl-C:\n" + read source $WM_PROJECT_DIR/bin/tools/CleanFunctions + #CFD cd $casePath/CFD cleanCase - rm -r $casePath/DEM/post/* - echo "dummyfile" >> $casePath/DEM/post/dummy + #CFDEM + rm -r $casePath/CFD/clockData + rm -r $casePath/CFD/particleProbes + rm -r $casePath/CFD/averageProps/ + rm -r $casePath/CFD/octave/octave-core + rm -r $casePath/CFD/octave/octave-workspace + rm -r $casePath/remotePlace + rm -r $casePath/CFD/oldProcDirs + rm -r $casePath/CFD/tmp.balance + rm $casePath/CFD/callgrind.out.* + rm -r $casePath/CFD/hpctoolkit-* + rm $casePath/log_* + #DEM + rm $casePath/DEM/post/* + touch $casePath/DEM/post/.gitignore + if [[ $keepDEMrestart == true ]]; then + echo "keeping DEM restart files" + else + rm $casePath/DEM/post/restart/* + fi + touch $casePath/DEM/post/restart/.gitignore + rm $casePath/DEM/tmp.lammps.variable + rm $casePath/DEM/log* + #ParScale + rm $casePath/CFD/*.dat + rm $casePath/CFD/*.pascal + rm $casePath/CFD/*.profile + rm -r $casePath/CFD/pascal/0.* + rm -r $casePath/CFD/pascal/1 + rm -r $casePath/CFD/pascal/1.* + rm -r $casePath/CFD/pascal/2 + rm -r $casePath/CFD/pascal/2.* + rm -r $casePath/CFD/pascal/3 + rm -r $casePath/CFD/pascal/3.* + rm -r $casePath/CFD/pascal/4 + rm -r $casePath/CFD/pascal/4.* + rm -r $casePath/CFD/pascal/5 + rm -r $casePath/CFD/pascal/5.* + rm -r $casePath/CFD/pascal/6 + rm -r $casePath/CFD/pascal/6.* + rm -r $casePath/CFD/pascal/7 + rm -r $casePath/CFD/pascal/7.* + rm -r $casePath/CFD/pascal/8 + rm -r $casePath/CFD/pascal/8.* + rm -r $casePath/CFD/pascal/9 + rm -r $casePath/CFD/pascal/9.* + rm -r $casePath/CFD/pascal/10 + rm -r $casePath/CFD/pascal/10.* cd $casePath echo "done" } @@ -687,9 +736,27 @@ parCFDDEMrun() #debugMode="valgrind --leak-check=full -v --trace-children=yes --track-origins=yes" debugMode="valgrind --tool=memcheck --leak-check=yes --leak-check-heuristics=stdstring,length64,newarray,multipleinheritance --show-reachable=no --num-callers=20 --track-fds=yes --xml=yes --xml-file=valgrind.xml" elif [[ $debugMode == "profile" ]]; then - # make sure you did hpcstruct before - debugMode="hpcrun" - rm -r $casePath/CFD/hpctoolkit-$solverName-measurements + if [[ $WM_COMPILE_OPTION == "Debug" ]]; then + # make sure you did hpcstruct before + debugMode="hpcrun" + rm -r $casePath/CFD/hpctoolkit-$solverName-measurements + else + echo "" + echo "WARNING - you do not use proper Debug flags! (for hpcrun you need Debug)" + echo "using debugMode off now." + debugMode="" + read + fi + elif [[ $debugMode == "callgrind" ]]; then + if [[ $WM_COMPILE_OPTION == "Debug" ]]; then + debugMode="valgrind --tool=callgrind" + else + echo "" + echo "WARNING - you do not use proper Debug flags! Only when using debug, cachegrind will be able to look through you code." + debugMode="valgrind --tool=callgrind" + read + fi + else debugMode="" fi @@ -755,8 +822,13 @@ parCFDDEMrun() fi if [[ $debugMode == "hpcrun" ]]; then - rm hpctoolkit-$solverName-database* - hpcprof -S $CFDEM_APP_DIR/$solverName.hpcstruct -I ./'*' hpctoolkit-$solverName-measurements + if [ -f $CFDEM_APP_DIR/$solverName.hpcstruct ]; then + rm -r hpctoolkit-$solverName-database* + hpcprof -S $CFDEM_APP_DIR/$solverName.hpcstruct -I ./'*' hpctoolkit-$solverName-measurements + else + echo "you need to run hpcstruct first for your app!" + read + fi fi #- keep terminal open (if started in new terminal) diff --git a/src/lagrangian/cfdemParticle/etc/library-list.txt b/src/lagrangian/cfdemParticle/etc/library-list.txt deleted file mode 100644 index 59f9fe9..0000000 --- a/src/lagrangian/cfdemParticle/etc/library-list.txt +++ /dev/null @@ -1,2 +0,0 @@ -lagrangian/cfdemParticle/dir -eulerian/scalarTransportModelsCFDEM/dir diff --git a/src/lagrangian/cfdemParticle/etc/library-liggghts-list.txt b/src/lagrangian/cfdemParticle/etc/package-undo-liggghts-list.txt similarity index 57% rename from src/lagrangian/cfdemParticle/etc/library-liggghts-list.txt rename to src/lagrangian/cfdemParticle/etc/package-undo-liggghts-list.txt index bb409f7..d25f459 100644 --- a/src/lagrangian/cfdemParticle/etc/library-liggghts-list.txt +++ b/src/lagrangian/cfdemParticle/etc/package-undo-liggghts-list.txt @@ -1,3 +1,7 @@ -#syntax: makefileName/dir +#syntax: packageName/dir #note: dir is not a path, just a keyword here ############################################### +POEMS/dir +DIPOLE/dir +ASPHERE/dir +PASCAL/dir diff --git a/src/lagrangian/cfdemParticle/etc/solver-list.txt b/src/lagrangian/cfdemParticle/etc/solver-list.txt deleted file mode 100644 index 41ca4d9..0000000 --- a/src/lagrangian/cfdemParticle/etc/solver-list.txt +++ /dev/null @@ -1,4 +0,0 @@ -cfdemSolverPiso/dir -cfdemSolverIB/dir -cfdemSolverPisoScalar/dir -cfdemSolverPisoSTM/dir diff --git a/src/lagrangian/cfdemParticle/etc/tutorial-list.txt b/src/lagrangian/cfdemParticle/etc/tutorial-list.txt deleted file mode 100644 index c287909..0000000 --- a/src/lagrangian/cfdemParticle/etc/tutorial-list.txt +++ /dev/null @@ -1,22 +0,0 @@ - -#===================================================================# -# This file specifies the example cases being executed by -# .../etc/testTutorial.sh , which can be run with the alias -# cfdemTestTUT -# Christoph Goniva - June. 2011, DCS Computing GmbH -#===================================================================# - -cfdemSolverPiso/settlingTestMPI/dir - -cfdemSolverPiso/ErgunTestMPI/dir - -cfdemSolverPiso/ErgunTestMPI_cgs/dir - -cfdemSolverPiso/ErgunTestMPI_restart/dir -cfdemSolverPiso/voidfractionTest/dir - -cfdemSolverIB/twoSpheresGlowinskiMPI/dir - -cfdemSolverPisoScalar/packedBedTemp/dir - -cfdemSolverPisoSTM/packedBedTemp/dir diff --git a/src/lagrangian/cfdemParticle/etc/utilities-list.txt b/src/lagrangian/cfdemParticle/etc/utilities-list.txt deleted file mode 100644 index a8ac78b..0000000 --- a/src/lagrangian/cfdemParticle/etc/utilities-list.txt +++ /dev/null @@ -1 +0,0 @@ -cfdemPostproc/dir diff --git a/src/lagrangian/cfdemParticle/subModels/averagingModel/dilute/dilute.C b/src/lagrangian/cfdemParticle/subModels/averagingModel/dilute/dilute.C index 82f5add..88ef1e5 100644 --- a/src/lagrangian/cfdemParticle/subModels/averagingModel/dilute/dilute.C +++ b/src/lagrangian/cfdemParticle/subModels/averagingModel/dilute/dilute.C @@ -129,35 +129,39 @@ void dilute::setVectorAverage scalar weightP; if(weightWithWeight2) //use weight2, e.g., mass-averaged - has no effect, just weight is DIFFERENT! - for(int index=0; index< particleCloud_.numberOfParticles(); index++) { - for(int subCell=0;subCell= 0) + for(int subCell=0;subCell 0) field[cellI] = valueVec; //field[cellI] = valueVec/weightP; + cellI = particleCloud_.cellIDs()[index][subCell]; + if (cellI >= 0) + { + for(int i=0;i<3;i++) valueVec[i] = value[index][i]; + weightP = weight[index][subCell]*weight2[index][subCell]; + weightField[cellI] += weightP; + if(weightP > 0) field[cellI] = valueVec; //field[cellI] = valueVec/weightP; + } } } } else //standard, i.e., volume-averaged - has no effect, just weight is DIFFERENT! - for(int index=0; index< particleCloud_.numberOfParticles(); index++) { - for(int subCell=0;subCell +#include +#include +#include + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam @@ -117,6 +124,8 @@ public: // Member Function void setNumberOfParticles(int) const; + void setNumberOfClumps(int) const; + inline const int& maxNumberOfParticles() const {return maxNumberOfParticles_;}; template @@ -255,9 +264,32 @@ public: particleCloud_.cellIDs_[i][0]=ID[i]; }; + inline void setPositionsCM(label n,double* pos) const + { + particleCloud_.setPositionsCM(n,pos); + }; + inline void setCellIDsCM(label n,int* ID) const + { + particleCloud_.setCellIDsCM(n,ID); + }; + virtual word myType() const=0; - virtual void setCG() const { Warning << "setCG() not executed correctly!" << endl; }; + virtual void setCG() const { FatalError<<"\nsetCG() not executed correctly!\n"<< abort(FatalError); }; + + void setCGs(LAMMPS_NS::LAMMPS *lmp) const + { + particleCloud_.setCG(lmp->force->cg(int(GREAT))); + + Info << "LIGGGHTS hosts " << lmp->atom->ntypes << " atom types." << endl; + + #if defined(typeSecificCG) + Warning << "\nYou are using untested code (type specific coarse graining)!!!\n" + << "\nThis will most probably give wrong results for most models!!!\n"<< endl; + for(int iTyp=1; iTyp<=lmp->atom->ntypes; iTyp++) + particleCloud_.setCGTypeSpecific(iTyp,lmp->force->cg(iTyp)); + #endif + }; }; diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C index 15c2d1a..a1002ac 100644 --- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C +++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C @@ -351,6 +351,7 @@ bool Foam::twoWayMPI::couple(int i) const // give nr of particles to cloud double newNpart = liggghts_get_maxtag(lmp); setNumberOfParticles(newNpart); + setNumberOfClumps(-2); // re-allocate arrays of cloud particleCloud_.clockM().start(4,"LIGGGHTS_reallocArrays"); diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H index 73e9707..74000aa 100644 --- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H +++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.H @@ -157,7 +157,7 @@ public: word myType() const{return typeName; }; - void setCG() const { particleCloud_.setCG(lmp->force->cg()); }; + void setCG() const { setCGs(lmp); }; }; diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/DiFeliceDrag/DiFeliceDrag.C b/src/lagrangian/cfdemParticle/subModels/forceModel/DiFeliceDrag/DiFeliceDrag.C index 0969bf3..b99564e 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/DiFeliceDrag/DiFeliceDrag.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/DiFeliceDrag/DiFeliceDrag.C @@ -167,7 +167,7 @@ void DiFeliceDrag::setForce() const Us = particleCloud_.velocity(index); ds = 2*particleCloud_.radius(index); dParcel = ds; - forceSubM(0).scaleDia(ds); //caution: this fct will scale ds! + forceSubM(0).scaleDia(ds,index); //caution: this fct will scale ds! //Update any scalar or vector quantity for (int iFSub=0;iFSub(nrDefaultSwitches_)), switches_(List(nrDefaultSwitches_)), @@ -134,6 +134,7 @@ forceSubModel::forceSubModel switchesNameList_[iCounter]="implForceDEMaccumulated";iCounter++; //7 switchesNameList_[iCounter]="scalarViscosity";iCounter++; //8 switchesNameList_[iCounter]="verboseToDisk";iCounter++; //9 + switchesNameList_[iCounter]="useCorrectedVoidage";iCounter++; //10 // should be done by default //for(int i=0;i& writeValues) const {};//implement writing to disk + virtual scalar calculateCorrectedVoidage(scalar voidfraction) const {return voidfraction;}; // Access inline bool implForceDEM() const { return switches_[2]; } @@ -208,6 +207,8 @@ public: virtual word myType() const=0; + inline bool useCorrectedVoidage() const { return switches_[10]; } + inline forceModel& myForceM() const { return forceModel_; } inline const List& switches() const { return switches_; } diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/particleCellVolume/particleCellVolume.C b/src/lagrangian/cfdemParticle/subModels/forceModel/particleCellVolume/particleCellVolume.C index 17735be..b7e3c4d 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/particleCellVolume/particleCellVolume.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/particleCellVolume/particleCellVolume.C @@ -64,7 +64,7 @@ particleCellVolume::particleCellVolume forceModel(dict,sm), propsDict_(dict.subDict(typeName + "Props")), mesh_(particleCloud_.mesh()), - startTime_(0.), + startTime_(propsDict_.lookupOrDefault("startTime",0.)), scalarFieldName_("voidfraction"), scalarField_ ( @@ -96,16 +96,8 @@ particleCellVolume::particleCellVolume lowerThreshold_(readScalar(propsDict_.lookup("lowerThreshold"))), path_("postProcessing/particleCellVolume"), sPtr_(NULL), - writeToFile_(false) + writeToFile_(propsDict_.lookupOrDefault("writeToFile",false)) { - if (propsDict_.found("startTime")){ - startTime_=readScalar(propsDict_.lookup("startTime")); - } - - if (propsDict_.found("writeToFile")){ - writeToFile_=Switch(propsDict_.lookup("writeToFile")); - } - // init force sub model setForceSubModels(propsDict_); diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/particleVolume/particleVolume.C b/src/lagrangian/cfdemParticle/subModels/forceModel/particleVolume/particleVolume.C index b40443d..3a83e87 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/particleVolume/particleVolume.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/particleVolume/particleVolume.C @@ -62,20 +62,12 @@ particleVolume::particleVolume : forceModel(dict,sm), propsDict_(dict.subDict(typeName + "Props")), - startTime_(0.), + startTime_(propsDict_.lookupOrDefault("startTime",0.)), scaleDia_(1.), path_("postProcessing/particleVolume"), sPtr_(NULL), - writeToFile_(true) + writeToFile_(propsDict_.lookupOrDefault("writeToFile",false)) { - if (propsDict_.found("startTime")){ - startTime_=readScalar(propsDict_.lookup("startTime")); - } - - if (propsDict_.found("writeToFile")){ - writeToFile_=Switch(propsDict_.lookup("writeToFile")); - } - // init force sub model setForceSubModels(propsDict_); @@ -127,12 +119,15 @@ void particleVolume::setForce() const for(int index = 0;index < particleCloud_.numberOfParticles(); ++index) { - ds = 2*particleCloud_.radius(index)/scaleDia_; - VsTot += ds*ds*ds*fpth; + if(particleCloud_.cellIDs()[index][0] >= 0) + { + ds = 2*particleCloud_.radius(index)/scaleDia_; + VsTot += ds*ds*ds*fpth; + } } reduce(VsTot, sumOp()); - if(forceSubM(0).verbose()) Info << "Total particle volume = " << VsTot << endl; + if(forceSubM(0).verbose()) Info << "Total particle volume (located in domain) = " << VsTot << endl; // write to file if(writeToFile_) diff --git a/src/lagrangian/cfdemParticle/subModels/forceModel/scalarGeneralExchange/scalarGeneralExchange.C b/src/lagrangian/cfdemParticle/subModels/forceModel/scalarGeneralExchange/scalarGeneralExchange.C index 6a1bd43..67898e4 100644 --- a/src/lagrangian/cfdemParticle/subModels/forceModel/scalarGeneralExchange/scalarGeneralExchange.C +++ b/src/lagrangian/cfdemParticle/subModels/forceModel/scalarGeneralExchange/scalarGeneralExchange.C @@ -256,7 +256,7 @@ void scalarGeneralExchange::manipulateScalarField(volScalarField& explicitEulerS int speciesID) const { - // reset Scalar field + // reset Scalar field (== means hard reset) explicitEulerSource == dimensionedScalar("zero", explicitEulerSource.dimensions(), 0.); implicitEulerSource == dimensionedScalar("zero", implicitEulerSource.dimensions(), 0.); @@ -329,14 +329,14 @@ void scalarGeneralExchange::manipulateScalarField(volScalarField& explicitEulerS vector Us(0,0,0); vector Ur(0,0,0); scalar dscaled(0); + scalar dparcel(0); + scalar numberParticlesInParcel(1); scalar nuf(0); scalar magUr(0); scalar As(0); scalar Rep(0); scalar Pr(0); - scalar sDth(scaleDia_*scaleDia_*scaleDia_); - #include "resetVoidfractionInterpolator.H" #include "resetUInterpolator.H" #include "resetFluidScalarFieldInterpolator.H" @@ -358,13 +358,22 @@ void scalarGeneralExchange::manipulateScalarField(volScalarField& explicitEulerS Ufluid = U_[cellI]; fluidValue = fluidScalarField_[cellI]; } + if(forceSubM(0).useCorrectedVoidage()) + { + for (int iFSub=0;iFSub*Nusselt)(Rep,Pr,voidfraction)/(dscaled); + scalar alpha = transportParameter*(this->*Nusselt)(Rep,Pr,voidfraction)/dscaled; // calc convective heat flux [W] scalar areaTimesTransferCoefficient = alpha * As; @@ -650,6 +659,10 @@ void scalarGeneralExchange::setupModel() const Info << "Found a valid partHeatTransCoeffName and partHeatFluidfName (& corresponding species names)." << endl; Info << "scalarGeneralExchange (or derived model) will now proceed with IMPLICIT flux coupling " << endl; } + else if(validPartFlux_ ) { + Info << "Found a valid partHeatFluxName: " << partHeatFluxName_ << endl; + Info << "scalarGeneralExchange (or derived model) will now proceed with EXPLICIT flux coupling for heat. " << endl; + } else FatalError << "scalarGeneralExchange::setupModel: you did not specify a valid flux or transCoeff name set. Please either specify valid flux names, or valid transCoeff and fluid names." << abort(FatalError); @@ -695,6 +708,7 @@ void scalarGeneralExchange::setupModel() const forceSubM(0).setSwitchesList(4,true); // activate search for interpolate switch forceSubM(0).setSwitchesList(8,true); // activate scalarViscosity switch forceSubM(0).setSwitchesList(9,true); // activate verboseToDisk switch + forceSubM(0).setSwitchesList(10,true); // activate correctedVoidage switch // read those switches defined above, if provided in dict for (int iFSub=0;iFSub("runFirst",false)); + if(runFirst_) lastCouplingStep_ = firstCouplingStep_; + checkTimeSettings(dict_); } @@ -111,12 +115,15 @@ string runLiggghts::createCommand( word command, int interval, word appendix, wo bool runLiggghts::runCommand(int couplingStep) { - //change command to "run xxx pre no" - if (preNo_ && (couplingStep > firstCouplingStep_)) - strCommand_=createCommand(command_, particleCloud_.dataExchangeM().couplingInterval(),"pre","no","post","no"); - else - strCommand_=createCommand(command_, particleCloud_.dataExchangeM().couplingInterval()); - + if(couplingStep <= lastCouplingStep_) + { + //change command to "run xxx pre no" + if (preNo_ && (couplingStep > firstCouplingStep_)) + strCommand_=createCommand(command_, particleCloud_.dataExchangeM().couplingInterval(),"pre","no","post","no"); + else + strCommand_=createCommand(command_, particleCloud_.dataExchangeM().couplingInterval()); + }else strCommand_=createCommand(command_, 0); + return runThisCommand(couplingStep); } diff --git a/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearch/engineSearch.C b/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearch/engineSearch.C index 260d9ef..eafbd70 100644 --- a/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearch/engineSearch.C +++ b/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearch/engineSearch.C @@ -113,7 +113,36 @@ label engineSearch::findSingleCell return searchEngine_.findCell(position,oldCellID,treeSearch_); } +label engineSearch::intersection +( + const point& pStart, + const point& pEnd +) const +{ + // find intersection with boundary + label face = searchEngine_.findNearestBoundaryFace(pEnd); + // try alternative + if (face==-1) + { + face = searchEngine_.intersection(pStart,pEnd).index(); + + if (face==-1 && mag(pStart-point(0,0,0))("verbose", false)), + numberOfSatellitePoints_((zSplit_-1)*xySplit_ + 2) +{ + bbPtr_.reset(new boundBox(particleCloud_.mesh().points(), false)); + if(verbose_) + { + Pout<<"MinBounds (x,y,z): "<(xDir) + * (globalBb.max()[0]-globalBb.min()[0]); + for(int yDir=-1; yDir<=1; yDir++) + { + positionCenterPeriodic[1] = position[1] + + static_cast(yDir) + * (globalBb.max()[1]-globalBb.min()[1]); + for(int zDir=-1; zDir<=1; zDir++) + { + positionCenterPeriodic[2] = position[2] + + static_cast(zDir) + * (globalBb.max()[2]-globalBb.min()[2]); + isInside = isInsideRectangularDomain(positionCenterPeriodic, coef_*radius); + if(isInside) break; + } + if(isInside) break; + } + if(isInside) break; + } + } + + + if(isInside) + { + // find cell + label oldID = cellIDs[index][0]; + cellIDs[index][0] = findSingleCell(position,oldID); + + if(cellIDs[index][0] < 0) + { + label altStartPos = -1; + + for(unsigned int countPoints = 0; countPoints < satellitePoints_.size(); ++countPoints) + { + vector pos = getSatellitePoint(index, countPoints); + isInside = isInsideRectangularDomain(pos, SMALL); + + if(isInside) + altStartPos = findSingleCell(pos,oldID); - altStartPos=findSingleCell(pos,oldID); //particleCloud_.mesh().findCell(pos);// //check for periodic domains if(checkPeriodicCells) { for(int iDir=0;iDir<3;iDir++) { if( pos[iDir] > globalBb.max()[iDir] ) - { pos[iDir]-=globalBb.max()[iDir]-globalBb.min()[iDir]; - } else if( pos[iDir] < globalBb.min()[iDir] ) - { pos[iDir]+=globalBb.max()[iDir]-globalBb.min()[iDir]; - } } - altStartPos=findSingleCell(pos,oldID); //particleCloud_.mesh().findCell(pos);// + isInside = isInsideRectangularDomain(pos, SMALL); + + if(isInside) + altStartPos=findSingleCell(pos,oldID); //particleCloud_.mesh().findCell(pos);// } if(altStartPos >= 0) // found position, we're done @@ -143,35 +195,51 @@ label engineSearchIB::findCell cellIDs[index][0] = altStartPos; break; } - } - + } + } } } } return 1; } -vector engineSearchIB::generateSatellitePoint(int index, int countPoints) const +bool engineSearchIB::isInsideRectangularDomain(vector centre, scalar skin) const { - vector position = particleCloud_.position(index); - scalar theta, phi; - const scalar thetaSize = 180./zSplit_, phiSize = 360./xySplit_; - const scalar deg2rad = M_PI/180.; - vector pos = position; - double radius=particleCloud_.radius(index); - if(countPoints == 0) { - pos[2] += radius; - } else if(countPoints == 1) { - pos[2] -= radius; - } else { - scalar thetaLevel = (countPoints - 2) / xySplit_; - theta = deg2rad * thetaSize * (thetaLevel+1); - phi = deg2rad * phiSize * (countPoints - 2 - thetaLevel*xySplit_); - pos[0] += radius * sin(theta) * cos(phi); - pos[1] += radius * sin(theta) * sin(phi); - pos[2] += radius * cos(theta); - } - return pos; + vector offset(skin, skin, skin); + boundBox bb(bbPtr_().min()-offset, bbPtr_().max() + offset); + return bb.contains(centre); +} + +vector engineSearchIB::generateSatellitePoint(int countPoints) const +{ + scalar theta, phi; + const scalar thetaSize = 180./zSplit_, phiSize = 360./xySplit_; + const scalar deg2rad = M_PI/180.; + vector pos(0.0, 0.0, 0.0); + // 1 point at bottom, 1 point at top + if(countPoints == 0) + { + pos[2] = 1.0; + } else if(countPoints == 1) + { + pos[2] = -1.0; + } else { + scalar thetaLevel = (countPoints - 2) / xySplit_; + theta = deg2rad * thetaSize * (thetaLevel+1); + phi = deg2rad * phiSize * (countPoints - 2 - thetaLevel*xySplit_); + pos[0] = sin(theta) * cos(phi); + pos[1] = sin(theta) * sin(phi); + pos[2] = cos(theta); + } + return pos; +} + +vector engineSearchIB::getSatellitePoint(int index, int countPoints) const +{ + double radius=particleCloud_.radius(index); + vector position = particleCloud_.position(index); + vector pos = radius*satellitePoints_[countPoints] + position; + return pos; } diff --git a/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.H b/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.H index 17a5c39..230ee41 100644 --- a/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.H +++ b/src/lagrangian/cfdemParticle/subModels/locateModel/engineSearchIB/engineSearchIB.H @@ -56,9 +56,19 @@ class engineSearchIB { protected: - const label zSplit_; + const label zSplit_; - const label xySplit_; + const label xySplit_; + + scalar coef_; + + mutable autoPtr bbPtr_; + + bool verbose_; + + const label numberOfSatellitePoints_; + + std::vector satellitePoints_; public: @@ -68,33 +78,41 @@ public: // Constructors - //- Construct from components - engineSearchIB - ( - const dictionary& dict, - cfdemCloud& sm - ); + //- Construct from components + engineSearchIB + ( + const dictionary& dict, + cfdemCloud& sm + ); // Destructor - ~engineSearchIB(); + ~engineSearchIB(); // Member Functions - label findCell - ( - double** const& mask, - double**& positions, - double**& cellIDs, - int size - ) const; - - virtual vector generateSatellitePoint - ( - int index, - int countPoints - ) const; + label findCell + ( + double** const& mask, + double**& positions, + double**& cellIDs, + int size + ) const; + vector generateSatellitePoint + ( + int countPoints + ) const; + virtual vector getSatellitePoint + ( + int index, + int countPoints + ) const; + bool isInsideRectangularDomain + ( + vector point, + scalar skin + ) const; }; diff --git a/src/lagrangian/cfdemParticle/subModels/locateModel/locateModel/locateModel.H b/src/lagrangian/cfdemParticle/subModels/locateModel/locateModel/locateModel.H index d792d8b..9fcdacb 100644 --- a/src/lagrangian/cfdemParticle/subModels/locateModel/locateModel/locateModel.H +++ b/src/lagrangian/cfdemParticle/subModels/locateModel/locateModel/locateModel.H @@ -123,7 +123,20 @@ public: ( const point& pStart, const point& pEnd - ) const {return -1;}; + ) const + { + FatalError << "The locate model you use does not define the function intersection(...)." << abort(FatalError); + return -1; + }; + + virtual label findNearestCell + ( + const point& pStart + ) const + { + FatalError << "The locate model you use does not define the function findNearestCell(...)." << abort(FatalError); + return -1; + }; }; diff --git a/src/lagrangian/cfdemParticle/subModels/probeModel/particleProbe/particleProbe.C b/src/lagrangian/cfdemParticle/subModels/probeModel/particleProbe/particleProbe.C index b1c455c..769bf9c 100644 --- a/src/lagrangian/cfdemParticle/subModels/probeModel/particleProbe/particleProbe.C +++ b/src/lagrangian/cfdemParticle/subModels/probeModel/particleProbe/particleProbe.C @@ -321,7 +321,7 @@ void particleProbe::writeProbe(int index, Field sValues, Field v //index and time *sPtr << setprecision(IOstream::defaultPrecision()+7) ; - *sPtr << index << tab + *sPtr << index << " " << particleCloud_.mesh().time().value() << " " ; *sPtr << "|| "; diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C index bdcd6ce..c7c6902 100644 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.C @@ -97,7 +97,7 @@ dividedVoidFraction::dividedVoidFraction FatalError << typeName << ": You are requesting procBoundaryCorrection, this requires the use of engineIB!\n" << abort(FatalError); } - }else{ + } else { if(particleCloud_.locateM().type()=="engineIB") { FatalError << typeName << ": You are using engineIB, this requires using procBoundaryCorrection=true!\n" @@ -107,6 +107,49 @@ dividedVoidFraction::dividedVoidFraction //procBoundaryCorrection_ = true; } } + //generate marker points + int m = 0; + offsets[m][0] = offsets[m][1] = offsets[m][2] = 0.0; + m ++; + + // for 2 different radii + double r1 = cbrt(1.0/29.0); + double r2 = cbrt(15.0/29.0); + scalar r[] = { 0.75* (r2*r2*r2*r2 - r1*r1*r1*r1)/(r2*r2*r2 - r1*r1*r1), + 0.75* (1.0 - r2*r2*r2*r2)/(1.0 - r2*r2*r2) }; + + for(label ir = 0; ir <= 1; ir += 1) + { + // try 8 subpoint derived from spherical coordinates + for (scalar zeta = 0.25*M_PI; zeta < 2.0*M_PI; zeta += 0.5*M_PI) + { + for (scalar theta = 0.25*M_PI; theta < M_PI; theta += 0.5*M_PI) + { + offsets[m][0] = r[ir]*Foam::sin(theta)*Foam::cos(zeta); + offsets[m][1] = r[ir]*Foam::sin(theta)*Foam::sin(zeta); + offsets[m][2] = r[ir]*Foam::cos(theta); + m ++; + } + } + // try 2 more subpoints for each coordinate direction (6 total) + for (int j = -1; j <= 1; j += 2) + { + offsets[m][0] = r[ir]*static_cast(j); + offsets[m][1] = 0.; + offsets[m][2] = 0.; + m ++; + + offsets[m][0] = 0.; + offsets[m][1] = r[ir]*static_cast(j); + offsets[m][2] = 0.; + m ++; + + offsets[m][0] = 0.; + offsets[m][1] = 0.; + offsets[m][2] = r[ir]*static_cast(j); + m ++; + } + } } @@ -125,14 +168,13 @@ void dividedVoidFraction::setvoidFraction(double** const& mask,double**& voidfra else reAllocArrays(); - scalar pi = M_PI; vector position(0.,0.,0.); label cellID = -1; scalar radius(-1.); scalar volume(0.); scalar cellVol(0.); scalar scaleVol= weight(); - scalar scaleRadius = pow(porosity(),1./3.); + scalar scaleRadius = cbrt(porosity()); const boundBox& globalBb = particleCloud_.mesh().bounds(); for(int index=0; index< particleCloud_.numberOfParticles(); index++) @@ -159,7 +201,7 @@ void dividedVoidFraction::setvoidFraction(double** const& mask,double**& voidfra cellVol = 0.; //--variables for sub-search - int nPoints = 29; + int nPoints = numberOfMarkerPoints; int nNotFound=0,nUnEqual=0,nTotal=0; vector offset(0.,0.,0.); int cellsSet = 0; @@ -175,73 +217,39 @@ void dividedVoidFraction::setvoidFraction(double** const& mask,double**& voidfra if (cellID >= 0) // particle centre is in domain { cellVol = particleCloud_.mesh().V()[cellID]; - - // for 2 different radii - for(scalar r = 0.623926*radius;r < radius;r+=0.293976*radius) + for(int i = 0; i < numberOfMarkerPoints; i++) { - // try 8 subpoint derived from spherical coordinates - for (scalar zeta=pi/4.;zeta<(2.*pi);zeta+=(pi/2.)) + if((i == 0 && procBoundaryCorrection_) || i > 0) { - for (scalar theta=(pi/4.);theta(j); - offset[1]=0.; - offset[2]=0.; - #include "setWeightedSource.H" //NP set source terms at position+offset + } - offset[0]=0.; - offset[1]=r*static_cast(j); - offset[2]=0.; - #include "setWeightedSource.H" //NP set source terms at position+offset - - offset[0]=0.; - offset[1]=0.; - offset[2]=r*static_cast(j); - #include "setWeightedSource.H" //NP set source terms at position+offset - } - }// end loop radiivoidfractions - - if(cellsSet>29 || cellsSet<0) + if(cellsSet > numberOfMarkerPoints || cellsSet<0) { Info << "ERROR cellsSet =" << cellsSet << endl; } - scalar centreWeight = 0; - if(procBoundaryCorrection_) - { - //possible if we are sure all particles were found - if(cellWithCenter >= 0) - centreWeight = 1./nPoints; - }else + if(!procBoundaryCorrection_) { // set source for particle center; source 1/nPts+weight of all subpoints that have not been found - centreWeight = 1./nPoints*(nPoints-cellsSet); + scalar centreWeight = 1./nPoints*(nPoints-cellsSet); + // update voidfraction for each particle read + scalar newAlpha = voidfractionNext_[cellID]- volume*centreWeight/cellVol; + if(newAlpha > alphaMin_) voidfractionNext_[cellID] = newAlpha; + else + { + voidfractionNext_[cellID] = alphaMin_; + tooMuch_ += (alphaMin_-newAlpha) * cellVol; + } + // store cellweight for each particle --- this should be done for subpoints as well!! + particleWeights[index][0] += centreWeight; + + // store particleVolume for each particle + particleVolumes[index][0] += volume*centreWeight; + particleV[index][0] += volume*centreWeight; } - - // update voidfraction for each particle read - scalar newAlpha = voidfractionNext_[cellID]- volume*centreWeight/cellVol; - if(newAlpha > alphaMin_) voidfractionNext_[cellID] = newAlpha; - else - { - voidfractionNext_[cellID] = alphaMin_; - tooMuch_ += (alphaMin_-newAlpha) * cellVol; - } - // store cellweight for each particle --- this should be done for subpoints as well!! - particleWeights[index][0] += centreWeight; - - // store particleVolume for each particle - particleVolumes[index][0] += volume*centreWeight; - particleV[index][0] += volume*centreWeight; - /*//OUTPUT if (index==0 && verbose_) { diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.H b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.H index 32ebb96..a060739 100644 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.H +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/dividedVoidFraction.H @@ -45,6 +45,7 @@ SourceFiles namespace Foam { +const int numberOfMarkerPoints = 29; /*---------------------------------------------------------------------------*\ Class noDrag Declaration @@ -77,6 +78,8 @@ private: return 4.188790205*radius*radius*radius*scaleVol; //4/3*pi=4.188790205 }; + vector offsets[numberOfMarkerPoints]; + public: //- Runtime type information diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/setWeightedSource.H b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/setWeightedSource.H index 8eff22d..c680c2e 100755 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/setWeightedSource.H +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/dividedVoidFraction/setWeightedSource.H @@ -64,7 +64,7 @@ } - particleWeights[index][storeInIndex] += 1/static_cast(nPoints); + particleWeights[index][storeInIndex] += 1.0/static_cast(nPoints); particleVolumes[index][storeInIndex] += particleVolume; particleV[index][0] += particleVolume; //====================================================// diff --git a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.C b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.C index 08935f0..a758180 100644 --- a/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.C +++ b/src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.C @@ -187,9 +187,17 @@ bool Foam::voidFractionModel::requiresSuperquadric() const double Foam::voidFractionModel::pointInParticle(int index, vector positionCenter, vector point, double scale) const { - scalar radius = particleCloud_.radius(index); - scalar pointDistSq = magSqr(point - positionCenter); - return pointDistSq / (scale*scale*radius*radius) - 1.0; + scalar radius = particleCloud_.radius(index); + //Pout << "radius=" << radius << endl; + if(radius>SMALL) + { + scalar pointDistSq = magSqr(point - positionCenter); + return pointDistSq / (scale*scale*radius*radius) - 1.0; + } + else + { + return 0.; + } } double Foam::voidFractionModel::pointInParticle(int index, vector positionCenter, vector point) const { diff --git a/src/lagrangian/cfdemParticleComp/Make/files b/src/lagrangian/cfdemParticleComp/Make/files deleted file mode 100755 index 62d53d0..0000000 --- a/src/lagrangian/cfdemParticleComp/Make/files +++ /dev/null @@ -1,128 +0,0 @@ -path = ../cfdemParticle -cfdemCloud = $(path)/cfdemCloud -derived = $(path)/derived -cfdTools = $(path)/cfdTools -forceModels = $(path)/subModels/forceModel -forceSubModels = $(path)/subModels/forceModel/forceSubModels -IOModels = $(path)/subModels/IOModel -voidFractionModels = $(path)/subModels/voidFractionModel -locateModels = $(path)/subModels/locateModel -meshMotionModels = $(path)/subModels/meshMotionModel -momCoupleModels = $(path)/subModels/momCoupleModel -regionModels = $(path)/subModels/regionModel -dataExchangeModels = $(path)/subModels/dataExchangeModel -averagingModels = $(path)/subModels/averagingModel -clockModels = $(path)/subModels/clockModel -liggghtsCommandModels = $(path)/subModels/liggghtsCommandModel -smoothingModels = $(path)/subModels/smoothingModel -probeModels = $(path)/subModels/probeModel - -$(cfdemCloud)/cfdemCloud.C -$(derived)/cfdemCloudIB/cfdemCloudIB.C - -$(cfdTools)/IOtools/json/json.C -$(cfdTools)/global.C -$(cfdTools)/newGlobal.C - -$(forceModels)/forceModel/forceModel.C -$(forceModels)/forceModel/newForceModel.C -$(forceModels)/noDrag/noDrag.C -$(forceModels)/checkCouplingInterval/checkCouplingInterval.C -$(forceModels)/DiFeliceDrag/DiFeliceDrag.C -$(forceModels)/fieldStore/fieldStore.C -$(forceModels)/GidaspowDrag/GidaspowDrag.C -$(forceModels)/SchillerNaumannDrag/SchillerNaumannDrag.C -$(forceModels)/Archimedes/Archimedes.C -$(forceModels)/ArchimedesIB/ArchimedesIB.C -$(forceModels)/interface/interface.C -$(forceModels)/ShirgaonkarIB/ShirgaonkarIB.C -$(forceModels)/KochHillDrag/KochHillDrag.C -$(forceModels)/LaEuScalarTemp/LaEuScalarTemp.C -$(forceModels)/virtualMassForce/virtualMassForce.C -$(forceModels)/gradPForce/gradPForce.C -$(forceModels)/viscForce/viscForce.C -$(forceModels)/MeiLift/MeiLift.C -$(forceModels)/particleCellVolume/particleCellVolume.C -$(forceModels)/particleVolume/particleVolume.C -$(forceModels)/scalarGeneralExchange/scalarGeneralExchange.C -$(forceModels)/fieldTimeAverage/fieldTimeAverage.C -$(forceModels)/volWeightedAverage/volWeightedAverage.C - -$(forceSubModels)/forceSubModel/newForceSubModel.C -$(forceSubModels)/forceSubModel/forceSubModel.C -$(forceSubModels)/ImEx/ImEx.C - -$(probeModels)/probeModel/probeModel.C -$(probeModels)/probeModel/newProbeModel.C -$(probeModels)/noProbe/noProbe.C -$(probeModels)/particleProbe/particleProbe.C - -$(IOModels)/IOModel/IOModel.C -$(IOModels)/IOModel/newIOModel.C -$(IOModels)/noIO/noIO.C -$(IOModels)/basicIO/basicIO.C -$(IOModels)/trackIO/trackIO.C -$(IOModels)/sophIO/sophIO.C - -$(voidFractionModels)/voidFractionModel/voidFractionModel.C -$(voidFractionModels)/voidFractionModel/newVoidFractionModel.C -$(voidFractionModels)/centreVoidFraction/centreVoidFraction.C -$(voidFractionModels)/dividedVoidFraction/dividedVoidFraction.C -$(voidFractionModels)/bigParticleVoidFraction/bigParticleVoidFraction.C -$(voidFractionModels)/GaussVoidFraction/GaussVoidFraction.C -$(voidFractionModels)/IBVoidFraction/IBVoidFraction.C -$(voidFractionModels)/trilinearVoidFraction/trilinearVoidFraction.C -$(voidFractionModels)/noVoidFraction/noVoidFraction.C - -$(locateModels)/locateModel/locateModel.C -$(locateModels)/locateModel/newLocateModel.C -$(locateModels)/standardSearch/standardSearch.C -$(locateModels)/engineSearch/engineSearch.C -$(locateModels)/engineSearchIB/engineSearchIB.C - - -$(meshMotionModels)/meshMotionModel/meshMotionModel.C -$(meshMotionModels)/meshMotionModel/newMeshMotionModel.C -$(meshMotionModels)/noMeshMotion/noMeshMotion.C - -$(momCoupleModels)/momCoupleModel/momCoupleModel.C -$(momCoupleModels)/momCoupleModel/newMomCoupleModel.C -$(momCoupleModels)/explicitCouple/explicitCouple.C -$(momCoupleModels)/implicitCouple/implicitCouple.C -$(momCoupleModels)/noCouple/noCouple.C - -$(regionModels)/regionModel/regionModel.C -$(regionModels)/regionModel/newRegionModel.C -$(regionModels)/allRegion/allRegion.C - -$(dataExchangeModels)/dataExchangeModel/dataExchangeModel.C -$(dataExchangeModels)/dataExchangeModel/newDataExchangeModel.C -$(dataExchangeModels)/oneWayVTK/oneWayVTK.C -$(dataExchangeModels)/twoWayFiles/twoWayFiles.C -$(dataExchangeModels)/noDataExchange/noDataExchange.C -$(dataExchangeModels)/twoWayMPI/twoWayMPI.C - -$(averagingModels)/averagingModel/averagingModel.C -$(averagingModels)/averagingModel/newAveragingModel.C -$(averagingModels)/dilute/dilute.C -$(averagingModels)/dense/dense.C - -$(clockModels)/clockModel/clockModel.C -$(clockModels)/clockModel/newClockModel.C -$(clockModels)/standardClock/standardClock.C -$(clockModels)/noClock/noClock.C - -$(liggghtsCommandModels)/liggghtsCommandModel/liggghtsCommandModel.C -$(liggghtsCommandModels)/liggghtsCommandModel/newLiggghtsCommandModel.C -$(liggghtsCommandModels)/execute/execute.C -$(liggghtsCommandModels)/runLiggghts/runLiggghts.C -$(liggghtsCommandModels)/setDEMGravity/setDEMGravity.C -$(liggghtsCommandModels)/writeLiggghts/writeLiggghts.C -$(liggghtsCommandModels)/readLiggghtsData/readLiggghtsData.C - -$(smoothingModels)/smoothingModel/smoothingModel.C -$(smoothingModels)/smoothingModel/newSmoothingModel.C -$(smoothingModels)/noSmoothing/noSmoothing.C -$(smoothingModels)/constDiffSmoothing/constDiffSmoothing.C - -LIB = $(CFDEM_LIB_DIR)/lib$(CFDEM_LIB_COMP_NAME) diff --git a/src/lagrangian/cfdemParticleComp/Make/options b/src/lagrangian/cfdemParticleComp/Make/options deleted file mode 100755 index a3034b0..0000000 --- a/src/lagrangian/cfdemParticleComp/Make/options +++ /dev/null @@ -1,40 +0,0 @@ -/*NOTE: for compiling the lnInclude of cfdemParticle is needed (exist after wmake libso of cfdemParticle)*/ -/*BUT: the *.dep files of cfdemParticle MUST NOT EXIST (do an rmdepall of of cfdemParticle)*/ - -sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) -sinclude $(RULES)/mplib$(WM_MPLIB) - -GIT_VERSION := $(shell git describe --dirty --always --tags) -PFLAGS+= -DGITVERSION=\"$(GIT_VERSION)\" -PFLAGS+= -DDEBUGFLAG=\"$(DEBUG)\" -PFLAGS+= -DCFDEMWMPROJECTVERSION="$(CFDEM_WM_PROJECT_VERSION)" -PFLAGS+= -Dcompre - -include $(CFDEM_ADD_LIBS_DIR)/$(CFDEM_ADD_LIBS_NAME) - -EXE_INC = \ - $(PFLAGS) \ - $(PINC) \ - -I ../cfdemParticle/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/transportModels \ - $(CFDEM_ADD_COMPTURBMOD_PATHS) \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/OpenFOAM/containers/HashTables/labelHashSet \ - -I$(CFDEM_LIGGGHTS_SRC_DIR) \ - -I$(CFDEM_SRC_DIR)/cfdTools \ - -LIB_LIBS = \ - $(PLIBS) \ - -L$(CFDEM_LIB_DIR) \ - -lfiniteVolume \ - $(CFDEM_ADD_COMPTURBMOD_LIBS) \ - -lfluidThermophysicalModels \ - -lmeshTools \ - -llagrangian \ - -L$(CFDEM_LIGGGHTS_SRC_DIR) \ - -Wl,--whole-archive -l$(CFDEM_LIGGGHTS_LIB_NAME) -Wl,--no-whole-archive \ - $(CFDEM_ADD_LIB_PATHS) \ - $(CFDEM_ADD_STATICLIBS) diff --git a/tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/parCFDDEMrun.sh b/tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/parCFDDEMrun.sh index 134f5d9..674c0c8 100644 --- a/tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverIB/twoSpheresGlowinskiMPI/parCFDDEMrun.sh @@ -64,14 +64,6 @@ fi cp ../../$logfileName $testHarnessPath #- clean up case -echo "deleting data at: $casePath" -source $WM_PROJECT_DIR/bin/tools/CleanFunctions -cd $casePath/CFD -cleanCase -rm -r $casePath/CFD/clockData -rm $casePath/DEM/post/*.* -#rm -r $casePath/DEM/post/restart/*.* -#- preserve post directory -touch $casePath/DEM/post/.gitignore -echo "done" +keepDEMrestart="false" +cleanCFDEMcase $casePath/CFD $keepDEMrestart diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/Allrun.sh b/tutorials/cfdemSolverPiso/ErgunTestMPI/Allrun.sh index ba165d9..29beae2 100755 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI/Allrun.sh +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/Allrun.sh @@ -25,6 +25,21 @@ else $casePath/parDEMrun.sh fi +# keep old couplingProperties +cp $casePath/CFD/constant/couplingProperties $casePath/CFD/constant/couplingProperties_backup + +# change to M2M + type B +#changeDictionary -constant -dict changeDicts/changeDictionaryDict_1 -case $casePath/CFD + +# change to MPI + type A +#changeDictionary -constant -dict changeDicts/changeDictionaryDict_2 -case $casePath/CFD + +# change to MPI + engineIB +#changeDictionary -constant -dict changeDicts/changeDictionaryDict_3 -case $casePath/CFD + #- run parallel CFD-DEM in new terminal #gnome-terminal --title='cfdemSolverPiso ErgunTestMPI CFD' -e "bash $casePath/parCFDDEMrun.sh" . $casePath/parCFDDEMrun.sh + +# restore old couplingProperties +mv $casePath/CFD/constant/couplingProperties_backup $casePath/CFD/constant/couplingProperties diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/0/U b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/0/U index bd31ab5..926287d 100644 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/0/U +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/0/U @@ -39,7 +39,7 @@ boundaryField //type zeroGradient; -/* type groovyBC; + /*type groovyBC; variables "Uend=vector(0,0,0.02);tEnd=0.1;"; valueExpression "((time() < tEnd) ? Uend/tEnd*time():Uend)"; value uniform (0 0 0);*/ diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties index fe686f6..6448f7d 100644 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/couplingProperties @@ -32,7 +32,7 @@ couplingInterval 100; voidFractionModel divided;//centre;// -locateModel engine; +locateModel engine;//engineIB;// meshMotionModel noMeshMotion; @@ -46,7 +46,7 @@ dataExchangeModel twoWayMPI; averagingModel dense;//dilute;// -clockModel standardClock;//off; +clockModel off;//standardClock;// smoothingModel off;// localPSizeDiffSmoothing;// constDiffSmoothing; // @@ -259,18 +259,26 @@ centreProps alphaMin 0.1; } -engineProps +"(engineProps|turboEngineM2MProps)" { treeSearch true; } +engineIBProps +{ + treeSearch true; + zSplit 8; + xySplit 16; +} + dividedProps { alphaMin 0.1; scaleUpVol 1.0; + //procBoundaryCorrection true; } -twoWayMPIProps +"(twoWayMPIProps|M2MProps)" { liggghtsPath "../DEM/in.liggghts_run"; } diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/liggghtsCommands b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/liggghtsCommands index d9e1ce8..16a83a1 100644 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/liggghtsCommands +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/constant/liggghtsCommands @@ -38,6 +38,7 @@ liggghtsCommandModels writeLiggghtsProps { writeLast off; + //path "../DEM"; // optional setting writeName "post/restart/liggghts.restartCFDEM"; overwrite on; } diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/octave/totalPressureDrop.m b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/octave/totalPressureDrop.m index 4dea628..0de8d6d 100644 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/octave/totalPressureDrop.m +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/octave/totalPressureDrop.m @@ -9,13 +9,6 @@ clc; rhoG = 10 % density in kg/m3 %path = '../probes/0/p'; % ext32 path = '../postProcessing/probes/0/p'; - -%- nomenclature before 2.4.x -%columns=22; -%headerlines=4; -%data = loaddata(path,columns,headerlines); -%data=transpose(data); - data = load(path); [x,y]=size(data) dp_sim = (data(:,2)-data(:,y))*rhoG; %conversion to Pa! diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/controlDict b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/controlDict index 888ae26..efeef32 100644 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/controlDict +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/controlDict @@ -52,8 +52,8 @@ maxCo 0.1; /*libs ( "libsimpleSwakFunctionObjects.so" "libswakFunctionObjects.so" - "libgroovyBC.so" - "libfiniteVolumeCFDEM.so" + "libgroovyBC.so" + "libfiniteVolumeCFDEM.so" );*/ functions @@ -69,25 +69,6 @@ functions probeLocations ( (0.00003 0 0.0001) - (0.00003 0 0.0026) - (0.00003 0 0.0051) - (0.00003 0 0.0076) - (0.00003 0 0.0101) - (0.00003 0 0.0126) - (0.00003 0 0.0151) - (0.00003 0 0.0176) - (0.00003 0 0.0201) - (0.00003 0 0.0226) - (0.00003 0 0.0251) - (0.00003 0 0.0276) - (0.00003 0 0.0301) - (0.00003 0 0.0326) - (0.00003 0 0.0351) - (0.00003 0 0.0375) - (0.00003 0 0.0401) - (0.00003 0 0.0426) - (0.00003 0 0.0451) - (0.00003 0 0.0476) (0.00003 0 0.0529) ); diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/fvSolution b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/fvSolution index 3780d0d..6a9ee73 100644 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/fvSolution +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/CFD/system/fvSolution @@ -77,9 +77,9 @@ relaxationFactors } equations { - "U.*" 1.0; + "U.*" 1.; "k.*" 1.; - "epsilon.*" 1.; + "epsilon.*" 1.; } } diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI/parCFDDEMrun.sh b/tutorials/cfdemSolverPiso/ErgunTestMPI/parCFDDEMrun.sh index ef122dd..a05aa1c 100644 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI/parCFDDEMrun.sh @@ -77,21 +77,8 @@ if [ $postproc == "true" ] echo "...press enter to clean up case" echo "press Ctr+C to keep data" read - fi #- clean up case -echo "deleting data at: $casePath ?\n" -read -source $WM_PROJECT_DIR/bin/tools/CleanFunctions -cd $casePath/CFD -cleanCase -rm -r $casePath/CFD/clockData -rm $casePath/CFD/octave/octave-workspace -rm -r $casePath/CFD/hpctoolkit-* -rm $casePath/DEM/post/*.* -touch $casePath/DEM/post/.gitignore -#rm $casePath/DEM/post/restart/*.* -rm $casePath/DEM/post/restart/liggghts.restartCFDEM* -touch $casePath/DEM/post/restart/.gitignore -echo "done" +keepDEMrestart="false" +cleanCFDEMcase $casePath/CFD $keepDEMrestart diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/constant/couplingProperties b/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/constant/couplingProperties index 0bd99ef..aea3431 100644 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/constant/couplingProperties +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI_cgs/CFD/constant/couplingProperties @@ -32,7 +32,7 @@ couplingInterval 100; voidFractionModel divided; -locateModel engine;//turboEngineM2M;// +locateModel engine; meshMotionModel noMeshMotion; @@ -160,14 +160,6 @@ engineProps treeSearch true; } -turboEngineM2MProps -{ - turboEngineProps - { - treeSearch true; - } -} - dividedProps { alphaMin 0.1; diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/constant/couplingProperties_restart b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/constant/couplingProperties_restart index d83c123..a065ce8 100644 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/constant/couplingProperties_restart +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/constant/couplingProperties_restart @@ -32,7 +32,7 @@ couplingInterval 100; voidFractionModel divided;//centre;// -locateModel engine;//turboEngineM2M;// +locateModel engine; meshMotionModel noMeshMotion; @@ -201,14 +201,6 @@ engineProps treeSearch true; } -turboEngineM2MProps -{ - turboEngineProps - { - treeSearch true; - } -} - dividedProps { alphaMin 0.01; diff --git a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/constant/couplingProperties_run b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/constant/couplingProperties_run index f46e8d1..e4ebdce 100644 --- a/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/constant/couplingProperties_run +++ b/tutorials/cfdemSolverPiso/ErgunTestMPI_restart/CFD/constant/couplingProperties_run @@ -32,7 +32,7 @@ couplingInterval 100; voidFractionModel divided;//centre;// -locateModel engine;//turboEngineM2M;// +locateModel engine; meshMotionModel noMeshMotion; @@ -201,14 +201,6 @@ engineProps treeSearch true; } -turboEngineM2MProps -{ - turboEngineProps - { - treeSearch true; - } -} - dividedProps { alphaMin 0.01; diff --git a/tutorials/cfdemSolverPiso/periodicChannel/Allrun.sh b/tutorials/cfdemSolverPiso/periodicChannel/Allrun.sh new file mode 100755 index 0000000..8fe47e1 --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/Allrun.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +#===================================================================# +# allrun script for testcase as part of test routine +# run periodicChannel +# Christoph Goniva - Sept. 2010 +#===================================================================# + +#- define variables +casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" + +# check if mesh was built +if [ -f "$casePath/CFD/constant/polyMesh/points" ]; then + echo "mesh was built before - using old mesh" +else + echo "mesh needs to be built" + cd $casePath/CFD + blockMesh +fi + +if [ -f "$casePath/DEM/post/restart/liggghts.restart" ]; then + echo "LIGGGHTS init was run before - using existing restart file" +else + #- run DEM in new terminal + $casePath/parDEMrun.sh +fi + +#- run parallel CFD-DEM in new terminal +. $casePath/parCFDDEMrun.sh diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/0/Ksl b/tutorials/cfdemSolverPiso/periodicChannel/CFD/0/Ksl new file mode 100644 index 0000000..800bd3a --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/0/Ksl @@ -0,0 +1,40 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object Ksl; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -3 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + inlet + { + type cyclic; + } + + outlet + { + type cyclic; + } + wall + { + type zeroGradient; + } +} + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/0/U b/tutorials/cfdemSolverPiso/periodicChannel/CFD/0/U new file mode 100644 index 0000000..44178e1 --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/0/U @@ -0,0 +1,39 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + object U; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform (0 0 0); + +boundaryField +{ + inlet + { + type cyclic; + } + + outlet + { + type cyclic; + } + wall + { + type fixedValue; + value uniform (0 0 0); + } +} + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/0/Us b/tutorials/cfdemSolverPiso/periodicChannel/CFD/0/Us new file mode 100644 index 0000000..68f9479 --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/0/Us @@ -0,0 +1,40 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + location "0"; + object Us; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform (0 0 0); + +boundaryField +{ + inlet + { + type cyclic; + } + + outlet + { + type cyclic; + } + wall + { + type zeroGradient; + } +} + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/0/p b/tutorials/cfdemSolverPiso/periodicChannel/CFD/0/p new file mode 100644 index 0000000..0ce5cd6 --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/0/p @@ -0,0 +1,38 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object p; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 2 -2 0 0 0 0]; + +internalField uniform 0.; + +boundaryField +{ + inlet + { + type cyclic; + } + + outlet + { + type cyclic; + } + wall + { + type zeroGradient; + } +} + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/0/rho b/tutorials/cfdemSolverPiso/periodicChannel/CFD/0/rho new file mode 100644 index 0000000..32ad9dd --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/0/rho @@ -0,0 +1,38 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object rho; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -3 0 0 0 0 0]; + +internalField uniform 1.3; + +boundaryField +{ + inlet + { + type cyclic; + } + + outlet + { + type cyclic; + } + wall + { + type zeroGradient; + } +} + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/0/voidfraction b/tutorials/cfdemSolverPiso/periodicChannel/CFD/0/voidfraction new file mode 100644 index 0000000..29b4e17 --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/0/voidfraction @@ -0,0 +1,40 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object voidfraction; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1; + +boundaryField +{ + inlet + { + type cyclic; + } + + outlet + { + type cyclic; + } + wall + { + type zeroGradient; + } +} + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/RASProperties b/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/RASProperties new file mode 100644 index 0000000..daec182 --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/RASProperties @@ -0,0 +1,25 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object RASProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +RASModel laminar; + +turbulence off; + +printCoeffs on; + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/couplingProperties b/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/couplingProperties new file mode 100644 index 0000000..f4415f3 --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/couplingProperties @@ -0,0 +1,116 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + + +FoamFile +{ + version 2.0; + format ascii; + + root ""; + case ""; + instance ""; + local ""; + + class dictionary; + object couplingProperties; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +//===========================================================================// +// sub-models & settings + +modelType "A"; // A or B + +couplingInterval 100; + +voidFractionModel divided;//centre;// + +locateModel engine;//engineIB;// + +meshMotionModel noMeshMotion; + +regionModel allRegion; + +IOModel basicIO; + +probeModel off; + +dataExchangeModel twoWayMPI; + +averagingModel dense;//dilute;// + +clockModel off;//standardClock;// + +smoothingModel off;// localPSizeDiffSmoothing;// constDiffSmoothing; // + +forceModels +( + KochHillDrag + gradPForce + viscForce +); + +momCoupleModels +( + implicitCouple +); + +//turbulenceModelType "RASProperties";//"LESProperties";//OFversion24x +turbulenceModelType turbulenceProperties;//"LESProperties";//OFversion30x + +//===========================================================================// +// sub-model properties + +implicitCoupleProps +{ + velFieldName "U"; + granVelFieldName "Us"; + voidfractionFieldName "voidfraction"; +} + +gradPForceProps +{ + pFieldName "p"; + voidfractionFieldName "voidfraction"; + velocityFieldName "U"; + interpolation true; +} + +viscForceProps +{ + velocityFieldName "U"; + interpolation true; +} + +KochHillDragProps +{ + velFieldName "U"; + rhoParticle 1500; + voidfractionFieldName "voidfraction"; + interpolation true; +} + +engineProps +{ + treeSearch true; +} + +dividedProps +{ + alphaMin 0.1; + scaleUpVol 1.0; +} + +twoWayMPIProps +{ + maxNumberOfParticles 10100; + liggghtsPath "../DEM/in.liggghts_resume"; +} +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/g b/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/g new file mode 100644 index 0000000..936f357 --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/g @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class uniformDimensionedVectorField; + location "constant"; + object g; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -2 0 0 0 0]; +value ( 0 0 9.81 ); + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/liggghtsCommands b/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/liggghtsCommands new file mode 100644 index 0000000..d2bb7f5 --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/liggghtsCommands @@ -0,0 +1,31 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + + +FoamFile +{ + version 2.0; + format ascii; + + root ""; + case ""; + instance ""; + local ""; + + class dictionary; + object liggghtsCommands; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +liggghtsCommandModels +( + runLiggghts +); + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/polyMesh/blockMeshDict b/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/polyMesh/blockMeshDict new file mode 100644 index 0000000..46a542f --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/polyMesh/blockMeshDict @@ -0,0 +1,83 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object blockMeshDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +convertToMeters 1;//0.008; + +vertices +( + (0. 0. 0.) + (0.4 0. 0.) + (0.4 0.1 0.) + (0. 0.1 0.) + (0. 0. 0.1) + (0.4 0. 0.1) + (0.4 0.1 0.1) + (0. 0.1 0.1) +); + +blocks +( + hex (0 1 2 3 4 5 6 7) (32 8 8) simpleGrading (1 1 1) +); + +edges +( +); + +boundary +( + wall + { + type wall; + faces + ( + (0 3 2 1)//bottom + (4 5 6 7)//top + (1 5 4 0)//front + (3 7 6 2)//back + ); + } + + outlet + { + type cyclic;//cyclicAMI; + neighbourPatch inlet; + transform translational; + separationVector (-0.4 0 0); + faces + ( + (2 6 5 1)//outlet + ); + } + + inlet + { + type cyclic;//cyclicAMI; + neighbourPatch outlet; + transform translational; + separationVector (0.4 0 0); + faces + ( + (0 4 7 3)//inlet + ); + } +); + +mergePatchPairs +( +); + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/transportProperties b/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/transportProperties new file mode 100644 index 0000000..1e80362 --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/transportProperties @@ -0,0 +1,37 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object transportProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +transportModel Newtonian; + +nu nu [ 0 2 -1 0 0 0 0 ] 1.5e-04; + +CrossPowerLawCoeffs +{ + nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; + m m [ 0 0 1 0 0 0 0 ] 1; + n n [ 0 0 0 0 0 0 0 ] 1; +} + +BirdCarreauCoeffs +{ + nu0 nu0 [ 0 2 -1 0 0 0 0 ] 1e-06; + nuInf nuInf [ 0 2 -1 0 0 0 0 ] 1e-06; + k k [ 0 0 1 0 0 0 0 ] 0; + n n [ 0 0 0 0 0 0 0 ] 1; +} +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/turbulenceProperties b/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/turbulenceProperties new file mode 100644 index 0000000..67156f5 --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/constant/turbulenceProperties @@ -0,0 +1,29 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +//simulationType RASModel; //OFversion24x +simulationType laminar; //OFversion30x + +RAS //OFversion30x +{ //OFversion30x + RASModel laminar; //kEpsilon; //OFversion30x + turbulence off; //OFversion30x + printCoeffs on; //OFversion30x +} //OFversion30x + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/octave/checkVolFlow.m b/tutorials/cfdemSolverPiso/periodicChannel/CFD/octave/checkVolFlow.m new file mode 100644 index 0000000..0b68173 --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/octave/checkVolFlow.m @@ -0,0 +1,152 @@ +% +close all; +clear; +clc; + +%====================================% +% simulation data +%====================================% + +skip=0; +nrSamples = 0; +Ainlet=1.000000e-02; % cross sectional area in m2 +Utarget=10; % target superficial velocity in m/s +Vtarget=Utarget*Ainlet; % target flowrate in m3/s + +filename = 'faceSource.dat'; +timedirectory = '0'; + + %Daten einlesen + path = '../../CFD/postProcessing/volFlow_inlet'; + data = transpose(load(strcat(path,'/',timedirectory,'/',filename))); %data + [x,y]=size(data); + time=data(1,1+skip:y) + volFlow_inlet=data(3,1+skip:y) + + %Daten einlesen + path = '../../CFD/postProcessing/volFlow_outlet'; + data = transpose(load(strcat(path,'/',timedirectory,'/',filename))); %data + [x,y]=size(data) + time=data(1,1+skip:y); + volFlow_outlet=data(3,1+skip:y); + + %Daten einlesen + path = '../../CFD/postProcessing/volFlow_wall'; + data = transpose(load(strcat(path,'/',timedirectory,'/',filename))); %data + [x,y]=size(data) + time=data(1,1+skip:y); + volFlow_wall=data(3,1+skip:y); + +%- time integrate data to vol entered per TS +deltatT=time(2)-time(1) +volPerTs_inlet=volFlow_inlet(1,:).*deltatT; +volPerTs_outlet=volFlow_outlet(1,:).*deltatT; +volPerTs_wall=volFlow_wall(1,:).*deltatT; + +%- accumulated vol entered +vol_inlet(1)=volPerTs_inlet(1); +vol_outlet(1)=volPerTs_outlet(1); +vol_wall(1)=volPerTs_wall(1); +for i=2:y-skip + vol_inlet(i) = vol_inlet(i-1) + volPerTs_inlet(i); + vol_outlet(i) = vol_outlet(i-1) + volPerTs_outlet(i); + vol_wall(i) = vol_wall(i-1) + volPerTs_wall(i); +end + +%=================================== +% plot 1 +xAxisLabel = 'time [s]'; +yAxisLabel = 'time integrated flux in [m3]'; + +% Create figure +figure1 = figure('PaperPositionMode','manual','PaperUnits','centimeters',... +% 'PaperPosition',[0 0 15.5 10],'PaperSize',[15.5 10],... + 'Color',[1 1 1]); + +% Create axes +axes1 = axes('Parent',figure1,'YGrid','on','XGrid','on','LineWidth',1,... + 'FontWeight','light','FontSize',11,'FontName','Helvetica-Narrow'); +box(axes1,'on'); +hold(axes1,'all'); + +% Create plot +plot(time,vol_inlet,'r','Parent',axes1,'Marker','none','LineWidth',1,... + time,-vol_outlet,'g','Parent',axes1,'Marker','none','LineWidth',1,... + time,-vol_wall,'b','Parent',axes1,'Marker','none','LineWidth',1); + +% Create xlabel +xlabel(xAxisLabel,'FontWeight','bold','FontSize',11,'FontName','Helvetica-Narrow'); +% Create ylabel +ylabel(yAxisLabel,'FontWeight','bold','FontSize',11,'FontName','Helvetica-Narrow'); +% Define axis +%axis([dMin,dMax]); + +title('time integrated flux acoss patches'); +legend('inlet','-1*outlet','wall'); +print -color "volEntered.png" + +%=================================== +% plot 2 +xAxisLabel = 'time [s]'; +yAxisLabel = 'vol entered in TS [m3]'; + +% Create figure +figure2 = figure('PaperPositionMode','manual','PaperUnits','centimeters',... +% 'PaperPosition',[0 0 15.5 10],'PaperSize',[15.5 10],... + 'Color',[1 1 1]); + +% Create axes +axes2 = axes('Parent',figure2,'YGrid','on','XGrid','on','LineWidth',1,... + 'FontWeight','light','FontSize',11,'FontName','Helvetica-Narrow'); +box(axes2,'on'); +hold(axes2,'all'); + +% Create plot +plot(time,volPerTs_inlet,'r','Parent',axes2,'Marker','none','LineWidth',1,... + time,-volPerTs_outlet,'g','Parent',axes2,'Marker','none','LineWidth',1,... + time,-volPerTs_wall,'b','Parent',axes2,'Marker','none','LineWidth',1); + +% Create xlabel +xlabel(xAxisLabel,'FontWeight','bold','FontSize',11,'FontName','Helvetica-Narrow'); +% Create ylabel +ylabel(yAxisLabel,'FontWeight','bold','FontSize',11,'FontName','Helvetica-Narrow'); +% Define axis +%axis([dMin,dMax]); + +title('vol flux * time = vol entered per TS'); +legend('inlet','outlet','wall'); +print -color "volEnteredPerTS.png" + +%=================================== +% plot 3 +xAxisLabel = 'time [s]'; +yAxisLabel = 'vol flux in [m3/s]'; + +% Create figure +figure3 = figure('PaperPositionMode','manual','PaperUnits','centimeters',... +% 'PaperPosition',[0 0 15.5 10],'PaperSize',[15.5 10],... + 'Color',[1 1 1]); + +% Create axes +axes3 = axes('Parent',figure3,'YGrid','on','XGrid','on','LineWidth',1,... + 'FontWeight','light','FontSize',11,'FontName','Helvetica-Narrow'); +box(axes3,'on'); +hold(axes3,'all'); + +% Create plot +plot(time,volFlow_inlet(1,:),'r','Parent',axes3,'Marker','none','LineWidth',1,... + time,-volFlow_outlet(1,:),'g','Parent',axes3,'Marker','none','LineWidth',1,... + time,-volFlow_wall(1,:),'b','Parent',axes3,'Marker','none','LineWidth',1,... + [min(time),max(time)],[-Vtarget,-Vtarget],'c','Parent',axes3,'Marker','none','LineWidth',1); + +% Create xlabel +xlabel(xAxisLabel,'FontWeight','bold','FontSize',11,'FontName','Helvetica-Narrow'); +% Create ylabel +ylabel(yAxisLabel,'FontWeight','bold','FontSize',11,'FontName','Helvetica-Narrow'); +% Define axis +%axis([dMin,dMax]); + +title('vol flux'); +legend('inlet','outlet','wall','Vtarget'); +print -color "volflow.png" + diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/controlDict b/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/controlDict new file mode 100644 index 0000000..1911872 --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/controlDict @@ -0,0 +1,139 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object controlDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +application cfdemSolverPiso; + +startFrom startTime; + +startTime 0; + +stopAt endTime; + +endTime 0.01; + +deltaT 1e-3; + +writeControl adjustableRunTime; + +writeInterval 1e-3; + +purgeWrite 0; + +writeFormat ascii; + +writePrecision 6; + +writeCompression uncompressed; + +timeFormat general; + +timePrecision 6; + +runTimeModifiable yes; + +adjustTimeStep no; + +maxCo 0.1; + +libs ( "libfvOptionsCFDEM.so" ); + +functions +( + + probes + { + type probes; + // Where to load it from + functionObjectLibs ( "libsampling.so" ); + // Name of the directory for probe data + name probes; + probeLocations + ( + (0.00003 0.05 0.05) + (0.39999 0.05 0.05) + ); + + // Fields to be probed + fields ( p U voidfraction ); + + // Write at same frequency as fields + outputControl timeStep;//outputTime; + outputInterval 1; + } + + + volFlow_inlet + { + type faceSource; + functionObjectLibs ("libfieldFunctionObjects.so"); + enabled true; + outputControl outputTime;//timeStep; + log true; + writeArea true; //write for OF 3.0 to be consistent + valueOutput true; + source patch; + sourceName inlet; + operation sum; + + fields + ( + phi + ); + surfaceFormat null; + } + + volFlow_outlet + { + type faceSource; + functionObjectLibs ("libfieldFunctionObjects.so"); + enabled true; + outputControl outputTime;//timeStep; + log true; + writeArea true; //write for OF 3.0 to be consistent + valueOutput true; + source patch; + sourceName outlet; + operation sum; + + fields + ( + phi + ); + surfaceFormat null; + } + + volFlow_wall + { + type faceSource; + functionObjectLibs ("libfieldFunctionObjects.so"); + enabled true; + outputControl outputTime;//timeStep; + log true; + writeArea true; //write for OF 3.0 to be consistent + valueOutput true; + source patch; + sourceName wall; + operation sum; + + fields + ( + phi + ); + surfaceFormat null; + } +); +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/controlDict.foam b/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/controlDict.foam new file mode 100644 index 0000000..310256a --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/controlDict.foam @@ -0,0 +1,115 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object controlDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +application pisoFoam; + +startFrom startTime; + +startTime 0; + +stopAt endTime; + +endTime 2.0; + +deltaT 1e-5; + +writeControl adjustableRunTime; + +writeInterval 0.2; + +purgeWrite 0; + +writeFormat ascii; + +writePrecision 6; + +writeCompression uncompressed; + +timeFormat general; + +timePrecision 6; + +runTimeModifiable yes; + +adjustTimeStep no; + +maxCo 0.1; + +//libs ( "libgroovyBC.so" ); + +functions +( + +/* probes + { + type probes; + // Where to load it from + functionObjectLibs ( "libsampling.so" ); + // Name of the directory for probe data + name probes; + probeLocations + ( + (0 0 0) + ); + + // Fields to be probed + fields ( avUslipX avUslipY avUslipZ ); + + // Write at same frequency as fields + outputControl timeStep;//outputTime; + outputInterval 1; + } +/*/ + + volAvU + { + type cellSource; + functionObjectLibs ("libfieldFunctionObjects.so"); + enabled true; + outputControl outputTime;//timeStep;// + log false; + valueOutput false; + source all; + operation weightedAverage; + weightField "voidfraction"; + fields + ( + U + ); + } + + /*pressureDrop + { + type patchAverage; + functionObjectLibs + ( + "libsimpleFunctionObjects.so" + ); + verbose true; + patches + ( + inlet + outlet + ); + fields + ( + p + ); + factor 1; + }*/ +); +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/decomposeParDict b/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/decomposeParDict new file mode 100644 index 0000000..dd1f909 --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/decomposeParDict @@ -0,0 +1,86 @@ +/*-------------------------------*- C++ -*---------------------------------*\ +| ========= | +| \\ / OpenFOAM | +| \\ / | +| \\ / The Open Source CFD Toolbox | +| \\/ http://www.OpenFOAM.org | +\*-------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + note "mesh decomposition control dictionary"; + location "system"; + object decomposeParDict; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +numberOfSubdomains 4; + +//- Keep owner and neighbour on same processor for faces in zones: +// preserveFaceZones (heater solid1 solid3); + +//method scotch; +// method hierarchical; + method simple; +// method metis; +// method manual; + +simpleCoeffs +{ + n (1 1 4); + delta 0.001; +} + +hierarchicalCoeffs +{ + n (2 2 1); + delta 0.001; + order xyz; +} + +metisCoeffs +{ + /* + processorWeights + ( + 1 + 1 + 1 + 1 + ); + */ +} + +scotchCoeffs +{ + //processorWeights + //( + // 1 + // 1 + // 1 + // 1 + //); + //writeGraph true; + //strategy "b"; +} + +manualCoeffs +{ + dataFile "decompositionData"; +} + + +//// Is the case distributed +//distributed yes; +//// Per slave (so nProcs-1 entries) the directory above the case. +//roots +//( +// "/tmp" +// "/tmp" +//); + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/fvOptions b/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/fvOptions new file mode 100644 index 0000000..ec7071d --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/fvOptions @@ -0,0 +1,35 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 3.0.x | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object fvOptions; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +momentumSource +{ + type meanSupVelocityForce; + active yes; + + meanSupVelocityForceCoeffs + { + selectionMode all; // apply force to all cells + + fieldNames (U); // name of velocity field + Ubar (10 0 0);// desired mean velocity + relaxation 0.9; // optional relaxation factor + voidfractionField "voidfraction"; + } +} + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/fvSchemes b/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/fvSchemes new file mode 100644 index 0000000..2c26136 --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/fvSchemes @@ -0,0 +1,56 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSchemes; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default backward; +} + +gradSchemes +{ + default Gauss linear; +} + +divSchemes +{ + default Gauss linear; + div(phi,U) Gauss limitedLinearV 1; +} + +laplacianSchemes +{ + default Gauss linear corrected; +} + +interpolationSchemes +{ + default linear; +} + +snGradSchemes +{ + default corrected; +} + +fluxRequired +{ + default no; + p ; +} + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/fvSolution b/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/fvSolution new file mode 100644 index 0000000..253d52f --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/CFD/system/fvSolution @@ -0,0 +1,72 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + p + { + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0.1; + } + + pFinal + { + $p; + relTol 0; + } + + "(U|k|epsilon|R|nuTilda)" + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0.1; + } + + "(U|k|epsilon|R|nuTilda)Final" + { + $U; + relTol 0; + } +} + +relaxationFactors +{ + fields + { + p 1.0; + } + equations + { + "U.*" 1.; + "k.*" 1.; + "epsilon.*" 1.; + } +} + +PISO +{ + nCorrectors 3; + nNonOrthogonalCorrectors 0; + pRefCell 0; + pRefValue 0; +} + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPiso/periodicChannel/DEM/in.liggghts_init b/tutorials/cfdemSolverPiso/periodicChannel/DEM/in.liggghts_init new file mode 100644 index 0000000..17942e4 --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/DEM/in.liggghts_init @@ -0,0 +1,65 @@ +echo both +log ../DEM/log.liggghts +thermo_log ../DEM/post/thermo.txt + +atom_style granular +atom_modify map array +communicate single vel yes + +boundary p f f +newton off + +units si + +region reg block 0 0.4 0 0.1 0 0.1 units box +create_box 1 reg + +neighbor 0.001 bin +neigh_modify delay 0 + + +# Material properties required for granular pair styles + +fix m1 all property/global youngsModulus peratomtype 5.e6 +fix m2 all property/global poissonsRatio peratomtype 0.45 +fix m3 all property/global coefficientRestitution peratomtypepair 1 0.3 +fix m4 all property/global coefficientFriction peratomtypepair 1 0.5 + +# pair style +pair_style gran model hertz tangential history # Hertzian without cohesion +pair_coeff * * + +# timestep, gravity +timestep 0.00001 +fix gravi all gravity 9.81 vector 0.0 0.0 1.0 + +# walls +#fix xwalls1 all wall/gran model hertz tangential history primitive type 1 xplane 0.0 +#fix xwalls2 all wall/gran model hertz tangential history primitive type 1 xplane 0.4 +fix ywalls1 all wall/gran model hertz tangential history primitive type 1 yplane 0.0 +fix ywalls2 all wall/gran model hertz tangential history primitive type 1 yplane 0.1 +fix zwalls1 all wall/gran model hertz tangential history primitive type 1 zplane 0.0 +fix zwalls2 all wall/gran model hertz tangential history primitive type 1 zplane 0.1 + +# particle distributions and insertion +fix pts1 all particletemplate/sphere 15485863 atom_type 1 density constant 2000 radius constant 0.0005 +fix pdd1 all particledistribution/discrete 15485867 1 pts1 1.0 + +fix ins all insert/pack seed 32452843 distributiontemplate pdd1 vel constant 0. 0. 1. insert_every once overlapcheck yes all_in yes particles_in_region 1000 region reg + +# apply nve integration to all particles that are inserted as single particles +fix integr all nve/sphere + +# screen output +compute 1 all erotate/sphere +thermo_style custom step atoms ke c_1 vol +thermo 1000 +thermo_modify lost ignore norm no +compute_modify thermo_temp dynamic yes + +# insert the first particles so that dump is not empty +run 1 +dump dmp all custom 5000 post/dump.liggghts_init id type type x y z ix iy iz vx vy vz fx fy fz omegax omegay omegaz radius + +run 10000 upto +write_restart post/restart/liggghts.restart diff --git a/tutorials/cfdemSolverPiso/periodicChannel/DEM/in.liggghts_resume b/tutorials/cfdemSolverPiso/periodicChannel/DEM/in.liggghts_resume new file mode 100644 index 0000000..0360ddb --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/DEM/in.liggghts_resume @@ -0,0 +1,70 @@ +echo both +log ../DEM/log.liggghts +thermo_log ../DEM/post/thermo.txt + +atom_style granular +atom_modify map array +communicate single vel yes + +boundary p f f +newton off + +units si +processors 2 2 1 + +#read the restart file +read_restart ../DEM/post/restart/liggghts.restart + +neighbor 0.0005 bin +neigh_modify delay 0 + +#Material properties required for new pair styles + +fix m1 all property/global youngsModulus peratomtype 5.e6 +fix m2 all property/global poissonsRatio peratomtype 0.45 +fix m3 all property/global coefficientRestitution peratomtypepair 1 0.3 +fix m4 all property/global coefficientFriction peratomtypepair 1 0.5 + +#pair style +pair_style gran model hertz tangential history #Hertzian without cohesion +pair_coeff * * + +#timestep, gravity +timestep 0.00001 +fix gravi all gravity 9.81 vector 0.0 0.0 1.0 + +#walls +#fix xwalls1 all wall/gran model hertz tangential history primitive type 1 xplane 0.0 +#fix xwalls2 all wall/gran model hertz tangential history primitive type 1 xplane 0.4 +fix ywalls1 all wall/gran model hertz tangential history primitive type 1 yplane 0.0 +fix ywalls2 all wall/gran model hertz tangential history primitive type 1 yplane 0.1 +fix zwalls1 all wall/gran model hertz tangential history primitive type 1 zplane 0.0 +fix zwalls2 all wall/gran model hertz tangential history primitive type 1 zplane 0.1 + +#cfd coupling +fix cfd all couple/cfd couple_every 100 mpi +fix cfd2 all couple/cfd/force/implicit + +#apply nve integration to all particles that are inserted as single particles +fix integr all nve/sphere + +#center of mass +compute centerOfMass all com + +#compute total dragforce +compute dragtotal all reduce sum f_dragforce[1] f_dragforce[2] f_dragforce[3] + +#screen output +compute 1 all erotate/sphere +thermo_style custom step atoms ke c_1 vol c_centerOfMass[3] c_dragtotal[1] c_dragtotal[2] c_dragtotal[3] +thermo 10 +thermo_modify lost ignore norm no +compute_modify thermo_temp dynamic yes + +#insert the first particles so that dump is not empty +dump myDump all stl 1 post/dump_*.stl +#run 1 +dump dmp all custom 5000 ../DEM/post/dump*.liggghts_restart id type type x y z vx vy vz fx fy fz f_dragforce[1] f_dragforce[2] f_dragforce[3] radius +undump myDump + +run 0 diff --git a/tutorials/cfdemSolverPiso/periodicChannel/DEM/post/.gitignore b/tutorials/cfdemSolverPiso/periodicChannel/DEM/post/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/tutorials/cfdemSolverPiso/periodicChannel/DEM/post/restart/.gitignore b/tutorials/cfdemSolverPiso/periodicChannel/DEM/post/restart/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/tutorials/cfdemSolverPiso/periodicChannel/parCFDDEMrun.sh b/tutorials/cfdemSolverPiso/periodicChannel/parCFDDEMrun.sh new file mode 100755 index 0000000..1cb8afe --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/parCFDDEMrun.sh @@ -0,0 +1,90 @@ +#!/bin/bash + +#===================================================================# +# allrun script for testcase as part of test routine +# run settlingTest CFD part +# Christoph Goniva - Feb. 2011 +#===================================================================# + +#- source CFDEM env vars +. ~/.bashrc + +#- include functions +source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh + +#--------------------------------------------------------------------------------# +#- define variables +casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" +logpath=$casePath +headerText="run_parallel_cfdemSolverPiso_periodicChannel_CFDDEM" +logfileName="log_$headerText" +solverName="cfdemSolverPiso" +nrProcs="4" +machineFileName="none" # yourMachinefileName | none +debugMode="off" # on | off| strict +testHarnessPath="$CFDEM_TEST_HARNESS_PATH" +runOctave="true" +postproc="false" +cleanCase="true" +#--------------------------------------------------------------------------------# + +#- call function to run a parallel CFD-DEM case +parCFDDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $machineFileName $debugMode + + +if [ $runOctave == "true" ] + then + #------------------------------# + # octave + + #- change path + cd octave + + #- rmove old graph + rm *.png + + #- run octave + octave checkVolFlow.m + + #- show plot + eog volflow.png + + #- copy log file to test harness + cp ../../$logfileName $testHarnessPath + cp *.png $testHarnessPath +fi + +if [ $postproc == "true" ] + then + + #- keep terminal open (if started in new terminal) + echo "simulation finished? ...press enter to proceed" + read + + #- get VTK data from liggghts dump file + cd $casePath/DEM/post + python -i $CFDEM_LPP_DIR/lpp.py dump*.liggghts_restart + + #- get VTK data from CFD sim + cd $casePath/CFD + foamToVTK #- serial run of foamToVTK + #source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions + #pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK + + #- start paraview + paraview + + #- keep terminal open (if started in new terminal) + echo "...press enter to clean up case" + echo "press Ctr+C to keep data" + read + +fi + +#- clean up case +if [ $cleanCase == "true" ] + then + #- clean up case + keepDEMrestart="false" + cleanCFDEMcase $casePath/CFD $keepDEMrestart +fi diff --git a/tutorials/cfdemSolverPiso/periodicChannel/parDEMrun.sh b/tutorials/cfdemSolverPiso/periodicChannel/parDEMrun.sh new file mode 100755 index 0000000..85cc298 --- /dev/null +++ b/tutorials/cfdemSolverPiso/periodicChannel/parDEMrun.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +#===================================================================# +# DEMrun script for ErgunTestMPI testcase +# init ErgunTestMPI +# Christoph Goniva - July 2014 +#===================================================================# + +#- source CFDEM env vars +. ~/.bashrc + +#- include functions +source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh + +echo "starting DEM run in parallel..." +#--------------------------------------------------------------------------------# +#- define variables +casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" +logpath="$casePath" +headerText="run_liggghts_init_DEM" +logfileName="log_$headerText" +solverName="in.liggghts_init" +nrProcs=4 +machineFileName="none" # yourMachinefileName | none +debugMode="off" +#--------------------------------------------------------------------------------# + +#- call function to run DEM case +parDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $machineFileName $debugMode + diff --git a/tutorials/cfdemSolverPiso/settlingTestMPI/Allrun.sh b/tutorials/cfdemSolverPiso/settlingTestMPI/Allrun.sh index 3d81448..a0e7064 100755 --- a/tutorials/cfdemSolverPiso/settlingTestMPI/Allrun.sh +++ b/tutorials/cfdemSolverPiso/settlingTestMPI/Allrun.sh @@ -18,6 +18,18 @@ else blockMesh fi +# keep old couplingProperties +cp $casePath/CFD/constant/couplingProperties $casePath/CFD/constant/couplingProperties_backup + +# change to M2M +#changeDictionary -constant -dict changeDicts/changeDictionaryDict_1 -case $casePath/CFD + +# change to MPI +#changeDictionary -constant -dict changeDicts/changeDictionaryDict_2 -case $casePath/CFD + #- run parallel CFD-DEM in new terminal #gnome-terminal --title='cfdemSolverPiso settlingTest CFD' -e "bash $casePath/parCFDDEMrun.sh" . $casePath/parCFDDEMrun.sh + +# restore old couplingProperties +mv $casePath/CFD/constant/couplingProperties_backup $casePath/CFD/constant/couplingProperties diff --git a/tutorials/cfdemSolverPiso/settlingTestMPI/CFD/constant/couplingProperties b/tutorials/cfdemSolverPiso/settlingTestMPI/CFD/constant/couplingProperties index e444ff4..79aaf7f 100755 --- a/tutorials/cfdemSolverPiso/settlingTestMPI/CFD/constant/couplingProperties +++ b/tutorials/cfdemSolverPiso/settlingTestMPI/CFD/constant/couplingProperties @@ -31,7 +31,7 @@ couplingInterval 100; voidFractionModel divided;//centre;//bigParticle;// -locateModel engine;///ijk;//standard; +locateModel engine;//turboEngineM2M;// meshMotionModel noMeshMotion; @@ -41,7 +41,7 @@ IOModel basicIO; //trackIO; // probeModel off; -dataExchangeModel twoWayMPI;//twoWayFiles;//oneWayVTK;// +dataExchangeModel twoWayMPI;//M2M;// averagingModel dense;//dilute;// @@ -137,7 +137,7 @@ oneWayVTKProps maxNumberOfParticles 30000; } -twoWayMPIProps +"(twoWayMPIProps|M2MProps)" { liggghtsPath "../DEM/in.liggghts_run"; } @@ -166,7 +166,7 @@ bigParticleProps scaleUpVol 1.0; } -engineProps +"(engineProps|turboEngineM2MProps)" { treeSearch true; } diff --git a/tutorials/cfdemSolverPiso/settlingTestMPI/CFD/constant/liggghtsCommands b/tutorials/cfdemSolverPiso/settlingTestMPI/CFD/constant/liggghtsCommands index 6517f08..cf09fe4 100644 --- a/tutorials/cfdemSolverPiso/settlingTestMPI/CFD/constant/liggghtsCommands +++ b/tutorials/cfdemSolverPiso/settlingTestMPI/CFD/constant/liggghtsCommands @@ -34,6 +34,7 @@ liggghtsCommandModels writeLiggghtsProps { writeLast off; + path "../DEM/post/restart"; //writeName "name"; overwrite on; verbose; diff --git a/tutorials/cfdemSolverPiso/settlingTestMPI/CFD/octave/settlingVelocity.m b/tutorials/cfdemSolverPiso/settlingTestMPI/CFD/octave/settlingVelocity.m index 4a9e226..d1eea02 100644 --- a/tutorials/cfdemSolverPiso/settlingTestMPI/CFD/octave/settlingVelocity.m +++ b/tutorials/cfdemSolverPiso/settlingTestMPI/CFD/octave/settlingVelocity.m @@ -1,3 +1,4 @@ +% close all; clear; clc; @@ -55,7 +56,8 @@ hold on plot(t_sim,-U_sim(:,2),'rd-') legend("analytical - Stokes","simulation - DiFelice?") -print('cfdemSolverPiso_settlingTestMPI.eps','-deps2') +%print('cfdemSolverPiso_settlingTestMPI.eps','-deps2') +print -color "cfdemSolverPiso_settlingTestMPI.png" %figure(2) %plot(t_,X_) diff --git a/tutorials/cfdemSolverPiso/settlingTestMPI/DEM/post/restart/.gitignore b/tutorials/cfdemSolverPiso/settlingTestMPI/DEM/post/restart/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/tutorials/cfdemSolverPiso/settlingTestMPI/parCFDDEMrun.sh b/tutorials/cfdemSolverPiso/settlingTestMPI/parCFDDEMrun.sh index 2d622d7..c3d168a 100644 --- a/tutorials/cfdemSolverPiso/settlingTestMPI/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverPiso/settlingTestMPI/parCFDDEMrun.sh @@ -37,17 +37,17 @@ if [ $runOctave == "true" ] cd octave #- rmove old graph - rm cfdemSolverPiso_settlingTestMPI.eps + rm cfdemSolverPiso_settlingTestMPI.png #- run octave octave settlingVelocity.m #- show plot - evince cfdemSolverPiso_settlingTestMPI.eps + eog cfdemSolverPiso_settlingTestMPI.png #- copy log file to test harness cp ../../$logfileName $testHarnessPath - cp cfdemSolverPiso_settlingTestMPI.eps $testHarnessPath + cp cfdemSolverPiso_settlingTestMPI.png $testHarnessPath fi if [ $postproc == "true" ] @@ -79,17 +79,6 @@ fi #- clean up case if [ $cleanUp == "true" ] then - echo "deleting data at: $casePath :\n" - source $WM_PROJECT_DIR/bin/tools/CleanFunctions - cd $casePath/CFD - cleanCase - cd $casePath - rm -r $casePath/CFD/clockData - rm -r $casePath/DEM/post/* - rm -r $casePath/DEM/liggghts.restartCFDEM* - echo "done" + keepDEMrestart="false" + cleanCFDEMcase $casePath/CFD $keepDEMrestart fi - -#- preserve post directory -touch $casePath/DEM/post/.gitignore - diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTemp/Allrun.sh b/tutorials/cfdemSolverPisoSTM/packedBedTemp/Allrun.sh index 28a67b7..a237af7 100755 --- a/tutorials/cfdemSolverPisoSTM/packedBedTemp/Allrun.sh +++ b/tutorials/cfdemSolverPisoSTM/packedBedTemp/Allrun.sh @@ -26,5 +26,4 @@ else fi #- run parallel CFD-DEM in new terminal -#gnome-terminal --title='cfdemSolverPisoScalar packedBedTemp CFD' -e "bash $casePath/parCFDDEMrun.sh" . $casePath/parCFDDEMrun.sh diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTemp/CFD/constant/couplingProperties b/tutorials/cfdemSolverPisoSTM/packedBedTemp/CFD/constant/couplingProperties index 96c744d..2d56c8d 100644 --- a/tutorials/cfdemSolverPisoSTM/packedBedTemp/CFD/constant/couplingProperties +++ b/tutorials/cfdemSolverPisoSTM/packedBedTemp/CFD/constant/couplingProperties @@ -41,7 +41,7 @@ regionModel allRegion; IOModel basicIO; -probeModel particleProbe; +probeModel off; dataExchangeModel twoWayMPI; @@ -54,7 +54,7 @@ smoothingModel off; forceModels ( KochHillDrag - scalarGeneralExchange + scalarGeneralExchange Archimedes ); @@ -124,9 +124,9 @@ scalarGeneralExchangeProps implicitCoupleProps { - velFieldName "U"; - granVelFieldName "Us"; - voidfractionFieldName "voidfraction"; + velFieldName "U"; + granVelFieldName "Us"; + voidfractionFieldName "voidfraction"; //KslLimit 0; // source switched off!!! } @@ -165,12 +165,6 @@ viscForceProps interpolation true; } -oneWayVTKProps -{ - couplingFilename "vtk_out%4.4d.vtk"; - maxNumberOfParticles 30000; -} - twoWayMPIProps { maxNumberOfParticles 10000; diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTemp/CFD/octave/totalPressureDropAndNusselt.m b/tutorials/cfdemSolverPisoSTM/packedBedTemp/CFD/octave/totalPressureDropAndNusselt.m index 7e70f72..dab6cb3 100644 --- a/tutorials/cfdemSolverPisoSTM/packedBedTemp/CFD/octave/totalPressureDropAndNusselt.m +++ b/tutorials/cfdemSolverPisoSTM/packedBedTemp/CFD/octave/totalPressureDropAndNusselt.m @@ -15,10 +15,10 @@ dp = 0.022; % particle diameter phip = 1; % sphericity epsilon = 0.4436; % voidfraction U = 1; % superficial velocity -L = 1; % length of bed -rhoG = 1.188; % density in kg/m -nuG = 1.5e-3; % kinemat Visk in m2/s -muG = nuG*rhoG % dynam visc in Pa s +L = 1; % length of bed +rhoG = 1.188; % density in kg/m +nuG = 1.5e-3; % kinemat Visk in m2/s +muG = nuG*rhoG % dynam visc in Pa s dpErgun= L * ( 150*((1-epsilon)^2/epsilon^3)*((muG*U)/(phip*dp)^2) @@ -29,14 +29,8 @@ fprintf('final pressure drop = %f Pa\n',dpErgun) %====================================% % simulation data %====================================% -%path = '../probes/0/p'; % 2.1.x -path = '../postProcessing/probes/0/p'; % 2.2.x - -%- nomenclature before 2.4.x -%columns=3; -%headerlines=5; -%data = loaddata(path,columns,headerlines); -%data=transpose(data); +%path = '../probes/0/p'; % ext32 +path = '../postProcessing/probes/0/p'; data = load(path); [x,y]=size(data); @@ -54,7 +48,7 @@ title("Ergun pressure drop") legend("analytical - Ergun","simulation") %print('cfdemSolverPiso_settlingTest.eps','-deps2') -print -color "cfdemSolverPisoScalar_pressureDrop.eps" +print -color "cfdemSolverPisoSTM_pressureDrop.png" %*********************************************************************% % heat transfer @@ -74,13 +68,8 @@ Tp = 600; Np = 1005; lambda = 0.0256; -%path = '../probes/0/T'; % 2.1.x -path = '../postProcessing/probes/0/T'; % 2.2.x -%- nomenclature before 2.4.x -%columns=5; -%headerlines=5; -%data = loaddata(path,columns,headerlines); -%data=transpose(data); +%path = '../probes/0/T'; % ext32 +path = '../postProcessing/probes/0/T'; data = load(path); [x,y]=size(data); @@ -130,14 +119,14 @@ plot(t_sim,Nu_LiMason,t_sim,Nu_sim) title("Nusselt nr") legend("analytical - ","simulation") -%print('cfdemSolverPisoScalar_NusseltNr.eps','-deps2') -print -color "cfdemSolverPisoScalar_Nusselt.eps" +%print('cfdemSolverPisoSTM_NusseltNr.eps','-deps2') +print -color "cfdemSolverPisoSTM_Nusselt.png" figure(3) plot(t_sim,Tin_sim,t_sim,Tout_sim) title("inlet/outlet temperature") legend("inlet","outlet") -%print('cfdemSolverPisoScalar_NusseltNr.eps','-deps2') -print -color "cfdemSolverPisoScalar_temperatures.eps" +%print('cfdemSolverPisoSTM_NusseltNr.eps','-deps2') +print -color "cfdemSolverPisoSTM_temperatures.png" diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTemp/CFD/system/controlDict b/tutorials/cfdemSolverPisoSTM/packedBedTemp/CFD/system/controlDict index 1995970..8327c85 100644 --- a/tutorials/cfdemSolverPisoSTM/packedBedTemp/CFD/system/controlDict +++ b/tutorials/cfdemSolverPisoSTM/packedBedTemp/CFD/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application cfdemSolverPisoScalar; +application cfdemSolverPisoSTM; startFrom startTime; diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTemp/CFD/system/fvSolution b/tutorials/cfdemSolverPisoSTM/packedBedTemp/CFD/system/fvSolution index c205e1a..a926d09 100644 --- a/tutorials/cfdemSolverPisoSTM/packedBedTemp/CFD/system/fvSolution +++ b/tutorials/cfdemSolverPisoSTM/packedBedTemp/CFD/system/fvSolution @@ -46,19 +46,16 @@ solvers $U } - k + "(k|epsilon)" { solver PBiCG; preconditioner DILU; tolerance 1e-05; - relTol 0; + relTol 0.1; } - - epsilon + "(k|epsilon)Final" { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; + $epsilon; relTol 0; } diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTemp/DEM/in.liggghts_run b/tutorials/cfdemSolverPisoSTM/packedBedTemp/DEM/in.liggghts_run index 96b882a..ca182fd 100644 --- a/tutorials/cfdemSolverPisoSTM/packedBedTemp/DEM/in.liggghts_run +++ b/tutorials/cfdemSolverPisoSTM/packedBedTemp/DEM/in.liggghts_run @@ -57,7 +57,8 @@ fix cfd2 all couple/cfd/force # heat transfer fix ftco all property/global thermalConductivity peratomtype 5. # lambda in [W/(K*m)] fix ftca all property/global thermalCapacity peratomtype 0.1 # cp in [J/(kg*K)] -fix cfd3 all couple/cfd/convection T0 600 +fix cfd3 all couple/cfd/convection T0 600 +fix heattransfer all heat/gran initial_temperature 600. # species transfer fix specCap all property/global speciesCCapacity peratomtype 1.0 @@ -68,17 +69,12 @@ run 0 region total block INF INF INF INF INF INF units box set region total property/atom Temp 600. - -# this one invokes heat transfer calculation, transfers per-particle temperature and adds convective heat flux to particles - - - # apply nve integration to all particles that are inserted as single particles fix integr all nve/sphere # output settings, include total thermal energy compute rke all erotate/sphere -thermo_style custom step atoms ke c_rke +thermo_style custom step atoms ke c_rke vol f_heattransfer thermo 1000 thermo_modify lost ignore norm no compute_modify thermo_temp dynamic yes diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTemp/parCFDDEMrun.sh b/tutorials/cfdemSolverPisoSTM/packedBedTemp/parCFDDEMrun.sh index c777d5b..6bd0049 100644 --- a/tutorials/cfdemSolverPisoSTM/packedBedTemp/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverPisoSTM/packedBedTemp/parCFDDEMrun.sh @@ -39,20 +39,20 @@ if [ $runOctave == "true" ] cd octave #- rmove old graph - rm *.eps + rm *.png #- run octave octave totalPressureDropAndNusselt.m #- show plots - evince cfdemSolverPisoScalar_Nusselt.eps & - evince cfdemSolverPisoScalar_pressureDrop.eps + eog cfdemSolverPisoSTM_Nusselt.png & + eog cfdemSolverPisoSTM_pressureDrop.png #------------------------------# #- copy log file to test harness cp ../../$logfileName $testHarnessPath - cp cfdemSolverPisoScalar_Nusselt.eps $testHarnessPath - cp cfdemSolverPisoScalar_pressureDrop.eps $testHarnessPath + cp cfdemSolverPisoSTM_Nusselt.png $testHarnessPath + cp cfdemSolverPisoSTM_pressureDrop.png $testHarnessPath fi @@ -86,18 +86,9 @@ fi #- clean up case if [ $cleanup == "true" ] then - echo "deleting data at: $casePath : \n" - source $WM_PROJECT_DIR/bin/tools/CleanFunctions - cd $casePath/CFD - cleanCase - rm -r $casePath/CFD/clockData - rm $casePath/DEM/post/*.* - #rm -r $casePath/DEM/post/restart/*.* - echo "done" - - #- preserve post directory - touch $casePath/DEM/post/.gitignore - touch $casePath/DEM/post/restart/.gitignore + #- clean up case + keepDEMrestart="false" + cleanCFDEMcase $casePath/CFD $keepDEMrestart fi diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/Allrun.sh b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/Allrun.sh new file mode 100755 index 0000000..a237af7 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/Allrun.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +#===================================================================# +# allrun script for testcase as part of test routine +# run settlingTest +# Christoph Goniva - August 2011 +#===================================================================# + +#- define variables +casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" + +# check if mesh was built +if [ -f "$casePath/CFD/constant/polyMesh/points" ]; then + echo "mesh was built before - using old mesh" +else + echo "mesh needs to be built" + cd $casePath/CFD + blockMesh +fi + +if [ -f "$casePath/DEM/post/restart/liggghts.restart" ]; then + echo "LIGGGHTS init was run before - using existing restart file" +else + #- run DEM init + $casePath/parDEMrun.sh +fi + +#- run parallel CFD-DEM in new terminal +. $casePath/parCFDDEMrun.sh diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/Ksl b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/Ksl new file mode 100644 index 0000000..f44ecab --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/Ksl @@ -0,0 +1,41 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object Ksl; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -3 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + wall + { + type zeroGradient; + //type fixedValue; + //value uniform 0; + } + inlet + { + type zeroGradient; + } + outlet + { + type zeroGradient; + } +} + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/T b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/T new file mode 100644 index 0000000..e18d73a --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/T @@ -0,0 +1,40 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object T; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 1 0 0 0]; + +internalField uniform 263; + +boundaryField +{ + inlet + { + type fixedValue; + value uniform 263; + } + + outlet + { + type zeroGradient; + } + + wall + { + type zeroGradient; + } +} + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/TSource b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/TSource new file mode 100644 index 0000000..2920828 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/TSource @@ -0,0 +1,50 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0.05"; + object TSource; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 -1 1 0 0 0]; + +// Tsource[K/s] = q[W/m3]/(rho[kg/m3]*cp[W*s/(kg*K)]) +// Q=10 W +// V=0.01 m3 +// q=1000 W/m3 +// cp=1000 +// rho=1 +// --> Tsource = 1 + +internalField uniform 0; + +boundaryField +{ + inlet + { + type zeroGradient; + value uniform 0; + } + outlet + { + type zeroGradient; + value uniform 0; + } + wall + { + type zeroGradient; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/U b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/U new file mode 100644 index 0000000..b241f8d --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/U @@ -0,0 +1,43 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + object U; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform (0 0 0.001); + +boundaryField +{ + + wall + { + //type fixedValue; + //value uniform (0 0 0); + type slip; + } + + inlet + { + type fixedValue; + value uniform (0 0 1); + } + + outlet + { + type zeroGradient; + } +} + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/Us b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/Us new file mode 100644 index 0000000..1af9a05 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/Us @@ -0,0 +1,45 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volVectorField; + location "0"; + object Us; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform (0 0 0); + +boundaryField +{ + wall + { + type zeroGradient; + //type fixedValue; + //value uniform (1 0 0); + } + inlet + { + type zeroGradient; + //type fixedValue; + //value uniform (1 0 0);; + } + outlet + { + type zeroGradient; + //type fixedValue; + //value uniform (1 0 0); + } +} + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/epsilon b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/epsilon new file mode 100644 index 0000000..37ffab5 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/epsilon @@ -0,0 +1,48 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object epsilon; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 2 -3 0 0 0 0]; + +internalField uniform 0.003; + +boundaryField +{ + wall + { + type epsilonWallFunction; + Cmu 0.09; + kappa 0.41; + E 9.8; + value uniform 0.003; + } + outlet + { + type inletOutlet; + inletValue uniform 0.003; + value uniform 0.003; + } + inlet + { + /*type turbulentMixingLengthDissipationRateInlet; + mixingLength 0.005; + value uniform 0.003;*/ + type zeroGradient; + } +} + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/k b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/k new file mode 100644 index 0000000..bbf04af --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/k @@ -0,0 +1,45 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object k; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 2 -2 0 0 0 0]; + +internalField uniform 0.001; + +boundaryField +{ + wall + { + type kqRWallFunction; + value uniform 0.001; + } + outlet + { + type inletOutlet; + inletValue uniform 0.001; + value uniform 0.001; + } + inlet + { + /*type turbulentIntensityKineticEnergyInlet; + intensity 0.05; + value uniform 0.001;*/ + type zeroGradient; + } +} + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/nut b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/nut new file mode 100644 index 0000000..bc53fb9 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/nut @@ -0,0 +1,45 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object nut; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 2 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + wall + { + type nutkWallFunction; + Cmu 0.09; + kappa 0.41; + E 9.8; + value uniform 0; + } + outlet + { + type calculated; + value uniform 0; + } + inlet + { + type calculated; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/p b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/p new file mode 100644 index 0000000..99e3041 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/p @@ -0,0 +1,45 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object p; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 2 -2 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + + wall + { +// type fixedFluxPressure; +// phi phi; + type zeroGradient; + } + + inlet + { +// type fixedFluxPressure; +// phi phi; + type zeroGradient; + } + outlet + { + //type zeroGradient; + type fixedValue; + value uniform 0; + } +} + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/rho b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/rho new file mode 100644 index 0000000..af41954 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/rho @@ -0,0 +1,39 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object rho; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -3 0 0 0 0 0]; + +internalField uniform 1.188; + +boundaryField +{ + + wall + { + type zeroGradient; + } + + inlet + { + type zeroGradient; + } + outlet + { + type zeroGradient; + } +} + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/voidfraction b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/voidfraction new file mode 100644 index 0000000..3fdf6da --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/0/voidfraction @@ -0,0 +1,41 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object voidfraction; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 0 0 0 0 0 0]; + +internalField uniform 1; + +boundaryField +{ + wall + { + type zeroGradient; + } + outlet + { + type fixedValue; + value uniform 1; + } + inlet + { + type fixedValue; + value uniform 1; + } +} + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/RASProperties b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/RASProperties new file mode 100644 index 0000000..81b1ec9 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/RASProperties @@ -0,0 +1,25 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object RASProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +RASModel kEpsilon; + +turbulence on; + +printCoeffs on; + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/couplingProperties b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/couplingProperties new file mode 100644 index 0000000..a8958e1 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/couplingProperties @@ -0,0 +1,185 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + + +FoamFile +{ + version 2.0; + format ascii; + + root ""; + case ""; + instance ""; + local ""; + + class dictionary; + object couplingProperties; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +//===========================================================================// +// sub-models & settings +solveFlow true; + +modelType B; // A or B + +couplingInterval 500; + +voidFractionModel divided; + +locateModel engine; + +meshMotionModel noMeshMotion; + +regionModel allRegion; + +IOModel basicIO; + +probeModel off;//particleProbe; + +dataExchangeModel twoWayMPI; + +averagingModel dense;//dilute;// + +clockModel off;//standardClock;// + +smoothingModel off; + +forceModels +( + KochHillDrag + scalarGeneralExchange + Archimedes +); + +momCoupleModels +( + implicitCouple +); + +//turbulenceModelType RASProperties;//LESProperties;//OFversion24x +turbulenceModelType turbulenceProperties;//OFversion30x + +//===========================================================================// +// sub-model properties +particleProbeProps +{ + particleIDsToSample (0 0); + verboseToFile; //main switch + printEvery 20; //print every this many CFD time steps + sampleAll; //Activate sampling for all particles + probeDebug; //probes additional fields + includePosition; //will include particle position in the output file + writePrecision 4; //number of significant digits to print +} + +scalarGeneralExchangeProps +{ +/* verbose true;*/ + velFieldName "U"; + voidfractionFieldName "voidfraction"; + tempFieldName "T"; + partTempName "Temp"; + //Option 1: cool with implicit coupling +/* partHeatTransCoeffName "heatTransCoeff"; //switch off for explicit coupling, e.g., to ParScale */ +/* partHeatFluidName "heatFluid"; //switch off for explicit coupling, e.g., to ParScale */ + + //Option 2: cool with explicit setting of flux + partHeatFluxName "convectiveHeatFlux"; //switch off for implicit coupling, e.g., to ParScale + + lambda 0.0256; + //Cp 1007; + Prandtl 70.097; //WARNING: this is not a typical gas - just for testing purposes! + useLiMason true; + + //Lists with information for each species FOR THE PARTICLES + //MUST be in the same order as eulerian species in 'scalarTransportProperties' + //MUST correspond to property/atom in liggghts (use 'couple/cfd/speciesConvection' to auto-generate individual fields) + partSpeciesNames + ( + ); + partSpeciesFluxNames + ( + ); + partSpeciesTransCoeffNames + ( + ); + partSpeciesFluidNames + ( + ); + DMolecular + ( + ); + //parameters for the vapor pressure model + parameterVap + ( + 0 + ); +} + +implicitCoupleProps +{ + velFieldName "U"; + granVelFieldName "Us"; + voidfractionFieldName "voidfraction"; + //KslLimit 0; // source switched off!!! +} + +explicitCoupleProps +{ + //fLimit (0 0 0); +} + +KochHillDragProps +{ + velFieldName "U"; + voidfractionFieldName "voidfraction"; +} + +ArchimedesProps +{ + gravityFieldName "g"; +} +gradPForceProps +{ + pFieldName "p"; + voidfractionFieldName "voidfraction"; + velocityFieldName "U"; + //interpolation true; +} + +viscForceProps +{ + velocityFieldName "U"; + interpolation true; +} + +twoWayMPIProps +{ + maxNumberOfParticles 10000; + liggghtsPath "../DEM/in.liggghts_run"; +} + +centreProps +{ + alphaMin 0.1; +} + +dividedProps +{ + alphaMin 0.4; + scaleUpVol 1.0; +} + +engineProps +{ + treeSearch true; +} + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/g b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/g new file mode 100644 index 0000000..769d982 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/g @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class uniformDimensionedVectorField; + location "constant"; + object g; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -2 0 0 0 0]; +value ( 0 -9.81 0); + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/liggghtsCommands b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/liggghtsCommands new file mode 100644 index 0000000..abff2e2 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/liggghtsCommands @@ -0,0 +1,57 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + + +FoamFile +{ + version 2.0; + format ascii; + + root ""; + case ""; + instance ""; + local ""; + + class dictionary; + object liggghtsCommands; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +liggghtsCommandModels +( + runLiggghts + execute +); + +// reset particle temperature every coupling step +executeProps1 +{ + command + ( + set + region + total + noBlanks + property + slash + atom // former peratom + blanks + Temp + number + ); + scalars + ( + 600 + ); + runFirst off; + runLast off; + runEveryCouplingStep on; +} + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/polyMesh/blockMeshDict b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/polyMesh/blockMeshDict new file mode 100644 index 0000000..d47576f --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/polyMesh/blockMeshDict @@ -0,0 +1,63 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object blockMeshDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +convertToMeters 1.; + +vertices +( + (0. 0 -0.5) + (0.1 0 -0.5) + (0.1 0.1 -0.5) + (0. 0.1 -0.5) + (0. 0 1.5) + (0.1 0 1.5) + (0.1 0.1 1.5) + (0. 0.1 1.5) +); + +blocks +( + hex (0 1 2 3 4 5 6 7) (2 2 33) simpleGrading (1 1 1) +); + +edges +( +); + +patches +( + wall inlet + ( + (0 3 2 1) + ) + wall outlet + ( + (4 5 6 7) + ) + wall wall + ( + (3 7 6 2) + (1 5 4 0) + (0 4 7 3) + (2 6 5 1) + ) +); + +mergePatchPairs +( +); + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/scalarTransportProperties b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/scalarTransportProperties new file mode 100644 index 0000000..3ec2f67 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/scalarTransportProperties @@ -0,0 +1,54 @@ +/*---------------------------------------------------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.4 | +| \\ / A nd | Web: http://www.openfoam.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ + + +FoamFile +{ + version 2.0; + format ascii; + + root ""; + case ""; + instance ""; + local ""; + + class dictionary; + object scalarTransportProperties; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +//===========================================================================// +// sub-models & settings + +scalarTransportModel generalManual; + +generalManualProps +{ + ScT 0.7; //optional + PrT 0.7; //optional + + //in case the user does not want to generate a separate field, + //the volumetric heat capacity can be set here (as a global constant) + cpVolumetric 1196; //this is the mixture density times the heat capacity + //must have dimensions [J/K/(m_voidspace)³] + //will only be used if cpVolumetricFieldName, or updateMixtureProperties = false + +// cpVolumetricFieldName "cpRho"; +// rhoMixFieldName "rhoMix"; + + eulerianFields + ( + //C + T + ); + + // fvOptionsC {}; + fvOptionsT {}; +}; +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/transportProperties b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/transportProperties new file mode 100644 index 0000000..26794a1 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/transportProperties @@ -0,0 +1,22 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object transportProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +transportModel Newtonian; + +nu nu [ 0 2 -1 0 0 0 0 ] 1.5e-03; + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/turbulenceProperties b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/turbulenceProperties new file mode 100644 index 0000000..a3dfd6b --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/constant/turbulenceProperties @@ -0,0 +1,31 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +//simulationType RASModel;//OFversion24x +simulationType RAS;//OFversion30x + +RAS +{ + RASModel kEpsilon; + + turbulence on; + + printCoeffs on; +} + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/octave/totalPressureDropAndNusselt.m b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/octave/totalPressureDropAndNusselt.m new file mode 100644 index 0000000..f5924cc --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/octave/totalPressureDropAndNusselt.m @@ -0,0 +1,132 @@ +close all; +clear; +clc; + + +%*********************************************************************% +% pressure drop +%*********************************************************************% + +%=================== +% Ergun Equation +%=================== +fprintf('\ncalc Ergun eqn:\n') +dp = 0.022; % particle diameter +phip = 1; % sphericity +epsilon = 0.4436; % voidfraction +U = 1; % superficial velocity +L = 1; % length of bed +rhoG = 1.188; % density in kg/m +nuG = 1.5e-3; % kinemat Visk in m2/s +muG = nuG*rhoG % dynam visc in Pa s + +dpErgun= L * ( + 150*((1-epsilon)^2/epsilon^3)*((muG*U)/(phip*dp)^2) + +1.75*((1-epsilon)/epsilon^3)*((rhoG*U^2)/(phip*dp)) + ) + +fprintf('final pressure drop = %f Pa\n',dpErgun) +%====================================% +% simulation data +%====================================% +%path = '../probes/0/p'; % ext32 +path = '../postProcessing/probes/0/p'; + +data = load(path); +[x,y]=size(data); +dp_sim = data(:,2)-data(:,y); +t_sim = data(:,1); +fprintf('final pressureDrop of sim = %f Pa\n',dp_sim(length(dp_sim)) ) + +%====================================% +% plot data +%====================================% +figure(1) +plot(t_sim,dpErgun*ones(1,length(t_sim)),t_sim,dp_sim) +axis([0,0.7,0,dpErgun(length(dpErgun))]) +title("Ergun pressure drop") +legend("analytical - Ergun","simulation") + +%print('cfdemSolverPiso_settlingTest.eps','-deps2') +print -color "cfdemSolverPisoSTM_pressureDrop.png" + +%*********************************************************************% +% heat transfer +%*********************************************************************% + +%====================================% +% simulation data +%====================================% + +cp = 1007; +A = 0.01; +U = U; +alpha = epsilon; +nuF = nuG; +rhoF = rhoG; +Tp = 600; +Np = 1005; +lambda = 0.0256; + +%path = '../probes/0/T'; % ext32 +path = '../postProcessing/probes/0/T'; + +data = load(path); +[x,y]=size(data); +Tin_sim = data(:,2); % mean temp inlet temp [K] +Tout_sim = data(:,3); % mean temp outlet temp [K] +t_sim = data(:,1); +fprintf('final inlet temperature of sim = %f K\n',Tin_sim(length(Tin_sim)) ) +fprintf('final outlet temperature of sim = %f K\n',Tout_sim(length(Tout_sim)) ) + + +uF = U/alpha; % interstitial velocity [m/s] +ReP_sim = uF.*ones(length(t_sim),1)*dp/nuF; % ReynoldsNr based in dp +Pr = nuF*rhoF*cp/lambda; +qin_sim = U * A * rhoF * cp .* Tin_sim; +qout_sim = U * A * rhoF * cp .* Tout_sim; +q_sim = (qout_sim-qin_sim); % particle fluid heat flux [W] (out-in) +Tmean_sim = 0.5*(Tin_sim+Tout_sim); % mean temp of fluid +deltaT = Tp - Tmean_sim; % mean temp diff between partcles and fluid +h=q_sim./(Np*dp^2*pi*deltaT); % average particle-fluid heat transfer coeff [W/(m2*K)] +Nu_sim = h.*dp/lambda; % mean particle Nusselt nr +t_sim = data(:,1); +fprintf('q_sim = %f \n',q_sim(length(Nu_sim))) +fprintf('Nu_sim = %f \n',Nu_sim(length(Nu_sim))) + +%=================== +% Nusselt Equation +%=================== +fprintf('\ncalc Nusselt eqn:\n') + +%% following Li and Mason +n=3.5 +if (ReP_sim(length(uF)) <200) + Nu_LiMason=2.*ones(length(uF),1)+0.6*alpha^n.*ReP_sim.^0.5.*Pr^0.33; +elseif (ReP_sim(length(uF)) <1500) + Nu_LiMason=2.*ones(length(uF),1)+0.5*alpha^n.*ReP_sim.^0.5*Pr^0.33 + 0.02*alpha^n.*ReP_sim.^0.8.*Pr^0.33; +else + Nu_LiMason=2.*ones(length(uF),1) +0.000045*alpha^n.*ReP_sim.^1.8; +end + +fprintf('Nu_LiMason = %f \n',Nu_LiMason(length(Nu_LiMason))) + +%====================================% +% plot data +%====================================% +figure(2) +plot(t_sim,Nu_LiMason,t_sim,Nu_sim) +title("Nusselt nr") +legend("analytical - ","simulation") + +%print('cfdemSolverPisoScalar_NusseltNr.eps','-deps2') +print -color "cfdemSolverPisoSTM_Nusselt.png" + +figure(3) +plot(t_sim,Tin_sim,t_sim,Tout_sim) +title("inlet/outlet temperature") +legend("inlet","outlet") + +%print('cfdemSolverPisoScalar_NusseltNr.eps','-deps2') +print -color "cfdemSolverPisoSTM_temperatures.png" + diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/0/heat.json b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/0/heat.json new file mode 100644 index 0000000..1cdaffe --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/0/heat.json @@ -0,0 +1,1011 @@ +{ + "name": "heat", + "data": + { + "1": [293,293,293,293,293,293,293,293,293,293, 323], + "2": [293,293,293,293,293,293,293,293,293,293, 323], + "3": [293,293,293,293,293,293,293,293,293,293, 323], + "4": [293,293,293,293,293,293,293,293,293,293, 323], + "5": [293,293,293,293,293,293,293,293,293,293, 323], + "6": [293,293,293,293,293,293,293,293,293,293, 323], + "7": [293,293,293,293,293,293,293,293,293,293, 323], + "8": [293,293,293,293,293,293,293,293,293,293, 323], + "9": [293,293,293,293,293,293,293,293,293,293, 323], + "10": [293,293,293,293,293,293,293,293,293,293, 323], + "11": [293,293,293,293,293,293,293,293,293,293, 323], + "12": [293,293,293,293,293,293,293,293,293,293, 323], + "13": [293,293,293,293,293,293,293,293,293,293, 323], + "14": [293,293,293,293,293,293,293,293,293,293, 323], + "15": [293,293,293,293,293,293,293,293,293,293, 323], + "16": [293,293,293,293,293,293,293,293,293,293, 323], + "17": [293,293,293,293,293,293,293,293,293,293, 323], + "18": [293,293,293,293,293,293,293,293,293,293, 323], + "19": [293,293,293,293,293,293,293,293,293,293, 323], + "20": [293,293,293,293,293,293,293,293,293,293, 323], + "21": [293,293,293,293,293,293,293,293,293,293, 323], + "22": [293,293,293,293,293,293,293,293,293,293, 323], + "23": [293,293,293,293,293,293,293,293,293,293, 323], + "24": [293,293,293,293,293,293,293,293,293,293, 323], + "25": [293,293,293,293,293,293,293,293,293,293, 323], + "26": [293,293,293,293,293,293,293,293,293,293, 323], + "27": [293,293,293,293,293,293,293,293,293,293, 323], + "28": [293,293,293,293,293,293,293,293,293,293, 323], + "29": [293,293,293,293,293,293,293,293,293,293, 323], + "30": [293,293,293,293,293,293,293,293,293,293, 323], + "31": [293,293,293,293,293,293,293,293,293,293, 323], + "32": [293,293,293,293,293,293,293,293,293,293, 323], + "33": [293,293,293,293,293,293,293,293,293,293, 323], + "34": [293,293,293,293,293,293,293,293,293,293, 323], + "35": [293,293,293,293,293,293,293,293,293,293, 323], + "36": [293,293,293,293,293,293,293,293,293,293, 323], + "37": [293,293,293,293,293,293,293,293,293,293, 323], + "38": [293,293,293,293,293,293,293,293,293,293, 323], + "39": [293,293,293,293,293,293,293,293,293,293, 323], + "40": [293,293,293,293,293,293,293,293,293,293, 323], + "41": [293,293,293,293,293,293,293,293,293,293, 323], + "42": [293,293,293,293,293,293,293,293,293,293, 323], + "43": [293,293,293,293,293,293,293,293,293,293, 323], + "44": [293,293,293,293,293,293,293,293,293,293, 323], + "45": [293,293,293,293,293,293,293,293,293,293, 323], + "46": [293,293,293,293,293,293,293,293,293,293, 323], + "47": [293,293,293,293,293,293,293,293,293,293, 323], + "48": [293,293,293,293,293,293,293,293,293,293, 323], + "49": [293,293,293,293,293,293,293,293,293,293, 323], + "50": [293,293,293,293,293,293,293,293,293,293, 323], + "51": [293,293,293,293,293,293,293,293,293,293, 323], + "52": [293,293,293,293,293,293,293,293,293,293, 323], + "53": [293,293,293,293,293,293,293,293,293,293, 323], + "54": [293,293,293,293,293,293,293,293,293,293, 323], + "55": [293,293,293,293,293,293,293,293,293,293, 323], + "56": [293,293,293,293,293,293,293,293,293,293, 323], + "57": [293,293,293,293,293,293,293,293,293,293, 323], + "58": [293,293,293,293,293,293,293,293,293,293, 323], + "59": [293,293,293,293,293,293,293,293,293,293, 323], + "60": [293,293,293,293,293,293,293,293,293,293, 323], + "61": [293,293,293,293,293,293,293,293,293,293, 323], + "62": [293,293,293,293,293,293,293,293,293,293, 323], + "63": [293,293,293,293,293,293,293,293,293,293, 323], + "64": [293,293,293,293,293,293,293,293,293,293, 323], + "65": [293,293,293,293,293,293,293,293,293,293, 323], + "66": [293,293,293,293,293,293,293,293,293,293, 323], + "67": [293,293,293,293,293,293,293,293,293,293, 323], + "68": [293,293,293,293,293,293,293,293,293,293, 323], + "69": [293,293,293,293,293,293,293,293,293,293, 323], + "70": [293,293,293,293,293,293,293,293,293,293, 323], + "71": [293,293,293,293,293,293,293,293,293,293, 323], + "72": [293,293,293,293,293,293,293,293,293,293, 323], + "73": [293,293,293,293,293,293,293,293,293,293, 323], + "74": [293,293,293,293,293,293,293,293,293,293, 323], + "75": [293,293,293,293,293,293,293,293,293,293, 323], + "76": [293,293,293,293,293,293,293,293,293,293, 323], + "77": [293,293,293,293,293,293,293,293,293,293, 323], + "78": [293,293,293,293,293,293,293,293,293,293, 323], + "79": [293,293,293,293,293,293,293,293,293,293, 323], + "80": [293,293,293,293,293,293,293,293,293,293, 323], + "81": [293,293,293,293,293,293,293,293,293,293, 323], + "82": [293,293,293,293,293,293,293,293,293,293, 323], + "83": [293,293,293,293,293,293,293,293,293,293, 323], + "84": [293,293,293,293,293,293,293,293,293,293, 323], + "85": [293,293,293,293,293,293,293,293,293,293, 323], + "86": [293,293,293,293,293,293,293,293,293,293, 323], + "87": [293,293,293,293,293,293,293,293,293,293, 323], + "88": [293,293,293,293,293,293,293,293,293,293, 323], + "89": [293,293,293,293,293,293,293,293,293,293, 323], + "90": [293,293,293,293,293,293,293,293,293,293, 323], + "91": [293,293,293,293,293,293,293,293,293,293, 323], + "92": [293,293,293,293,293,293,293,293,293,293, 323], + "93": [293,293,293,293,293,293,293,293,293,293, 323], + "94": [293,293,293,293,293,293,293,293,293,293, 323], + "95": [293,293,293,293,293,293,293,293,293,293, 323], + "96": [293,293,293,293,293,293,293,293,293,293, 323], + "97": [293,293,293,293,293,293,293,293,293,293, 323], + "98": [293,293,293,293,293,293,293,293,293,293, 323], + "99": [293,293,293,293,293,293,293,293,293,293, 323], + "100": [293,293,293,293,293,293,293,293,293,293, 323], + "101": [293,293,293,293,293,293,293,293,293,293, 323], + "102": [293,293,293,293,293,293,293,293,293,293, 323], + "103": [293,293,293,293,293,293,293,293,293,293, 323], + "104": [293,293,293,293,293,293,293,293,293,293, 323], + "105": [293,293,293,293,293,293,293,293,293,293, 323], + "106": [293,293,293,293,293,293,293,293,293,293, 323], + "107": [293,293,293,293,293,293,293,293,293,293, 323], + "108": [293,293,293,293,293,293,293,293,293,293, 323], + "109": [293,293,293,293,293,293,293,293,293,293, 323], + "110": [293,293,293,293,293,293,293,293,293,293, 323], + "111": [293,293,293,293,293,293,293,293,293,293, 323], + "112": [293,293,293,293,293,293,293,293,293,293, 323], + "113": [293,293,293,293,293,293,293,293,293,293, 323], + "114": [293,293,293,293,293,293,293,293,293,293, 323], + "115": [293,293,293,293,293,293,293,293,293,293, 323], + "116": [293,293,293,293,293,293,293,293,293,293, 323], + "117": [293,293,293,293,293,293,293,293,293,293, 323], + "118": [293,293,293,293,293,293,293,293,293,293, 323], + "119": [293,293,293,293,293,293,293,293,293,293, 323], + "120": [293,293,293,293,293,293,293,293,293,293, 323], + "121": [293,293,293,293,293,293,293,293,293,293, 323], + "122": [293,293,293,293,293,293,293,293,293,293, 323], + "123": [293,293,293,293,293,293,293,293,293,293, 323], + "124": [293,293,293,293,293,293,293,293,293,293, 323], + "125": [293,293,293,293,293,293,293,293,293,293, 323], + "126": [293,293,293,293,293,293,293,293,293,293, 323], + "127": [293,293,293,293,293,293,293,293,293,293, 323], + "128": [293,293,293,293,293,293,293,293,293,293, 323], + "129": [293,293,293,293,293,293,293,293,293,293, 323], + "130": [293,293,293,293,293,293,293,293,293,293, 323], + "131": [293,293,293,293,293,293,293,293,293,293, 323], + "132": [293,293,293,293,293,293,293,293,293,293, 323], + "133": [293,293,293,293,293,293,293,293,293,293, 323], + "134": [293,293,293,293,293,293,293,293,293,293, 323], + "135": [293,293,293,293,293,293,293,293,293,293, 323], + "136": [293,293,293,293,293,293,293,293,293,293, 323], + "137": [293,293,293,293,293,293,293,293,293,293, 323], + "138": [293,293,293,293,293,293,293,293,293,293, 323], + "139": [293,293,293,293,293,293,293,293,293,293, 323], + "140": [293,293,293,293,293,293,293,293,293,293, 323], + "141": [293,293,293,293,293,293,293,293,293,293, 323], + "142": [293,293,293,293,293,293,293,293,293,293, 323], + "143": [293,293,293,293,293,293,293,293,293,293, 323], + "144": [293,293,293,293,293,293,293,293,293,293, 323], + "145": [293,293,293,293,293,293,293,293,293,293, 323], + "146": [293,293,293,293,293,293,293,293,293,293, 323], + "147": [293,293,293,293,293,293,293,293,293,293, 323], + "148": [293,293,293,293,293,293,293,293,293,293, 323], + "149": [293,293,293,293,293,293,293,293,293,293, 323], + "150": [293,293,293,293,293,293,293,293,293,293, 323], + "151": [293,293,293,293,293,293,293,293,293,293, 323], + "152": [293,293,293,293,293,293,293,293,293,293, 323], + "153": [293,293,293,293,293,293,293,293,293,293, 323], + "154": [293,293,293,293,293,293,293,293,293,293, 323], + "155": [293,293,293,293,293,293,293,293,293,293, 323], + "156": [293,293,293,293,293,293,293,293,293,293, 323], + "157": [293,293,293,293,293,293,293,293,293,293, 323], + "158": [293,293,293,293,293,293,293,293,293,293, 323], + "159": [293,293,293,293,293,293,293,293,293,293, 323], + "160": [293,293,293,293,293,293,293,293,293,293, 323], + "161": [293,293,293,293,293,293,293,293,293,293, 323], + "162": [293,293,293,293,293,293,293,293,293,293, 323], + "163": [293,293,293,293,293,293,293,293,293,293, 323], + "164": [293,293,293,293,293,293,293,293,293,293, 323], + "165": [293,293,293,293,293,293,293,293,293,293, 323], + "166": [293,293,293,293,293,293,293,293,293,293, 323], + "167": [293,293,293,293,293,293,293,293,293,293, 323], + "168": [293,293,293,293,293,293,293,293,293,293, 323], + "169": [293,293,293,293,293,293,293,293,293,293, 323], + "170": [293,293,293,293,293,293,293,293,293,293, 323], + "171": [293,293,293,293,293,293,293,293,293,293, 323], + "172": [293,293,293,293,293,293,293,293,293,293, 323], + "173": [293,293,293,293,293,293,293,293,293,293, 323], + "174": [293,293,293,293,293,293,293,293,293,293, 323], + "175": [293,293,293,293,293,293,293,293,293,293, 323], + "176": [293,293,293,293,293,293,293,293,293,293, 323], + "177": [293,293,293,293,293,293,293,293,293,293, 323], + "178": [293,293,293,293,293,293,293,293,293,293, 323], + "179": [293,293,293,293,293,293,293,293,293,293, 323], + "180": [293,293,293,293,293,293,293,293,293,293, 323], + "181": [293,293,293,293,293,293,293,293,293,293, 323], + "182": [293,293,293,293,293,293,293,293,293,293, 323], + "183": [293,293,293,293,293,293,293,293,293,293, 323], + "184": [293,293,293,293,293,293,293,293,293,293, 323], + "185": [293,293,293,293,293,293,293,293,293,293, 323], + "186": [293,293,293,293,293,293,293,293,293,293, 323], + "187": [293,293,293,293,293,293,293,293,293,293, 323], + "188": [293,293,293,293,293,293,293,293,293,293, 323], + "189": [293,293,293,293,293,293,293,293,293,293, 323], + "190": [293,293,293,293,293,293,293,293,293,293, 323], + "191": [293,293,293,293,293,293,293,293,293,293, 323], + "192": [293,293,293,293,293,293,293,293,293,293, 323], + "193": [293,293,293,293,293,293,293,293,293,293, 323], + "194": [293,293,293,293,293,293,293,293,293,293, 323], + "195": [293,293,293,293,293,293,293,293,293,293, 323], + "196": [293,293,293,293,293,293,293,293,293,293, 323], + "197": [293,293,293,293,293,293,293,293,293,293, 323], + "198": [293,293,293,293,293,293,293,293,293,293, 323], + "199": [293,293,293,293,293,293,293,293,293,293, 323], + "200": [293,293,293,293,293,293,293,293,293,293, 323], + "201": [293,293,293,293,293,293,293,293,293,293, 323], + "202": [293,293,293,293,293,293,293,293,293,293, 323], + "203": [293,293,293,293,293,293,293,293,293,293, 323], + "204": [293,293,293,293,293,293,293,293,293,293, 323], + "205": [293,293,293,293,293,293,293,293,293,293, 323], + "206": [293,293,293,293,293,293,293,293,293,293, 323], + "207": [293,293,293,293,293,293,293,293,293,293, 323], + "208": [293,293,293,293,293,293,293,293,293,293, 323], + "209": [293,293,293,293,293,293,293,293,293,293, 323], + "210": [293,293,293,293,293,293,293,293,293,293, 323], + "211": [293,293,293,293,293,293,293,293,293,293, 323], + "212": [293,293,293,293,293,293,293,293,293,293, 323], + "213": [293,293,293,293,293,293,293,293,293,293, 323], + "214": [293,293,293,293,293,293,293,293,293,293, 323], + "215": [293,293,293,293,293,293,293,293,293,293, 323], + "216": [293,293,293,293,293,293,293,293,293,293, 323], + "217": [293,293,293,293,293,293,293,293,293,293, 323], + "218": [293,293,293,293,293,293,293,293,293,293, 323], + "219": [293,293,293,293,293,293,293,293,293,293, 323], + "220": [293,293,293,293,293,293,293,293,293,293, 323], + "221": [293,293,293,293,293,293,293,293,293,293, 323], + "222": [293,293,293,293,293,293,293,293,293,293, 323], + "223": [293,293,293,293,293,293,293,293,293,293, 323], + "224": [293,293,293,293,293,293,293,293,293,293, 323], + "225": [293,293,293,293,293,293,293,293,293,293, 323], + "226": [293,293,293,293,293,293,293,293,293,293, 323], + "227": [293,293,293,293,293,293,293,293,293,293, 323], + "228": [293,293,293,293,293,293,293,293,293,293, 323], + "229": [293,293,293,293,293,293,293,293,293,293, 323], + "230": [293,293,293,293,293,293,293,293,293,293, 323], + "231": [293,293,293,293,293,293,293,293,293,293, 323], + "232": [293,293,293,293,293,293,293,293,293,293, 323], + "233": [293,293,293,293,293,293,293,293,293,293, 323], + "234": [293,293,293,293,293,293,293,293,293,293, 323], + "235": [293,293,293,293,293,293,293,293,293,293, 323], + "236": [293,293,293,293,293,293,293,293,293,293, 323], + "237": [293,293,293,293,293,293,293,293,293,293, 323], + "238": [293,293,293,293,293,293,293,293,293,293, 323], + "239": [293,293,293,293,293,293,293,293,293,293, 323], + "240": [293,293,293,293,293,293,293,293,293,293, 323], + "241": [293,293,293,293,293,293,293,293,293,293, 323], + "242": [293,293,293,293,293,293,293,293,293,293, 323], + "243": [293,293,293,293,293,293,293,293,293,293, 323], + "244": [293,293,293,293,293,293,293,293,293,293, 323], + "245": [293,293,293,293,293,293,293,293,293,293, 323], + "246": [293,293,293,293,293,293,293,293,293,293, 323], + "247": [293,293,293,293,293,293,293,293,293,293, 323], + "248": [293,293,293,293,293,293,293,293,293,293, 323], + "249": [293,293,293,293,293,293,293,293,293,293, 323], + "250": [293,293,293,293,293,293,293,293,293,293, 323], + "251": [293,293,293,293,293,293,293,293,293,293, 323], + "252": [293,293,293,293,293,293,293,293,293,293, 323], + "253": [293,293,293,293,293,293,293,293,293,293, 323], + "254": [293,293,293,293,293,293,293,293,293,293, 323], + "255": [293,293,293,293,293,293,293,293,293,293, 323], + "256": [293,293,293,293,293,293,293,293,293,293, 323], + "257": [293,293,293,293,293,293,293,293,293,293, 323], + "258": [293,293,293,293,293,293,293,293,293,293, 323], + "259": [293,293,293,293,293,293,293,293,293,293, 323], + "260": [293,293,293,293,293,293,293,293,293,293, 323], + "261": [293,293,293,293,293,293,293,293,293,293, 323], + "262": [293,293,293,293,293,293,293,293,293,293, 323], + "263": [293,293,293,293,293,293,293,293,293,293, 323], + "264": [293,293,293,293,293,293,293,293,293,293, 323], + "265": [293,293,293,293,293,293,293,293,293,293, 323], + "266": [293,293,293,293,293,293,293,293,293,293, 323], + "267": [293,293,293,293,293,293,293,293,293,293, 323], + "268": [293,293,293,293,293,293,293,293,293,293, 323], + "269": [293,293,293,293,293,293,293,293,293,293, 323], + "270": [293,293,293,293,293,293,293,293,293,293, 323], + "271": [293,293,293,293,293,293,293,293,293,293, 323], + "272": [293,293,293,293,293,293,293,293,293,293, 323], + "273": [293,293,293,293,293,293,293,293,293,293, 323], + "274": [293,293,293,293,293,293,293,293,293,293, 323], + "275": [293,293,293,293,293,293,293,293,293,293, 323], + "276": [293,293,293,293,293,293,293,293,293,293, 323], + "277": [293,293,293,293,293,293,293,293,293,293, 323], + "278": [293,293,293,293,293,293,293,293,293,293, 323], + "279": [293,293,293,293,293,293,293,293,293,293, 323], + "280": [293,293,293,293,293,293,293,293,293,293, 323], + "281": [293,293,293,293,293,293,293,293,293,293, 323], + "282": [293,293,293,293,293,293,293,293,293,293, 323], + "283": [293,293,293,293,293,293,293,293,293,293, 323], + "284": [293,293,293,293,293,293,293,293,293,293, 323], + "285": [293,293,293,293,293,293,293,293,293,293, 323], + "286": [293,293,293,293,293,293,293,293,293,293, 323], + "287": [293,293,293,293,293,293,293,293,293,293, 323], + "288": [293,293,293,293,293,293,293,293,293,293, 323], + "289": [293,293,293,293,293,293,293,293,293,293, 323], + "290": [293,293,293,293,293,293,293,293,293,293, 323], + "291": [293,293,293,293,293,293,293,293,293,293, 323], + "292": [293,293,293,293,293,293,293,293,293,293, 323], + "293": [293,293,293,293,293,293,293,293,293,293, 323], + "294": [293,293,293,293,293,293,293,293,293,293, 323], + "295": [293,293,293,293,293,293,293,293,293,293, 323], + "296": [293,293,293,293,293,293,293,293,293,293, 323], + "297": [293,293,293,293,293,293,293,293,293,293, 323], + "298": [293,293,293,293,293,293,293,293,293,293, 323], + "299": [293,293,293,293,293,293,293,293,293,293, 323], + "300": [293,293,293,293,293,293,293,293,293,293, 323], + "301": [293,293,293,293,293,293,293,293,293,293, 323], + "302": [293,293,293,293,293,293,293,293,293,293, 323], + "303": [293,293,293,293,293,293,293,293,293,293, 323], + "304": [293,293,293,293,293,293,293,293,293,293, 323], + "305": [293,293,293,293,293,293,293,293,293,293, 323], + "306": [293,293,293,293,293,293,293,293,293,293, 323], + "307": [293,293,293,293,293,293,293,293,293,293, 323], + "308": [293,293,293,293,293,293,293,293,293,293, 323], + "309": [293,293,293,293,293,293,293,293,293,293, 323], + "310": [293,293,293,293,293,293,293,293,293,293, 323], + "311": [293,293,293,293,293,293,293,293,293,293, 323], + "312": [293,293,293,293,293,293,293,293,293,293, 323], + "313": [293,293,293,293,293,293,293,293,293,293, 323], + "314": [293,293,293,293,293,293,293,293,293,293, 323], + "315": [293,293,293,293,293,293,293,293,293,293, 323], + "316": [293,293,293,293,293,293,293,293,293,293, 323], + "317": [293,293,293,293,293,293,293,293,293,293, 323], + "318": [293,293,293,293,293,293,293,293,293,293, 323], + "319": [293,293,293,293,293,293,293,293,293,293, 323], + "320": [293,293,293,293,293,293,293,293,293,293, 323], + "321": [293,293,293,293,293,293,293,293,293,293, 323], + "322": [293,293,293,293,293,293,293,293,293,293, 323], + "323": [293,293,293,293,293,293,293,293,293,293, 323], + "324": [293,293,293,293,293,293,293,293,293,293, 323], + "325": [293,293,293,293,293,293,293,293,293,293, 323], + "326": [293,293,293,293,293,293,293,293,293,293, 323], + "327": [293,293,293,293,293,293,293,293,293,293, 323], + "328": [293,293,293,293,293,293,293,293,293,293, 323], + "329": [293,293,293,293,293,293,293,293,293,293, 323], + "330": [293,293,293,293,293,293,293,293,293,293, 323], + "331": [293,293,293,293,293,293,293,293,293,293, 323], + "332": [293,293,293,293,293,293,293,293,293,293, 323], + "333": [293,293,293,293,293,293,293,293,293,293, 323], + "334": [293,293,293,293,293,293,293,293,293,293, 323], + "335": [293,293,293,293,293,293,293,293,293,293, 323], + "336": [293,293,293,293,293,293,293,293,293,293, 323], + "337": [293,293,293,293,293,293,293,293,293,293, 323], + "338": [293,293,293,293,293,293,293,293,293,293, 323], + "339": [293,293,293,293,293,293,293,293,293,293, 323], + "340": [293,293,293,293,293,293,293,293,293,293, 323], + "341": [293,293,293,293,293,293,293,293,293,293, 323], + "342": [293,293,293,293,293,293,293,293,293,293, 323], + "343": [293,293,293,293,293,293,293,293,293,293, 323], + "344": [293,293,293,293,293,293,293,293,293,293, 323], + "345": [293,293,293,293,293,293,293,293,293,293, 323], + "346": [293,293,293,293,293,293,293,293,293,293, 323], + "347": [293,293,293,293,293,293,293,293,293,293, 323], + "348": [293,293,293,293,293,293,293,293,293,293, 323], + "349": [293,293,293,293,293,293,293,293,293,293, 323], + "350": [293,293,293,293,293,293,293,293,293,293, 323], + "351": [293,293,293,293,293,293,293,293,293,293, 323], + "352": [293,293,293,293,293,293,293,293,293,293, 323], + "353": [293,293,293,293,293,293,293,293,293,293, 323], + "354": [293,293,293,293,293,293,293,293,293,293, 323], + "355": [293,293,293,293,293,293,293,293,293,293, 323], + "356": [293,293,293,293,293,293,293,293,293,293, 323], + "357": [293,293,293,293,293,293,293,293,293,293, 323], + "358": [293,293,293,293,293,293,293,293,293,293, 323], + "359": [293,293,293,293,293,293,293,293,293,293, 323], + "360": [293,293,293,293,293,293,293,293,293,293, 323], + "361": [293,293,293,293,293,293,293,293,293,293, 323], + "362": [293,293,293,293,293,293,293,293,293,293, 323], + "363": [293,293,293,293,293,293,293,293,293,293, 323], + "364": [293,293,293,293,293,293,293,293,293,293, 323], + "365": [293,293,293,293,293,293,293,293,293,293, 323], + "366": [293,293,293,293,293,293,293,293,293,293, 323], + "367": [293,293,293,293,293,293,293,293,293,293, 323], + "368": [293,293,293,293,293,293,293,293,293,293, 323], + "369": [293,293,293,293,293,293,293,293,293,293, 323], + "370": [293,293,293,293,293,293,293,293,293,293, 323], + "371": [293,293,293,293,293,293,293,293,293,293, 323], + "372": [293,293,293,293,293,293,293,293,293,293, 323], + "373": [293,293,293,293,293,293,293,293,293,293, 323], + "374": [293,293,293,293,293,293,293,293,293,293, 323], + "375": [293,293,293,293,293,293,293,293,293,293, 323], + "376": [293,293,293,293,293,293,293,293,293,293, 323], + "377": [293,293,293,293,293,293,293,293,293,293, 323], + "378": [293,293,293,293,293,293,293,293,293,293, 323], + "379": [293,293,293,293,293,293,293,293,293,293, 323], + "380": [293,293,293,293,293,293,293,293,293,293, 323], + "381": [293,293,293,293,293,293,293,293,293,293, 323], + "382": [293,293,293,293,293,293,293,293,293,293, 323], + "383": [293,293,293,293,293,293,293,293,293,293, 323], + "384": [293,293,293,293,293,293,293,293,293,293, 323], + "385": [293,293,293,293,293,293,293,293,293,293, 323], + "386": [293,293,293,293,293,293,293,293,293,293, 323], + "387": [293,293,293,293,293,293,293,293,293,293, 323], + "388": [293,293,293,293,293,293,293,293,293,293, 323], + "389": [293,293,293,293,293,293,293,293,293,293, 323], + "390": [293,293,293,293,293,293,293,293,293,293, 323], + "391": [293,293,293,293,293,293,293,293,293,293, 323], + "392": [293,293,293,293,293,293,293,293,293,293, 323], + "393": [293,293,293,293,293,293,293,293,293,293, 323], + "394": [293,293,293,293,293,293,293,293,293,293, 323], + "395": [293,293,293,293,293,293,293,293,293,293, 323], + "396": [293,293,293,293,293,293,293,293,293,293, 323], + "397": [293,293,293,293,293,293,293,293,293,293, 323], + "398": [293,293,293,293,293,293,293,293,293,293, 323], + "399": [293,293,293,293,293,293,293,293,293,293, 323], + "400": [293,293,293,293,293,293,293,293,293,293, 323], + "401": [293,293,293,293,293,293,293,293,293,293, 323], + "402": [293,293,293,293,293,293,293,293,293,293, 323], + "403": [293,293,293,293,293,293,293,293,293,293, 323], + "404": [293,293,293,293,293,293,293,293,293,293, 323], + "405": [293,293,293,293,293,293,293,293,293,293, 323], + "406": [293,293,293,293,293,293,293,293,293,293, 323], + "407": [293,293,293,293,293,293,293,293,293,293, 323], + "408": [293,293,293,293,293,293,293,293,293,293, 323], + "409": [293,293,293,293,293,293,293,293,293,293, 323], + "410": [293,293,293,293,293,293,293,293,293,293, 323], + "411": [293,293,293,293,293,293,293,293,293,293, 323], + "412": [293,293,293,293,293,293,293,293,293,293, 323], + "413": [293,293,293,293,293,293,293,293,293,293, 323], + "414": [293,293,293,293,293,293,293,293,293,293, 323], + "415": [293,293,293,293,293,293,293,293,293,293, 323], + "416": [293,293,293,293,293,293,293,293,293,293, 323], + "417": [293,293,293,293,293,293,293,293,293,293, 323], + "418": [293,293,293,293,293,293,293,293,293,293, 323], + "419": [293,293,293,293,293,293,293,293,293,293, 323], + "420": [293,293,293,293,293,293,293,293,293,293, 323], + "421": [293,293,293,293,293,293,293,293,293,293, 323], + "422": [293,293,293,293,293,293,293,293,293,293, 323], + "423": [293,293,293,293,293,293,293,293,293,293, 323], + "424": [293,293,293,293,293,293,293,293,293,293, 323], + "425": [293,293,293,293,293,293,293,293,293,293, 323], + "426": [293,293,293,293,293,293,293,293,293,293, 323], + "427": [293,293,293,293,293,293,293,293,293,293, 323], + "428": [293,293,293,293,293,293,293,293,293,293, 323], + "429": [293,293,293,293,293,293,293,293,293,293, 323], + "430": [293,293,293,293,293,293,293,293,293,293, 323], + "431": [293,293,293,293,293,293,293,293,293,293, 323], + "432": [293,293,293,293,293,293,293,293,293,293, 323], + "433": [293,293,293,293,293,293,293,293,293,293, 323], + "434": [293,293,293,293,293,293,293,293,293,293, 323], + "435": [293,293,293,293,293,293,293,293,293,293, 323], + "436": [293,293,293,293,293,293,293,293,293,293, 323], + "437": [293,293,293,293,293,293,293,293,293,293, 323], + "438": [293,293,293,293,293,293,293,293,293,293, 323], + "439": [293,293,293,293,293,293,293,293,293,293, 323], + "440": [293,293,293,293,293,293,293,293,293,293, 323], + "441": [293,293,293,293,293,293,293,293,293,293, 323], + "442": [293,293,293,293,293,293,293,293,293,293, 323], + "443": [293,293,293,293,293,293,293,293,293,293, 323], + "444": [293,293,293,293,293,293,293,293,293,293, 323], + "445": [293,293,293,293,293,293,293,293,293,293, 323], + "446": [293,293,293,293,293,293,293,293,293,293, 323], + "447": [293,293,293,293,293,293,293,293,293,293, 323], + "448": [293,293,293,293,293,293,293,293,293,293, 323], + "449": [293,293,293,293,293,293,293,293,293,293, 323], + "450": [293,293,293,293,293,293,293,293,293,293, 323], + "451": [293,293,293,293,293,293,293,293,293,293, 323], + "452": [293,293,293,293,293,293,293,293,293,293, 323], + "453": [293,293,293,293,293,293,293,293,293,293, 323], + "454": [293,293,293,293,293,293,293,293,293,293, 323], + "455": [293,293,293,293,293,293,293,293,293,293, 323], + "456": [293,293,293,293,293,293,293,293,293,293, 323], + "457": [293,293,293,293,293,293,293,293,293,293, 323], + "458": [293,293,293,293,293,293,293,293,293,293, 323], + "459": [293,293,293,293,293,293,293,293,293,293, 323], + "460": [293,293,293,293,293,293,293,293,293,293, 323], + "461": [293,293,293,293,293,293,293,293,293,293, 323], + "462": [293,293,293,293,293,293,293,293,293,293, 323], + "463": [293,293,293,293,293,293,293,293,293,293, 323], + "464": [293,293,293,293,293,293,293,293,293,293, 323], + "465": [293,293,293,293,293,293,293,293,293,293, 323], + "466": [293,293,293,293,293,293,293,293,293,293, 323], + "467": [293,293,293,293,293,293,293,293,293,293, 323], + "468": [293,293,293,293,293,293,293,293,293,293, 323], + "469": [293,293,293,293,293,293,293,293,293,293, 323], + "470": [293,293,293,293,293,293,293,293,293,293, 323], + "471": [293,293,293,293,293,293,293,293,293,293, 323], + "472": [293,293,293,293,293,293,293,293,293,293, 323], + "473": [293,293,293,293,293,293,293,293,293,293, 323], + "474": [293,293,293,293,293,293,293,293,293,293, 323], + "475": [293,293,293,293,293,293,293,293,293,293, 323], + "476": [293,293,293,293,293,293,293,293,293,293, 323], + "477": [293,293,293,293,293,293,293,293,293,293, 323], + "478": [293,293,293,293,293,293,293,293,293,293, 323], + "479": [293,293,293,293,293,293,293,293,293,293, 323], + "480": [293,293,293,293,293,293,293,293,293,293, 323], + "481": [293,293,293,293,293,293,293,293,293,293, 323], + "482": [293,293,293,293,293,293,293,293,293,293, 323], + "483": [293,293,293,293,293,293,293,293,293,293, 323], + "484": [293,293,293,293,293,293,293,293,293,293, 323], + "485": [293,293,293,293,293,293,293,293,293,293, 323], + "486": [293,293,293,293,293,293,293,293,293,293, 323], + "487": [293,293,293,293,293,293,293,293,293,293, 323], + "488": [293,293,293,293,293,293,293,293,293,293, 323], + "489": [293,293,293,293,293,293,293,293,293,293, 323], + "490": [293,293,293,293,293,293,293,293,293,293, 323], + "491": [293,293,293,293,293,293,293,293,293,293, 323], + "492": [293,293,293,293,293,293,293,293,293,293, 323], + "493": [293,293,293,293,293,293,293,293,293,293, 323], + "494": [293,293,293,293,293,293,293,293,293,293, 323], + "495": [293,293,293,293,293,293,293,293,293,293, 323], + "496": [293,293,293,293,293,293,293,293,293,293, 323], + "497": [293,293,293,293,293,293,293,293,293,293, 323], + "498": [293,293,293,293,293,293,293,293,293,293, 323], + "499": [293,293,293,293,293,293,293,293,293,293, 323], + "500": [293,293,293,293,293,293,293,293,293,293, 323], + "501": [293,293,293,293,293,293,293,293,293,293, 323], + "502": [293,293,293,293,293,293,293,293,293,293, 323], + "503": [293,293,293,293,293,293,293,293,293,293, 323], + "504": [293,293,293,293,293,293,293,293,293,293, 323], + "505": [293,293,293,293,293,293,293,293,293,293, 323], + "506": [293,293,293,293,293,293,293,293,293,293, 323], + "507": [293,293,293,293,293,293,293,293,293,293, 323], + "508": [293,293,293,293,293,293,293,293,293,293, 323], + "509": [293,293,293,293,293,293,293,293,293,293, 323], + "510": [293,293,293,293,293,293,293,293,293,293, 323], + "511": [293,293,293,293,293,293,293,293,293,293, 323], + "512": [293,293,293,293,293,293,293,293,293,293, 323], + "513": [293,293,293,293,293,293,293,293,293,293, 323], + "514": [293,293,293,293,293,293,293,293,293,293, 323], + "515": [293,293,293,293,293,293,293,293,293,293, 323], + "516": [293,293,293,293,293,293,293,293,293,293, 323], + "517": [293,293,293,293,293,293,293,293,293,293, 323], + "518": [293,293,293,293,293,293,293,293,293,293, 323], + "519": [293,293,293,293,293,293,293,293,293,293, 323], + "520": [293,293,293,293,293,293,293,293,293,293, 323], + "521": [293,293,293,293,293,293,293,293,293,293, 323], + "522": [293,293,293,293,293,293,293,293,293,293, 323], + "523": [293,293,293,293,293,293,293,293,293,293, 323], + "524": [293,293,293,293,293,293,293,293,293,293, 323], + "525": [293,293,293,293,293,293,293,293,293,293, 323], + "526": [293,293,293,293,293,293,293,293,293,293, 323], + "527": [293,293,293,293,293,293,293,293,293,293, 323], + "528": [293,293,293,293,293,293,293,293,293,293, 323], + "529": [293,293,293,293,293,293,293,293,293,293, 323], + "530": [293,293,293,293,293,293,293,293,293,293, 323], + "531": [293,293,293,293,293,293,293,293,293,293, 323], + "532": [293,293,293,293,293,293,293,293,293,293, 323], + "533": [293,293,293,293,293,293,293,293,293,293, 323], + "534": [293,293,293,293,293,293,293,293,293,293, 323], + "535": [293,293,293,293,293,293,293,293,293,293, 323], + "536": [293,293,293,293,293,293,293,293,293,293, 323], + "537": [293,293,293,293,293,293,293,293,293,293, 323], + "538": [293,293,293,293,293,293,293,293,293,293, 323], + "539": [293,293,293,293,293,293,293,293,293,293, 323], + "540": [293,293,293,293,293,293,293,293,293,293, 323], + "541": [293,293,293,293,293,293,293,293,293,293, 323], + "542": [293,293,293,293,293,293,293,293,293,293, 323], + "543": [293,293,293,293,293,293,293,293,293,293, 323], + "544": [293,293,293,293,293,293,293,293,293,293, 323], + "545": [293,293,293,293,293,293,293,293,293,293, 323], + "546": [293,293,293,293,293,293,293,293,293,293, 323], + "547": [293,293,293,293,293,293,293,293,293,293, 323], + "548": [293,293,293,293,293,293,293,293,293,293, 323], + "549": [293,293,293,293,293,293,293,293,293,293, 323], + "550": [293,293,293,293,293,293,293,293,293,293, 323], + "551": [293,293,293,293,293,293,293,293,293,293, 323], + "552": [293,293,293,293,293,293,293,293,293,293, 323], + "553": [293,293,293,293,293,293,293,293,293,293, 323], + "554": [293,293,293,293,293,293,293,293,293,293, 323], + "555": [293,293,293,293,293,293,293,293,293,293, 323], + "556": [293,293,293,293,293,293,293,293,293,293, 323], + "557": [293,293,293,293,293,293,293,293,293,293, 323], + "558": [293,293,293,293,293,293,293,293,293,293, 323], + "559": [293,293,293,293,293,293,293,293,293,293, 323], + "560": [293,293,293,293,293,293,293,293,293,293, 323], + "561": [293,293,293,293,293,293,293,293,293,293, 323], + "562": [293,293,293,293,293,293,293,293,293,293, 323], + "563": [293,293,293,293,293,293,293,293,293,293, 323], + "564": [293,293,293,293,293,293,293,293,293,293, 323], + "565": [293,293,293,293,293,293,293,293,293,293, 323], + "566": [293,293,293,293,293,293,293,293,293,293, 323], + "567": [293,293,293,293,293,293,293,293,293,293, 323], + "568": [293,293,293,293,293,293,293,293,293,293, 323], + "569": [293,293,293,293,293,293,293,293,293,293, 323], + "570": [293,293,293,293,293,293,293,293,293,293, 323], + "571": [293,293,293,293,293,293,293,293,293,293, 323], + "572": [293,293,293,293,293,293,293,293,293,293, 323], + "573": [293,293,293,293,293,293,293,293,293,293, 323], + "574": [293,293,293,293,293,293,293,293,293,293, 323], + "575": [293,293,293,293,293,293,293,293,293,293, 323], + "576": [293,293,293,293,293,293,293,293,293,293, 323], + "577": [293,293,293,293,293,293,293,293,293,293, 323], + "578": [293,293,293,293,293,293,293,293,293,293, 323], + "579": [293,293,293,293,293,293,293,293,293,293, 323], + "580": [293,293,293,293,293,293,293,293,293,293, 323], + "581": [293,293,293,293,293,293,293,293,293,293, 323], + "582": [293,293,293,293,293,293,293,293,293,293, 323], + "583": [293,293,293,293,293,293,293,293,293,293, 323], + "584": [293,293,293,293,293,293,293,293,293,293, 323], + "585": [293,293,293,293,293,293,293,293,293,293, 323], + "586": [293,293,293,293,293,293,293,293,293,293, 323], + "587": [293,293,293,293,293,293,293,293,293,293, 323], + "588": [293,293,293,293,293,293,293,293,293,293, 323], + "589": [293,293,293,293,293,293,293,293,293,293, 323], + "590": [293,293,293,293,293,293,293,293,293,293, 323], + "591": [293,293,293,293,293,293,293,293,293,293, 323], + "592": [293,293,293,293,293,293,293,293,293,293, 323], + "593": [293,293,293,293,293,293,293,293,293,293, 323], + "594": [293,293,293,293,293,293,293,293,293,293, 323], + "595": [293,293,293,293,293,293,293,293,293,293, 323], + "596": [293,293,293,293,293,293,293,293,293,293, 323], + "597": [293,293,293,293,293,293,293,293,293,293, 323], + "598": [293,293,293,293,293,293,293,293,293,293, 323], + "599": [293,293,293,293,293,293,293,293,293,293, 323], + "600": [293,293,293,293,293,293,293,293,293,293, 323], + "601": [293,293,293,293,293,293,293,293,293,293, 323], + "602": [293,293,293,293,293,293,293,293,293,293, 323], + "603": [293,293,293,293,293,293,293,293,293,293, 323], + "604": [293,293,293,293,293,293,293,293,293,293, 323], + "605": [293,293,293,293,293,293,293,293,293,293, 323], + "606": [293,293,293,293,293,293,293,293,293,293, 323], + "607": [293,293,293,293,293,293,293,293,293,293, 323], + "608": [293,293,293,293,293,293,293,293,293,293, 323], + "609": [293,293,293,293,293,293,293,293,293,293, 323], + "610": [293,293,293,293,293,293,293,293,293,293, 323], + "611": [293,293,293,293,293,293,293,293,293,293, 323], + "612": [293,293,293,293,293,293,293,293,293,293, 323], + "613": [293,293,293,293,293,293,293,293,293,293, 323], + "614": [293,293,293,293,293,293,293,293,293,293, 323], + "615": [293,293,293,293,293,293,293,293,293,293, 323], + "616": [293,293,293,293,293,293,293,293,293,293, 323], + "617": [293,293,293,293,293,293,293,293,293,293, 323], + "618": [293,293,293,293,293,293,293,293,293,293, 323], + "619": [293,293,293,293,293,293,293,293,293,293, 323], + "620": [293,293,293,293,293,293,293,293,293,293, 323], + "621": [293,293,293,293,293,293,293,293,293,293, 323], + "622": [293,293,293,293,293,293,293,293,293,293, 323], + "623": [293,293,293,293,293,293,293,293,293,293, 323], + "624": [293,293,293,293,293,293,293,293,293,293, 323], + "625": [293,293,293,293,293,293,293,293,293,293, 323], + "626": [293,293,293,293,293,293,293,293,293,293, 323], + "627": [293,293,293,293,293,293,293,293,293,293, 323], + "628": [293,293,293,293,293,293,293,293,293,293, 323], + "629": [293,293,293,293,293,293,293,293,293,293, 323], + "630": [293,293,293,293,293,293,293,293,293,293, 323], + "631": [293,293,293,293,293,293,293,293,293,293, 323], + "632": [293,293,293,293,293,293,293,293,293,293, 323], + "633": [293,293,293,293,293,293,293,293,293,293, 323], + "634": [293,293,293,293,293,293,293,293,293,293, 323], + "635": [293,293,293,293,293,293,293,293,293,293, 323], + "636": [293,293,293,293,293,293,293,293,293,293, 323], + "637": [293,293,293,293,293,293,293,293,293,293, 323], + "638": [293,293,293,293,293,293,293,293,293,293, 323], + "639": [293,293,293,293,293,293,293,293,293,293, 323], + "640": [293,293,293,293,293,293,293,293,293,293, 323], + "641": [293,293,293,293,293,293,293,293,293,293, 323], + "642": [293,293,293,293,293,293,293,293,293,293, 323], + "643": [293,293,293,293,293,293,293,293,293,293, 323], + "644": [293,293,293,293,293,293,293,293,293,293, 323], + "645": [293,293,293,293,293,293,293,293,293,293, 323], + "646": [293,293,293,293,293,293,293,293,293,293, 323], + "647": [293,293,293,293,293,293,293,293,293,293, 323], + "648": [293,293,293,293,293,293,293,293,293,293, 323], + "649": [293,293,293,293,293,293,293,293,293,293, 323], + "650": [293,293,293,293,293,293,293,293,293,293, 323], + "651": [293,293,293,293,293,293,293,293,293,293, 323], + "652": [293,293,293,293,293,293,293,293,293,293, 323], + "653": [293,293,293,293,293,293,293,293,293,293, 323], + "654": [293,293,293,293,293,293,293,293,293,293, 323], + "655": [293,293,293,293,293,293,293,293,293,293, 323], + "656": [293,293,293,293,293,293,293,293,293,293, 323], + "657": [293,293,293,293,293,293,293,293,293,293, 323], + "658": [293,293,293,293,293,293,293,293,293,293, 323], + "659": [293,293,293,293,293,293,293,293,293,293, 323], + "660": [293,293,293,293,293,293,293,293,293,293, 323], + "661": [293,293,293,293,293,293,293,293,293,293, 323], + "662": [293,293,293,293,293,293,293,293,293,293, 323], + "663": [293,293,293,293,293,293,293,293,293,293, 323], + "664": [293,293,293,293,293,293,293,293,293,293, 323], + "665": [293,293,293,293,293,293,293,293,293,293, 323], + "666": [293,293,293,293,293,293,293,293,293,293, 323], + "667": [293,293,293,293,293,293,293,293,293,293, 323], + "668": [293,293,293,293,293,293,293,293,293,293, 323], + "669": [293,293,293,293,293,293,293,293,293,293, 323], + "670": [293,293,293,293,293,293,293,293,293,293, 323], + "671": [293,293,293,293,293,293,293,293,293,293, 323], + "672": [293,293,293,293,293,293,293,293,293,293, 323], + "673": [293,293,293,293,293,293,293,293,293,293, 323], + "674": [293,293,293,293,293,293,293,293,293,293, 323], + "675": [293,293,293,293,293,293,293,293,293,293, 323], + "676": [293,293,293,293,293,293,293,293,293,293, 323], + "677": [293,293,293,293,293,293,293,293,293,293, 323], + "678": [293,293,293,293,293,293,293,293,293,293, 323], + "679": [293,293,293,293,293,293,293,293,293,293, 323], + "680": [293,293,293,293,293,293,293,293,293,293, 323], + "681": [293,293,293,293,293,293,293,293,293,293, 323], + "682": [293,293,293,293,293,293,293,293,293,293, 323], + "683": [293,293,293,293,293,293,293,293,293,293, 323], + "684": [293,293,293,293,293,293,293,293,293,293, 323], + "685": [293,293,293,293,293,293,293,293,293,293, 323], + "686": [293,293,293,293,293,293,293,293,293,293, 323], + "687": [293,293,293,293,293,293,293,293,293,293, 323], + "688": [293,293,293,293,293,293,293,293,293,293, 323], + "689": [293,293,293,293,293,293,293,293,293,293, 323], + "690": [293,293,293,293,293,293,293,293,293,293, 323], + "691": [293,293,293,293,293,293,293,293,293,293, 323], + "692": [293,293,293,293,293,293,293,293,293,293, 323], + "693": [293,293,293,293,293,293,293,293,293,293, 323], + "694": [293,293,293,293,293,293,293,293,293,293, 323], + "695": [293,293,293,293,293,293,293,293,293,293, 323], + "696": [293,293,293,293,293,293,293,293,293,293, 323], + "697": [293,293,293,293,293,293,293,293,293,293, 323], + "698": [293,293,293,293,293,293,293,293,293,293, 323], + "699": [293,293,293,293,293,293,293,293,293,293, 323], + "700": [293,293,293,293,293,293,293,293,293,293, 323], + "701": [293,293,293,293,293,293,293,293,293,293, 323], + "702": [293,293,293,293,293,293,293,293,293,293, 323], + "703": [293,293,293,293,293,293,293,293,293,293, 323], + "704": [293,293,293,293,293,293,293,293,293,293, 323], + "705": [293,293,293,293,293,293,293,293,293,293, 323], + "706": [293,293,293,293,293,293,293,293,293,293, 323], + "707": [293,293,293,293,293,293,293,293,293,293, 323], + "708": [293,293,293,293,293,293,293,293,293,293, 323], + "709": [293,293,293,293,293,293,293,293,293,293, 323], + "710": [293,293,293,293,293,293,293,293,293,293, 323], + "711": [293,293,293,293,293,293,293,293,293,293, 323], + "712": [293,293,293,293,293,293,293,293,293,293, 323], + "713": [293,293,293,293,293,293,293,293,293,293, 323], + "714": [293,293,293,293,293,293,293,293,293,293, 323], + "715": [293,293,293,293,293,293,293,293,293,293, 323], + "716": [293,293,293,293,293,293,293,293,293,293, 323], + "717": [293,293,293,293,293,293,293,293,293,293, 323], + "718": [293,293,293,293,293,293,293,293,293,293, 323], + "719": [293,293,293,293,293,293,293,293,293,293, 323], + "720": [293,293,293,293,293,293,293,293,293,293, 323], + "721": [293,293,293,293,293,293,293,293,293,293, 323], + "722": [293,293,293,293,293,293,293,293,293,293, 323], + "723": [293,293,293,293,293,293,293,293,293,293, 323], + "724": [293,293,293,293,293,293,293,293,293,293, 323], + "725": [293,293,293,293,293,293,293,293,293,293, 323], + "726": [293,293,293,293,293,293,293,293,293,293, 323], + "727": [293,293,293,293,293,293,293,293,293,293, 323], + "728": [293,293,293,293,293,293,293,293,293,293, 323], + "729": [293,293,293,293,293,293,293,293,293,293, 323], + "730": [293,293,293,293,293,293,293,293,293,293, 323], + "731": [293,293,293,293,293,293,293,293,293,293, 323], + "732": [293,293,293,293,293,293,293,293,293,293, 323], + "733": [293,293,293,293,293,293,293,293,293,293, 323], + "734": [293,293,293,293,293,293,293,293,293,293, 323], + "735": [293,293,293,293,293,293,293,293,293,293, 323], + "736": [293,293,293,293,293,293,293,293,293,293, 323], + "737": [293,293,293,293,293,293,293,293,293,293, 323], + "738": [293,293,293,293,293,293,293,293,293,293, 323], + "739": [293,293,293,293,293,293,293,293,293,293, 323], + "740": [293,293,293,293,293,293,293,293,293,293, 323], + "741": [293,293,293,293,293,293,293,293,293,293, 323], + "742": [293,293,293,293,293,293,293,293,293,293, 323], + "743": [293,293,293,293,293,293,293,293,293,293, 323], + "744": [293,293,293,293,293,293,293,293,293,293, 323], + "745": [293,293,293,293,293,293,293,293,293,293, 323], + "746": [293,293,293,293,293,293,293,293,293,293, 323], + "747": [293,293,293,293,293,293,293,293,293,293, 323], + "748": [293,293,293,293,293,293,293,293,293,293, 323], + "749": [293,293,293,293,293,293,293,293,293,293, 323], + "750": [293,293,293,293,293,293,293,293,293,293, 323], + "751": [293,293,293,293,293,293,293,293,293,293, 323], + "752": [293,293,293,293,293,293,293,293,293,293, 323], + "753": [293,293,293,293,293,293,293,293,293,293, 323], + "754": [293,293,293,293,293,293,293,293,293,293, 323], + "755": [293,293,293,293,293,293,293,293,293,293, 323], + "756": [293,293,293,293,293,293,293,293,293,293, 323], + "757": [293,293,293,293,293,293,293,293,293,293, 323], + "758": [293,293,293,293,293,293,293,293,293,293, 323], + "759": [293,293,293,293,293,293,293,293,293,293, 323], + "760": [293,293,293,293,293,293,293,293,293,293, 323], + "761": [293,293,293,293,293,293,293,293,293,293, 323], + "762": [293,293,293,293,293,293,293,293,293,293, 323], + "763": [293,293,293,293,293,293,293,293,293,293, 323], + "764": [293,293,293,293,293,293,293,293,293,293, 323], + "765": [293,293,293,293,293,293,293,293,293,293, 323], + "766": [293,293,293,293,293,293,293,293,293,293, 323], + "767": [293,293,293,293,293,293,293,293,293,293, 323], + "768": [293,293,293,293,293,293,293,293,293,293, 323], + "769": [293,293,293,293,293,293,293,293,293,293, 323], + "770": [293,293,293,293,293,293,293,293,293,293, 323], + "771": [293,293,293,293,293,293,293,293,293,293, 323], + "772": [293,293,293,293,293,293,293,293,293,293, 323], + "773": [293,293,293,293,293,293,293,293,293,293, 323], + "774": [293,293,293,293,293,293,293,293,293,293, 323], + "775": [293,293,293,293,293,293,293,293,293,293, 323], + "776": [293,293,293,293,293,293,293,293,293,293, 323], + "777": [293,293,293,293,293,293,293,293,293,293, 323], + "778": [293,293,293,293,293,293,293,293,293,293, 323], + "779": [293,293,293,293,293,293,293,293,293,293, 323], + "780": [293,293,293,293,293,293,293,293,293,293, 323], + "781": [293,293,293,293,293,293,293,293,293,293, 323], + "782": [293,293,293,293,293,293,293,293,293,293, 323], + "783": [293,293,293,293,293,293,293,293,293,293, 323], + "784": [293,293,293,293,293,293,293,293,293,293, 323], + "785": [293,293,293,293,293,293,293,293,293,293, 323], + "786": [293,293,293,293,293,293,293,293,293,293, 323], + "787": [293,293,293,293,293,293,293,293,293,293, 323], + "788": [293,293,293,293,293,293,293,293,293,293, 323], + "789": [293,293,293,293,293,293,293,293,293,293, 323], + "790": [293,293,293,293,293,293,293,293,293,293, 323], + "791": [293,293,293,293,293,293,293,293,293,293, 323], + "792": [293,293,293,293,293,293,293,293,293,293, 323], + "793": [293,293,293,293,293,293,293,293,293,293, 323], + "794": [293,293,293,293,293,293,293,293,293,293, 323], + "795": [293,293,293,293,293,293,293,293,293,293, 323], + "796": [293,293,293,293,293,293,293,293,293,293, 323], + "797": [293,293,293,293,293,293,293,293,293,293, 323], + "798": [293,293,293,293,293,293,293,293,293,293, 323], + "799": [293,293,293,293,293,293,293,293,293,293, 323], + "800": [293,293,293,293,293,293,293,293,293,293, 323], + "801": [293,293,293,293,293,293,293,293,293,293, 323], + "802": [293,293,293,293,293,293,293,293,293,293, 323], + "803": [293,293,293,293,293,293,293,293,293,293, 323], + "804": [293,293,293,293,293,293,293,293,293,293, 323], + "805": [293,293,293,293,293,293,293,293,293,293, 323], + "806": [293,293,293,293,293,293,293,293,293,293, 323], + "807": [293,293,293,293,293,293,293,293,293,293, 323], + "808": [293,293,293,293,293,293,293,293,293,293, 323], + "809": [293,293,293,293,293,293,293,293,293,293, 323], + "810": [293,293,293,293,293,293,293,293,293,293, 323], + "811": [293,293,293,293,293,293,293,293,293,293, 323], + "812": [293,293,293,293,293,293,293,293,293,293, 323], + "813": [293,293,293,293,293,293,293,293,293,293, 323], + "814": [293,293,293,293,293,293,293,293,293,293, 323], + "815": [293,293,293,293,293,293,293,293,293,293, 323], + "816": [293,293,293,293,293,293,293,293,293,293, 323], + "817": [293,293,293,293,293,293,293,293,293,293, 323], + "818": [293,293,293,293,293,293,293,293,293,293, 323], + "819": [293,293,293,293,293,293,293,293,293,293, 323], + "820": [293,293,293,293,293,293,293,293,293,293, 323], + "821": [293,293,293,293,293,293,293,293,293,293, 323], + "822": [293,293,293,293,293,293,293,293,293,293, 323], + "823": [293,293,293,293,293,293,293,293,293,293, 323], + "824": [293,293,293,293,293,293,293,293,293,293, 323], + "825": [293,293,293,293,293,293,293,293,293,293, 323], + "826": [293,293,293,293,293,293,293,293,293,293, 323], + "827": [293,293,293,293,293,293,293,293,293,293, 323], + "828": [293,293,293,293,293,293,293,293,293,293, 323], + "829": [293,293,293,293,293,293,293,293,293,293, 323], + "830": [293,293,293,293,293,293,293,293,293,293, 323], + "831": [293,293,293,293,293,293,293,293,293,293, 323], + "832": [293,293,293,293,293,293,293,293,293,293, 323], + "833": [293,293,293,293,293,293,293,293,293,293, 323], + "834": [293,293,293,293,293,293,293,293,293,293, 323], + "835": [293,293,293,293,293,293,293,293,293,293, 323], + "836": [293,293,293,293,293,293,293,293,293,293, 323], + "837": [293,293,293,293,293,293,293,293,293,293, 323], + "838": [293,293,293,293,293,293,293,293,293,293, 323], + "839": [293,293,293,293,293,293,293,293,293,293, 323], + "840": [293,293,293,293,293,293,293,293,293,293, 323], + "841": [293,293,293,293,293,293,293,293,293,293, 323], + "842": [293,293,293,293,293,293,293,293,293,293, 323], + "843": [293,293,293,293,293,293,293,293,293,293, 323], + "844": [293,293,293,293,293,293,293,293,293,293, 323], + "845": [293,293,293,293,293,293,293,293,293,293, 323], + "846": [293,293,293,293,293,293,293,293,293,293, 323], + "847": [293,293,293,293,293,293,293,293,293,293, 323], + "848": [293,293,293,293,293,293,293,293,293,293, 323], + "849": [293,293,293,293,293,293,293,293,293,293, 323], + "850": [293,293,293,293,293,293,293,293,293,293, 323], + "851": [293,293,293,293,293,293,293,293,293,293, 323], + "852": [293,293,293,293,293,293,293,293,293,293, 323], + "853": [293,293,293,293,293,293,293,293,293,293, 323], + "854": [293,293,293,293,293,293,293,293,293,293, 323], + "855": [293,293,293,293,293,293,293,293,293,293, 323], + "856": [293,293,293,293,293,293,293,293,293,293, 323], + "857": [293,293,293,293,293,293,293,293,293,293, 323], + "858": [293,293,293,293,293,293,293,293,293,293, 323], + "859": [293,293,293,293,293,293,293,293,293,293, 323], + "860": [293,293,293,293,293,293,293,293,293,293, 323], + "861": [293,293,293,293,293,293,293,293,293,293, 323], + "862": [293,293,293,293,293,293,293,293,293,293, 323], + "863": [293,293,293,293,293,293,293,293,293,293, 323], + "864": [293,293,293,293,293,293,293,293,293,293, 323], + "865": [293,293,293,293,293,293,293,293,293,293, 323], + "866": [293,293,293,293,293,293,293,293,293,293, 323], + "867": [293,293,293,293,293,293,293,293,293,293, 323], + "868": [293,293,293,293,293,293,293,293,293,293, 323], + "869": [293,293,293,293,293,293,293,293,293,293, 323], + "870": [293,293,293,293,293,293,293,293,293,293, 323], + "871": [293,293,293,293,293,293,293,293,293,293, 323], + "872": [293,293,293,293,293,293,293,293,293,293, 323], + "873": [293,293,293,293,293,293,293,293,293,293, 323], + "874": [293,293,293,293,293,293,293,293,293,293, 323], + "875": [293,293,293,293,293,293,293,293,293,293, 323], + "876": [293,293,293,293,293,293,293,293,293,293, 323], + "877": [293,293,293,293,293,293,293,293,293,293, 323], + "878": [293,293,293,293,293,293,293,293,293,293, 323], + "879": [293,293,293,293,293,293,293,293,293,293, 323], + "880": [293,293,293,293,293,293,293,293,293,293, 323], + "881": [293,293,293,293,293,293,293,293,293,293, 323], + "882": [293,293,293,293,293,293,293,293,293,293, 323], + "883": [293,293,293,293,293,293,293,293,293,293, 323], + "884": [293,293,293,293,293,293,293,293,293,293, 323], + "885": [293,293,293,293,293,293,293,293,293,293, 323], + "886": [293,293,293,293,293,293,293,293,293,293, 323], + "887": [293,293,293,293,293,293,293,293,293,293, 323], + "888": [293,293,293,293,293,293,293,293,293,293, 323], + "889": [293,293,293,293,293,293,293,293,293,293, 323], + "890": [293,293,293,293,293,293,293,293,293,293, 323], + "891": [293,293,293,293,293,293,293,293,293,293, 323], + "892": [293,293,293,293,293,293,293,293,293,293, 323], + "893": [293,293,293,293,293,293,293,293,293,293, 323], + "894": [293,293,293,293,293,293,293,293,293,293, 323], + "895": [293,293,293,293,293,293,293,293,293,293, 323], + "896": [293,293,293,293,293,293,293,293,293,293, 323], + "897": [293,293,293,293,293,293,293,293,293,293, 323], + "898": [293,293,293,293,293,293,293,293,293,293, 323], + "899": [293,293,293,293,293,293,293,293,293,293, 323], + "900": [293,293,293,293,293,293,293,293,293,293, 323], + "901": [293,293,293,293,293,293,293,293,293,293, 323], + "902": [293,293,293,293,293,293,293,293,293,293, 323], + "903": [293,293,293,293,293,293,293,293,293,293, 323], + "904": [293,293,293,293,293,293,293,293,293,293, 323], + "905": [293,293,293,293,293,293,293,293,293,293, 323], + "906": [293,293,293,293,293,293,293,293,293,293, 323], + "907": [293,293,293,293,293,293,293,293,293,293, 323], + "908": [293,293,293,293,293,293,293,293,293,293, 323], + "909": [293,293,293,293,293,293,293,293,293,293, 323], + "910": [293,293,293,293,293,293,293,293,293,293, 323], + "911": [293,293,293,293,293,293,293,293,293,293, 323], + "912": [293,293,293,293,293,293,293,293,293,293, 323], + "913": [293,293,293,293,293,293,293,293,293,293, 323], + "914": [293,293,293,293,293,293,293,293,293,293, 323], + "915": [293,293,293,293,293,293,293,293,293,293, 323], + "916": [293,293,293,293,293,293,293,293,293,293, 323], + "917": [293,293,293,293,293,293,293,293,293,293, 323], + "918": [293,293,293,293,293,293,293,293,293,293, 323], + "919": [293,293,293,293,293,293,293,293,293,293, 323], + "920": [293,293,293,293,293,293,293,293,293,293, 323], + "921": [293,293,293,293,293,293,293,293,293,293, 323], + "922": [293,293,293,293,293,293,293,293,293,293, 323], + "923": [293,293,293,293,293,293,293,293,293,293, 323], + "924": [293,293,293,293,293,293,293,293,293,293, 323], + "925": [293,293,293,293,293,293,293,293,293,293, 323], + "926": [293,293,293,293,293,293,293,293,293,293, 323], + "927": [293,293,293,293,293,293,293,293,293,293, 323], + "928": [293,293,293,293,293,293,293,293,293,293, 323], + "929": [293,293,293,293,293,293,293,293,293,293, 323], + "930": [293,293,293,293,293,293,293,293,293,293, 323], + "931": [293,293,293,293,293,293,293,293,293,293, 323], + "932": [293,293,293,293,293,293,293,293,293,293, 323], + "933": [293,293,293,293,293,293,293,293,293,293, 323], + "934": [293,293,293,293,293,293,293,293,293,293, 323], + "935": [293,293,293,293,293,293,293,293,293,293, 323], + "936": [293,293,293,293,293,293,293,293,293,293, 323], + "937": [293,293,293,293,293,293,293,293,293,293, 323], + "938": [293,293,293,293,293,293,293,293,293,293, 323], + "939": [293,293,293,293,293,293,293,293,293,293, 323], + "940": [293,293,293,293,293,293,293,293,293,293, 323], + "941": [293,293,293,293,293,293,293,293,293,293, 323], + "942": [293,293,293,293,293,293,293,293,293,293, 323], + "943": [293,293,293,293,293,293,293,293,293,293, 323], + "944": [293,293,293,293,293,293,293,293,293,293, 323], + "945": [293,293,293,293,293,293,293,293,293,293, 323], + "946": [293,293,293,293,293,293,293,293,293,293, 323], + "947": [293,293,293,293,293,293,293,293,293,293, 323], + "948": [293,293,293,293,293,293,293,293,293,293, 323], + "949": [293,293,293,293,293,293,293,293,293,293, 323], + "950": [293,293,293,293,293,293,293,293,293,293, 323], + "951": [293,293,293,293,293,293,293,293,293,293, 323], + "952": [293,293,293,293,293,293,293,293,293,293, 323], + "953": [293,293,293,293,293,293,293,293,293,293, 323], + "954": [293,293,293,293,293,293,293,293,293,293, 323], + "955": [293,293,293,293,293,293,293,293,293,293, 323], + "956": [293,293,293,293,293,293,293,293,293,293, 323], + "957": [293,293,293,293,293,293,293,293,293,293, 323], + "958": [293,293,293,293,293,293,293,293,293,293, 323], + "959": [293,293,293,293,293,293,293,293,293,293, 323], + "960": [293,293,293,293,293,293,293,293,293,293, 323], + "961": [293,293,293,293,293,293,293,293,293,293, 323], + "962": [293,293,293,293,293,293,293,293,293,293, 323], + "963": [293,293,293,293,293,293,293,293,293,293, 323], + "964": [293,293,293,293,293,293,293,293,293,293, 323], + "965": [293,293,293,293,293,293,293,293,293,293, 323], + "966": [293,293,293,293,293,293,293,293,293,293, 323], + "967": [293,293,293,293,293,293,293,293,293,293, 323], + "968": [293,293,293,293,293,293,293,293,293,293, 323], + "969": [293,293,293,293,293,293,293,293,293,293, 323], + "970": [293,293,293,293,293,293,293,293,293,293, 323], + "971": [293,293,293,293,293,293,293,293,293,293, 323], + "972": [293,293,293,293,293,293,293,293,293,293, 323], + "973": [293,293,293,293,293,293,293,293,293,293, 323], + "974": [293,293,293,293,293,293,293,293,293,293, 323], + "975": [293,293,293,293,293,293,293,293,293,293, 323], + "976": [293,293,293,293,293,293,293,293,293,293, 323], + "977": [293,293,293,293,293,293,293,293,293,293, 323], + "978": [293,293,293,293,293,293,293,293,293,293, 323], + "979": [293,293,293,293,293,293,293,293,293,293, 323], + "980": [293,293,293,293,293,293,293,293,293,293, 323], + "981": [293,293,293,293,293,293,293,293,293,293, 323], + "982": [293,293,293,293,293,293,293,293,293,293, 323], + "983": [293,293,293,293,293,293,293,293,293,293, 323], + "984": [293,293,293,293,293,293,293,293,293,293, 323], + "985": [293,293,293,293,293,293,293,293,293,293, 323], + "986": [293,293,293,293,293,293,293,293,293,293, 323], + "987": [293,293,293,293,293,293,293,293,293,293, 323], + "988": [293,293,293,293,293,293,293,293,293,293, 323], + "989": [293,293,293,293,293,293,293,293,293,293, 323], + "990": [293,293,293,293,293,293,293,293,293,293, 323], + "991": [293,293,293,293,293,293,293,293,293,293, 323], + "992": [293,293,293,293,293,293,293,293,293,293, 323], + "993": [293,293,293,293,293,293,293,293,293,293, 323], + "994": [293,293,293,293,293,293,293,293,293,293, 323], + "995": [293,293,293,293,293,293,293,293,293,293, 323], + "996": [293,293,293,293,293,293,293,293,293,293, 323], + "997": [293,293,293,293,293,293,293,293,293,293, 323], + "998": [293,293,293,293,293,293,293,293,293,293, 323], + "999": [293,293,293,293,293,293,293,293,293,293, 323], + "1000": [293,293,293,293,293,293,293,293,293,293, 323], + "1001": [293,293,293,293,293,293,293,293,293,293, 323], + "1002": [293,293,293,293,293,293,293,293,293,293, 323], + "1003": [293,293,293,293,293,293,293,293,293,293, 323], + "1004": [293,293,293,293,293,293,293,293,293,293, 323], + "1005": [293,293,293,293,293,293,293,293,293,293, 323] + } +} \ No newline at end of file diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/0/radius.json b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/0/radius.json new file mode 100644 index 0000000..aa6ed29 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/0/radius.json @@ -0,0 +1,1011 @@ +{ + "name": "radius", + "data": + { + "1": [0.001], + "2": [0.001], + "3": [0.001], + "4": [0.001], + "5": [0.001], + "6": [0.001], + "7": [0.001], + "8": [0.001], + "9": [0.001], + "10": [0.001], + "11": [0.001], + "12": [0.001], + "13": [0.001], + "14": [0.001], + "15": [0.001], + "16": [0.001], + "17": [0.001], + "18": [0.001], + "19": [0.001], + "20": [0.001], + "21": [0.001], + "22": [0.001], + "23": [0.001], + "24": [0.001], + "25": [0.001], + "26": [0.001], + "27": [0.001], + "28": [0.001], + "29": [0.001], + "30": [0.001], + "31": [0.001], + "32": [0.001], + "33": [0.001], + "34": [0.001], + "35": [0.001], + "36": [0.001], + "37": [0.001], + "38": [0.001], + "39": [0.001], + "40": [0.001], + "41": [0.001], + "42": [0.001], + "43": [0.001], + "44": [0.001], + "45": [0.001], + "46": [0.001], + "47": [0.001], + "48": [0.001], + "49": [0.001], + "50": [0.001], + "51": [0.001], + "52": [0.001], + "53": [0.001], + "54": [0.001], + "55": [0.001], + "56": [0.001], + "57": [0.001], + "58": [0.001], + "59": [0.001], + "60": [0.001], + "61": [0.001], + "62": [0.001], + "63": [0.001], + "64": [0.001], + "65": [0.001], + "66": [0.001], + "67": [0.001], + "68": [0.001], + "69": [0.001], + "70": [0.001], + "71": [0.001], + "72": [0.001], + "73": [0.001], + "74": [0.001], + "75": [0.001], + "76": [0.001], + "77": [0.001], + "78": [0.001], + "79": [0.001], + "80": [0.001], + "81": [0.001], + "82": [0.001], + "83": [0.001], + "84": [0.001], + "85": [0.001], + "86": [0.001], + "87": [0.001], + "88": [0.001], + "89": [0.001], + "90": [0.001], + "91": [0.001], + "92": [0.001], + "93": [0.001], + "94": [0.001], + "95": [0.001], + "96": [0.001], + "97": [0.001], + "98": [0.001], + "99": [0.001], + "100": [0.001], + "101": [0.001], + "102": [0.001], + "103": [0.001], + "104": [0.001], + "105": [0.001], + "106": [0.001], + "107": [0.001], + "108": [0.001], + "109": [0.001], + "110": [0.001], + "111": [0.001], + "112": [0.001], + "113": [0.001], + "114": [0.001], + "115": [0.001], + "116": [0.001], + "117": [0.001], + "118": [0.001], + "119": [0.001], + "120": [0.001], + "121": [0.001], + "122": [0.001], + "123": [0.001], + "124": [0.001], + "125": [0.001], + "126": [0.001], + "127": [0.001], + "128": [0.001], + "129": [0.001], + "130": [0.001], + "131": [0.001], + "132": [0.001], + "133": [0.001], + "134": [0.001], + "135": [0.001], + "136": [0.001], + "137": [0.001], + "138": [0.001], + "139": [0.001], + "140": [0.001], + "141": [0.001], + "142": [0.001], + "143": [0.001], + "144": [0.001], + "145": [0.001], + "146": [0.001], + "147": [0.001], + "148": [0.001], + "149": [0.001], + "150": [0.001], + "151": [0.001], + "152": [0.001], + "153": [0.001], + "154": [0.001], + "155": [0.001], + "156": [0.001], + "157": [0.001], + "158": [0.001], + "159": [0.001], + "160": [0.001], + "161": [0.001], + "162": [0.001], + "163": [0.001], + "164": [0.001], + "165": [0.001], + "166": [0.001], + "167": [0.001], + "168": [0.001], + "169": [0.001], + "170": [0.001], + "171": [0.001], + "172": [0.001], + "173": [0.001], + "174": [0.001], + "175": [0.001], + "176": [0.001], + "177": [0.001], + "178": [0.001], + "179": [0.001], + "180": [0.001], + "181": [0.001], + "182": [0.001], + "183": [0.001], + "184": [0.001], + "185": [0.001], + "186": [0.001], + "187": [0.001], + "188": [0.001], + "189": [0.001], + "190": [0.001], + "191": [0.001], + "192": [0.001], + "193": [0.001], + "194": [0.001], + "195": [0.001], + "196": [0.001], + "197": [0.001], + "198": [0.001], + "199": [0.001], + "200": [0.001], + "201": [0.001], + "202": [0.001], + "203": [0.001], + "204": [0.001], + "205": [0.001], + "206": [0.001], + "207": [0.001], + "208": [0.001], + "209": [0.001], + "210": [0.001], + "211": [0.001], + "212": [0.001], + "213": [0.001], + "214": [0.001], + "215": [0.001], + "216": [0.001], + "217": [0.001], + "218": [0.001], + "219": [0.001], + "220": [0.001], + "221": [0.001], + "222": [0.001], + "223": [0.001], + "224": [0.001], + "225": [0.001], + "226": [0.001], + "227": [0.001], + "228": [0.001], + "229": [0.001], + "230": [0.001], + "231": [0.001], + "232": [0.001], + "233": [0.001], + "234": [0.001], + "235": [0.001], + "236": [0.001], + "237": [0.001], + "238": [0.001], + "239": [0.001], + "240": [0.001], + "241": [0.001], + "242": [0.001], + "243": [0.001], + "244": [0.001], + "245": [0.001], + "246": [0.001], + "247": [0.001], + "248": [0.001], + "249": [0.001], + "250": [0.001], + "251": [0.001], + "252": [0.001], + "253": [0.001], + "254": [0.001], + "255": [0.001], + "256": [0.001], + "257": [0.001], + "258": [0.001], + "259": [0.001], + "260": [0.001], + "261": [0.001], + "262": [0.001], + "263": [0.001], + "264": [0.001], + "265": [0.001], + "266": [0.001], + "267": [0.001], + "268": [0.001], + "269": [0.001], + "270": [0.001], + "271": [0.001], + "272": [0.001], + "273": [0.001], + "274": [0.001], + "275": [0.001], + "276": [0.001], + "277": [0.001], + "278": [0.001], + "279": [0.001], + "280": [0.001], + "281": [0.001], + "282": [0.001], + "283": [0.001], + "284": [0.001], + "285": [0.001], + "286": [0.001], + "287": [0.001], + "288": [0.001], + "289": [0.001], + "290": [0.001], + "291": [0.001], + "292": [0.001], + "293": [0.001], + "294": [0.001], + "295": [0.001], + "296": [0.001], + "297": [0.001], + "298": [0.001], + "299": [0.001], + "300": [0.001], + "301": [0.001], + "302": [0.001], + "303": [0.001], + "304": [0.001], + "305": [0.001], + "306": [0.001], + "307": [0.001], + "308": [0.001], + "309": [0.001], + "310": [0.001], + "311": [0.001], + "312": [0.001], + "313": [0.001], + "314": [0.001], + "315": [0.001], + "316": [0.001], + "317": [0.001], + "318": [0.001], + "319": [0.001], + "320": [0.001], + "321": [0.001], + "322": [0.001], + "323": [0.001], + "324": [0.001], + "325": [0.001], + "326": [0.001], + "327": [0.001], + "328": [0.001], + "329": [0.001], + "330": [0.001], + "331": [0.001], + "332": [0.001], + "333": [0.001], + "334": [0.001], + "335": [0.001], + "336": [0.001], + "337": [0.001], + "338": [0.001], + "339": [0.001], + "340": [0.001], + "341": [0.001], + "342": [0.001], + "343": [0.001], + "344": [0.001], + "345": [0.001], + "346": [0.001], + "347": [0.001], + "348": [0.001], + "349": [0.001], + "350": [0.001], + "351": [0.001], + "352": [0.001], + "353": [0.001], + "354": [0.001], + "355": [0.001], + "356": [0.001], + "357": [0.001], + "358": [0.001], + "359": [0.001], + "360": [0.001], + "361": [0.001], + "362": [0.001], + "363": [0.001], + "364": [0.001], + "365": [0.001], + "366": [0.001], + "367": [0.001], + "368": [0.001], + "369": [0.001], + "370": [0.001], + "371": [0.001], + "372": [0.001], + "373": [0.001], + "374": [0.001], + "375": [0.001], + "376": [0.001], + "377": [0.001], + "378": [0.001], + "379": [0.001], + "380": [0.001], + "381": [0.001], + "382": [0.001], + "383": [0.001], + "384": [0.001], + "385": [0.001], + "386": [0.001], + "387": [0.001], + "388": [0.001], + "389": [0.001], + "390": [0.001], + "391": [0.001], + "392": [0.001], + "393": [0.001], + "394": [0.001], + "395": [0.001], + "396": [0.001], + "397": [0.001], + "398": [0.001], + "399": [0.001], + "400": [0.001], + "401": [0.001], + "402": [0.001], + "403": [0.001], + "404": [0.001], + "405": [0.001], + "406": [0.001], + "407": [0.001], + "408": [0.001], + "409": [0.001], + "410": [0.001], + "411": [0.001], + "412": [0.001], + "413": [0.001], + "414": [0.001], + "415": [0.001], + "416": [0.001], + "417": [0.001], + "418": [0.001], + "419": [0.001], + "420": [0.001], + "421": [0.001], + "422": [0.001], + "423": [0.001], + "424": [0.001], + "425": [0.001], + "426": [0.001], + "427": [0.001], + "428": [0.001], + "429": [0.001], + "430": [0.001], + "431": [0.001], + "432": [0.001], + "433": [0.001], + "434": [0.001], + "435": [0.001], + "436": [0.001], + "437": [0.001], + "438": [0.001], + "439": [0.001], + "440": [0.001], + "441": [0.001], + "442": [0.001], + "443": [0.001], + "444": [0.001], + "445": [0.001], + "446": [0.001], + "447": [0.001], + "448": [0.001], + "449": [0.001], + "450": [0.001], + "451": [0.001], + "452": [0.001], + "453": [0.001], + "454": [0.001], + "455": [0.001], + "456": [0.001], + "457": [0.001], + "458": [0.001], + "459": [0.001], + "460": [0.001], + "461": [0.001], + "462": [0.001], + "463": [0.001], + "464": [0.001], + "465": [0.001], + "466": [0.001], + "467": [0.001], + "468": [0.001], + "469": [0.001], + "470": [0.001], + "471": [0.001], + "472": [0.001], + "473": [0.001], + "474": [0.001], + "475": [0.001], + "476": [0.001], + "477": [0.001], + "478": [0.001], + "479": [0.001], + "480": [0.001], + "481": [0.001], + "482": [0.001], + "483": [0.001], + "484": [0.001], + "485": [0.001], + "486": [0.001], + "487": [0.001], + "488": [0.001], + "489": [0.001], + "490": [0.001], + "491": [0.001], + "492": [0.001], + "493": [0.001], + "494": [0.001], + "495": [0.001], + "496": [0.001], + "497": [0.001], + "498": [0.001], + "499": [0.001], + "500": [0.001], + "501": [0.001], + "502": [0.001], + "503": [0.001], + "504": [0.001], + "505": [0.001], + "506": [0.001], + "507": [0.001], + "508": [0.001], + "509": [0.001], + "510": [0.001], + "511": [0.001], + "512": [0.001], + "513": [0.001], + "514": [0.001], + "515": [0.001], + "516": [0.001], + "517": [0.001], + "518": [0.001], + "519": [0.001], + "520": [0.001], + "521": [0.001], + "522": [0.001], + "523": [0.001], + "524": [0.001], + "525": [0.001], + "526": [0.001], + "527": [0.001], + "528": [0.001], + "529": [0.001], + "530": [0.001], + "531": [0.001], + "532": [0.001], + "533": [0.001], + "534": [0.001], + "535": [0.001], + "536": [0.001], + "537": [0.001], + "538": [0.001], + "539": [0.001], + "540": [0.001], + "541": [0.001], + "542": [0.001], + "543": [0.001], + "544": [0.001], + "545": [0.001], + "546": [0.001], + "547": [0.001], + "548": [0.001], + "549": [0.001], + "550": [0.001], + "551": [0.001], + "552": [0.001], + "553": [0.001], + "554": [0.001], + "555": [0.001], + "556": [0.001], + "557": [0.001], + "558": [0.001], + "559": [0.001], + "560": [0.001], + "561": [0.001], + "562": [0.001], + "563": [0.001], + "564": [0.001], + "565": [0.001], + "566": [0.001], + "567": [0.001], + "568": [0.001], + "569": [0.001], + "570": [0.001], + "571": [0.001], + "572": [0.001], + "573": [0.001], + "574": [0.001], + "575": [0.001], + "576": [0.001], + "577": [0.001], + "578": [0.001], + "579": [0.001], + "580": [0.001], + "581": [0.001], + "582": [0.001], + "583": [0.001], + "584": [0.001], + "585": [0.001], + "586": [0.001], + "587": [0.001], + "588": [0.001], + "589": [0.001], + "590": [0.001], + "591": [0.001], + "592": [0.001], + "593": [0.001], + "594": [0.001], + "595": [0.001], + "596": [0.001], + "597": [0.001], + "598": [0.001], + "599": [0.001], + "600": [0.001], + "601": [0.001], + "602": [0.001], + "603": [0.001], + "604": [0.001], + "605": [0.001], + "606": [0.001], + "607": [0.001], + "608": [0.001], + "609": [0.001], + "610": [0.001], + "611": [0.001], + "612": [0.001], + "613": [0.001], + "614": [0.001], + "615": [0.001], + "616": [0.001], + "617": [0.001], + "618": [0.001], + "619": [0.001], + "620": [0.001], + "621": [0.001], + "622": [0.001], + "623": [0.001], + "624": [0.001], + "625": [0.001], + "626": [0.001], + "627": [0.001], + "628": [0.001], + "629": [0.001], + "630": [0.001], + "631": [0.001], + "632": [0.001], + "633": [0.001], + "634": [0.001], + "635": [0.001], + "636": [0.001], + "637": [0.001], + "638": [0.001], + "639": [0.001], + "640": [0.001], + "641": [0.001], + "642": [0.001], + "643": [0.001], + "644": [0.001], + "645": [0.001], + "646": [0.001], + "647": [0.001], + "648": [0.001], + "649": [0.001], + "650": [0.001], + "651": [0.001], + "652": [0.001], + "653": [0.001], + "654": [0.001], + "655": [0.001], + "656": [0.001], + "657": [0.001], + "658": [0.001], + "659": [0.001], + "660": [0.001], + "661": [0.001], + "662": [0.001], + "663": [0.001], + "664": [0.001], + "665": [0.001], + "666": [0.001], + "667": [0.001], + "668": [0.001], + "669": [0.001], + "670": [0.001], + "671": [0.001], + "672": [0.001], + "673": [0.001], + "674": [0.001], + "675": [0.001], + "676": [0.001], + "677": [0.001], + "678": [0.001], + "679": [0.001], + "680": [0.001], + "681": [0.001], + "682": [0.001], + "683": [0.001], + "684": [0.001], + "685": [0.001], + "686": [0.001], + "687": [0.001], + "688": [0.001], + "689": [0.001], + "690": [0.001], + "691": [0.001], + "692": [0.001], + "693": [0.001], + "694": [0.001], + "695": [0.001], + "696": [0.001], + "697": [0.001], + "698": [0.001], + "699": [0.001], + "700": [0.001], + "701": [0.001], + "702": [0.001], + "703": [0.001], + "704": [0.001], + "705": [0.001], + "706": [0.001], + "707": [0.001], + "708": [0.001], + "709": [0.001], + "710": [0.001], + "711": [0.001], + "712": [0.001], + "713": [0.001], + "714": [0.001], + "715": [0.001], + "716": [0.001], + "717": [0.001], + "718": [0.001], + "719": [0.001], + "720": [0.001], + "721": [0.001], + "722": [0.001], + "723": [0.001], + "724": [0.001], + "725": [0.001], + "726": [0.001], + "727": [0.001], + "728": [0.001], + "729": [0.001], + "730": [0.001], + "731": [0.001], + "732": [0.001], + "733": [0.001], + "734": [0.001], + "735": [0.001], + "736": [0.001], + "737": [0.001], + "738": [0.001], + "739": [0.001], + "740": [0.001], + "741": [0.001], + "742": [0.001], + "743": [0.001], + "744": [0.001], + "745": [0.001], + "746": [0.001], + "747": [0.001], + "748": [0.001], + "749": [0.001], + "750": [0.001], + "751": [0.001], + "752": [0.001], + "753": [0.001], + "754": [0.001], + "755": [0.001], + "756": [0.001], + "757": [0.001], + "758": [0.001], + "759": [0.001], + "760": [0.001], + "761": [0.001], + "762": [0.001], + "763": [0.001], + "764": [0.001], + "765": [0.001], + "766": [0.001], + "767": [0.001], + "768": [0.001], + "769": [0.001], + "770": [0.001], + "771": [0.001], + "772": [0.001], + "773": [0.001], + "774": [0.001], + "775": [0.001], + "776": [0.001], + "777": [0.001], + "778": [0.001], + "779": [0.001], + "780": [0.001], + "781": [0.001], + "782": [0.001], + "783": [0.001], + "784": [0.001], + "785": [0.001], + "786": [0.001], + "787": [0.001], + "788": [0.001], + "789": [0.001], + "790": [0.001], + "791": [0.001], + "792": [0.001], + "793": [0.001], + "794": [0.001], + "795": [0.001], + "796": [0.001], + "797": [0.001], + "798": [0.001], + "799": [0.001], + "800": [0.001], + "801": [0.001], + "802": [0.001], + "803": [0.001], + "804": [0.001], + "805": [0.001], + "806": [0.001], + "807": [0.001], + "808": [0.001], + "809": [0.001], + "810": [0.001], + "811": [0.001], + "812": [0.001], + "813": [0.001], + "814": [0.001], + "815": [0.001], + "816": [0.001], + "817": [0.001], + "818": [0.001], + "819": [0.001], + "820": [0.001], + "821": [0.001], + "822": [0.001], + "823": [0.001], + "824": [0.001], + "825": [0.001], + "826": [0.001], + "827": [0.001], + "828": [0.001], + "829": [0.001], + "830": [0.001], + "831": [0.001], + "832": [0.001], + "833": [0.001], + "834": [0.001], + "835": [0.001], + "836": [0.001], + "837": [0.001], + "838": [0.001], + "839": [0.001], + "840": [0.001], + "841": [0.001], + "842": [0.001], + "843": [0.001], + "844": [0.001], + "845": [0.001], + "846": [0.001], + "847": [0.001], + "848": [0.001], + "849": [0.001], + "850": [0.001], + "851": [0.001], + "852": [0.001], + "853": [0.001], + "854": [0.001], + "855": [0.001], + "856": [0.001], + "857": [0.001], + "858": [0.001], + "859": [0.001], + "860": [0.001], + "861": [0.001], + "862": [0.001], + "863": [0.001], + "864": [0.001], + "865": [0.001], + "866": [0.001], + "867": [0.001], + "868": [0.001], + "869": [0.001], + "870": [0.001], + "871": [0.001], + "872": [0.001], + "873": [0.001], + "874": [0.001], + "875": [0.001], + "876": [0.001], + "877": [0.001], + "878": [0.001], + "879": [0.001], + "880": [0.001], + "881": [0.001], + "882": [0.001], + "883": [0.001], + "884": [0.001], + "885": [0.001], + "886": [0.001], + "887": [0.001], + "888": [0.001], + "889": [0.001], + "890": [0.001], + "891": [0.001], + "892": [0.001], + "893": [0.001], + "894": [0.001], + "895": [0.001], + "896": [0.001], + "897": [0.001], + "898": [0.001], + "899": [0.001], + "900": [0.001], + "901": [0.001], + "902": [0.001], + "903": [0.001], + "904": [0.001], + "905": [0.001], + "906": [0.001], + "907": [0.001], + "908": [0.001], + "909": [0.001], + "910": [0.001], + "911": [0.001], + "912": [0.001], + "913": [0.001], + "914": [0.001], + "915": [0.001], + "916": [0.001], + "917": [0.001], + "918": [0.001], + "919": [0.001], + "920": [0.001], + "921": [0.001], + "922": [0.001], + "923": [0.001], + "924": [0.001], + "925": [0.001], + "926": [0.001], + "927": [0.001], + "928": [0.001], + "929": [0.001], + "930": [0.001], + "931": [0.001], + "932": [0.001], + "933": [0.001], + "934": [0.001], + "935": [0.001], + "936": [0.001], + "937": [0.001], + "938": [0.001], + "939": [0.001], + "940": [0.001], + "941": [0.001], + "942": [0.001], + "943": [0.001], + "944": [0.001], + "945": [0.001], + "946": [0.001], + "947": [0.001], + "948": [0.001], + "949": [0.001], + "950": [0.001], + "951": [0.001], + "952": [0.001], + "953": [0.001], + "954": [0.001], + "955": [0.001], + "956": [0.001], + "957": [0.001], + "958": [0.001], + "959": [0.001], + "960": [0.001], + "961": [0.001], + "962": [0.001], + "963": [0.001], + "964": [0.001], + "965": [0.001], + "966": [0.001], + "967": [0.001], + "968": [0.001], + "969": [0.001], + "970": [0.001], + "971": [0.001], + "972": [0.001], + "973": [0.001], + "974": [0.001], + "975": [0.001], + "976": [0.001], + "977": [0.001], + "978": [0.001], + "979": [0.001], + "980": [0.001], + "981": [0.001], + "982": [0.001], + "983": [0.001], + "984": [0.001], + "985": [0.001], + "986": [0.001], + "987": [0.001], + "988": [0.001], + "989": [0.001], + "990": [0.001], + "991": [0.001], + "992": [0.001], + "993": [0.001], + "994": [0.001], + "995": [0.001], + "996": [0.001], + "997": [0.001], + "998": [0.001], + "999": [0.001], + "1000": [0.001], + "1001": [0.001], + "1002": [0.001], + "1003": [0.001], + "1004": [0.001], + "1005": [0.001] + } +} \ No newline at end of file diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/genPascalInput.m b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/genPascalInput.m new file mode 100644 index 0000000..6851658 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/genPascalInput.m @@ -0,0 +1,58 @@ +% *.m file +clear +clc +more off + +numberOfParticles = 1005 + +%================================================================ +text = '[293,293,293,293,293,293,293,293,293,293, 323]'; + +fid=fopen('0/heat.json','w'); + +% header +fprintf(fid, ['{\n']); +fprintf(fid, [' "name": "heat",\n']); +fprintf(fid, [' "data":\n']); +fprintf(fid, [' {\n']); + +for iP=1:numberOfParticles + index=iP; + fprintf(fid, [' "',num2str(index), '": ', text ]); + if(iP==numberOfParticles) + fprintf(fid, ['\n']); + else + fprintf(fid, [', \n']); + end +end + +% footer +fprintf(fid, [' }\n']); +fprintf(fid, ['}']); +fclose(fid); +%================================================================ +text = '[0.001]'; + +fid=fopen('0/radius.json','w'); + +% header +fprintf(fid, ['{\n']); +fprintf(fid, [' "name": "radius",\n']); +fprintf(fid, [' "data":\n']); +fprintf(fid, [' {\n']); + +for iP=1:numberOfParticles + index=iP; + fprintf(fid, [' "',num2str(index), '": ', text ]); + if(iP==numberOfParticles) + fprintf(fid, ['\n']); + else + fprintf(fid, [', \n']); + end +end + +% footer +fprintf(fid, [' }\n']); +fprintf(fid, ['}']); +fclose(fid); +%================================================================ diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/in.pascal b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/in.pascal new file mode 100644 index 0000000..ed260b8 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/in.pascal @@ -0,0 +1,22 @@ +particle_mesh nGridPoints 10 + +particle_data number_particles 1005 +#coupling json myCoupling +coupling liggghts + +#Heat properties +model propertiesThermo heatThermalConductivity_solid +model propertiesThermo heatCapacity_solid +model propertiesThermo heatDensity_solid + + +#Equations +#Option 1: cool with implicit coupling +#modelEqn 1DSpherical heat BC0 1 BC1 2 # 2 Convective: will cool based on coefficient and fluid temp + +#Option 2: cool with explicit setting of flux +modelEqn 1DSpherical heat BC0 1 BC1 0 # 0 Neumann: will cool with a fixed rate provided by LIGGGHTS + +control outputTimeStep 0.1 +control timeStep 5e-6 +#control run 0.000025 init yes diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/settings/coupling_liggghts.json b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/settings/coupling_liggghts.json new file mode 100644 index 0000000..9c11dbf --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/settings/coupling_liggghts.json @@ -0,0 +1,7 @@ +{ + "properties": + { + "verbose" : false, + "pullEvery": 1 + } +} diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/settings/integrator.json b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/settings/integrator.json new file mode 100644 index 0000000..ddd31a9 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/settings/integrator.json @@ -0,0 +1,18 @@ +{ + "integrator": + { + "type": "CVODE", + "linearSolver": "CVDiag" + }, + "parameters": + { + "absTol": 1e-6, + "relTol": 1e-6, + "mxsteps": -1, + "maxord": 3, + "deltaTInit": 1e-10, + "deltaTMin": 1e-16, + "deltaTMax": 1.0, + "maxNonLinearIterations": 2 + } +} diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/settings/model_heatCapacity_solid.json b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/settings/model_heatCapacity_solid.json new file mode 100644 index 0000000..5795501 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/settings/model_heatCapacity_solid.json @@ -0,0 +1,8 @@ +{ + "properties": + { + "model" : "const", + "const_value" : 800.0 + } + +} diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/settings/model_heatDensity_solid.json b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/settings/model_heatDensity_solid.json new file mode 100644 index 0000000..f78113f --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/settings/model_heatDensity_solid.json @@ -0,0 +1,7 @@ +{ + "properties": + { + "model": "const", + "const_value": 2500 + } +} diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/settings/model_heatThermalConductivity_solid.json b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/settings/model_heatThermalConductivity_solid.json new file mode 100644 index 0000000..e3893ba --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/pascal/settings/model_heatThermalConductivity_solid.json @@ -0,0 +1,8 @@ +{ + "properties": + { + "model" : "const", + "const_value" : 0.8 + } + +} diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/settings/parscale.json b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/settings/parscale.json new file mode 100644 index 0000000..6944c8e --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/settings/parscale.json @@ -0,0 +1,8 @@ +{ + "input": + { + "writeJSON" : true, + "writeHDF5" : false + } + +} diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/system/controlDict b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/system/controlDict new file mode 100644 index 0000000..c5a67ca --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/system/controlDict @@ -0,0 +1,219 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object controlDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +application cfdemSolverPisoSTM; + +startFrom startTime; + +startTime 0; + +stopAt endTime; + +endTime 0.1;//1.5; + +deltaT 0.005; + +writeControl adjustableRunTime; + +writeInterval 0.1; + +purgeWrite 0; + +writeFormat ascii; + +writePrecision 6; + +writeCompression uncompressed; + +timeFormat general; + +timePrecision 6; + +runTimeModifiable yes; + +adjustTimeStep no; + +maxCo 0.1; + +maxDeltaT 1; + +//libs ( "libgroovyBC.so" ); + +functions +( + + probes + { + type probes; + // Where to load it from + functionObjectLibs ( "libsampling.so" ); + // Name of the directory for probe data + name probes; + probeLocations + ( + (0.05 0.05 -0.499) + (0.05 0.05 1.499) + ); + + // Fields to be probed + fields ( p T ); + + // Write at same frequency as fields + outputControl timeStep;//outputTime; + outputInterval 1; + } + + volFlow_inlet + { + type faceSource; + functionObjectLibs ("libfieldFunctionObjects.so"); + enabled true; + outputControl outputTime;//timeStep; + log true; + writeArea true; //write for OF 3.0 to be consistent + valueOutput true; + source patch; + sourceName inlet; + operation sum; + + fields + ( + phi + ); + surfaceFormat null; + } + + volFlow_outlet + { + type faceSource; + functionObjectLibs ("libfieldFunctionObjects.so"); + enabled true; + outputControl outputTime;//timeStep; + log true; + writeArea true; //write for OF 3.0 to be consistent + valueOutput true; + source patch; + sourceName outlet; + operation sum; + + fields + ( + phi + ); + surfaceFormat null; + } + + volFlow_wall + { + type faceSource; + functionObjectLibs ("libfieldFunctionObjects.so"); + enabled true; + outputControl outputTime;//timeStep; + log true; + writeArea true; //write for OF 3.0 to be consistent + valueOutput true; + source patch; + sourceName wall; + operation sum; + + fields + ( + phi + ); + surfaceFormat null; + } + +/* +// simpleFunctionObjects + heatFlux + { + type patchHeatFlux; + functionObjectLibs + ( + "libsimpleFunctionObjects.so" + ); + verbose true; + patches + ( + inlet + outlet + ); + fields // name of temp field + ( + T + ); + cp 1007; // cp in [J/(kg*K)] + factor 1.188; // density for incomp solvers! + } + + massFlux + { + type patchMassFlow; + functionObjectLibs + ( + "libsimpleFunctionObjects.so" + ); + verbose true; + patches + ( + inlet + outlet + ); + factor 1.188; // density for incomp solvers! + } + + pressureDrop + { + type patchAverage; + functionObjectLibs + ( + "libsimpleFunctionObjects.so" + ); + verbose true; + patches + ( + inlet + outlet + ); + fields + ( + p + ); + factor 1; + } + + T + { + type patchAverage; + functionObjectLibs + ( + "libsimpleFunctionObjects.so" + ); + verbose true; + patches + ( + inlet + outlet + ); + fields // name of temp field + ( + T + ); + factor 1; + }*/ +); +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/system/controlDict.foam b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/system/controlDict.foam new file mode 100644 index 0000000..e69de29 diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/system/decomposeParDict b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/system/decomposeParDict new file mode 100644 index 0000000..0ac01d7 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/system/decomposeParDict @@ -0,0 +1,56 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object decomposeParDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +numberOfSubdomains 2; + +method simple; + +simpleCoeffs +{ + n ( 1 1 2 ); + delta 0.001; +} + +hierarchicalCoeffs +{ + n ( 2 2 1 ); + delta 0.001; + order xyz; +} + +metisCoeffs +{ +} + +manualCoeffs +{ + dataFile ""; +} + +distributed no; + +//// Is the case distributed +//distributed yes; +//// Per slave (so nProcs-1 entries) the directory above the case. +//roots +//( +// "/tmp" +// "/tmp" +//); + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/system/fvSchemes b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/system/fvSchemes new file mode 100644 index 0000000..29629bf --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/system/fvSchemes @@ -0,0 +1,78 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSchemes; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +ddtSchemes +{ + default Euler; +} + +gradSchemes +{ + default Gauss linear; + grad(p) Gauss linear; + grad(U) Gauss linear; +} + +divSchemes +{ + default Gauss linear; + div(phi,U) Gauss limitedLinearV 1; + div(phi,k) Gauss limitedLinear 1; + div(phi,epsilon) Gauss limitedLinear 1; + div(phi,R) Gauss limitedLinear 1; + div(R) Gauss linear; + div(phi,nuTilda) Gauss limitedLinear 1; + div((nuEff*dev(grad(U).T()))) Gauss linear; + div((viscousTerm*dev(grad(U).T()))) Gauss linear; + div((nu*dev(grad(U).T()))) Gauss linear; + div(phi,T) Gauss limitedLinear 1; //Gauss upwind; // +} + +laplacianSchemes +{ + default Gauss linear corrected; + laplacian(nuEff,U) Gauss linear corrected; + laplacian(viscousTerm,U) Gauss linear corrected; + laplacian(nu,U) Gauss linear corrected; + laplacian((1|A(U)),p) Gauss linear corrected; + laplacian((voidfraction2|A(U)),p) Gauss linear corrected; + laplacian(DkEff,k) Gauss linear corrected; + laplacian(DepsilonEff,epsilon) Gauss linear corrected; + laplacian(DREff,R) Gauss linear corrected; + laplacian(DnuTildaEff,nuTilda) Gauss linear corrected; + laplacian((DT*voidfraction),T) Gauss linear corrected; +} + +interpolationSchemes +{ + default linear; + interpolate(U) linear; +} + +snGradSchemes +{ + default corrected; +} + +fluxRequired +{ + default no; + p ; +} + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/system/fvSolution b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/system/fvSolution new file mode 100644 index 0000000..a926d09 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/CFD/system/fvSolution @@ -0,0 +1,114 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.6 | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "system"; + object fvSolution; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +solvers +{ + p + { + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0.1; + } + + pFinal + { + solver PCG; + preconditioner DIC; + tolerance 1e-06; + relTol 0; + } + + U + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + UFinal + { + $U + } + + "(k|epsilon)" + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0.1; + } + "(k|epsilon)Final" + { + $epsilon; + relTol 0; + } + + R + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + nuTilda + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-05; + relTol 0; + } + + "(T|C)" + { + solver PBiCG; + preconditioner DILU; + tolerance 1e-06; + relTol 0; + } +} + +PIMPLE +{ + nOuterCorrectors 1; +} +relaxationFactors +{ + fields + { + p 1.0; + } + equations + { + "U.*" 1.0; + "k.*" 1.; + "epsilon.*" 1.; + } +} + +PISO +{ + nCorrectors 4; + nNonOrthogonalCorrectors 0; + pRefCell 0; + pRefValue 0; +} + + +// ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/DEM/in.liggghts_init b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/DEM/in.liggghts_init new file mode 100755 index 0000000..1275e23 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/DEM/in.liggghts_init @@ -0,0 +1,69 @@ +echo both +log ../DEM/log.liggghts + +atom_style granular +atom_modify map array +boundary m m m +newton off + +communicate single vel yes + +units si +processors 1 1 2 + +region reg block 0. 0.1 0. 0.1 0. 1.1 units box +create_box 1 reg + +neighbor 0.002 bin +neigh_modify delay 0 + + +# Material properties required for granular pair styles + +fix m1 all property/global youngsModulus peratomtype 5.e6 +fix m2 all property/global poissonsRatio peratomtype 0.45 +fix m3 all property/global coefficientRestitution peratomtypepair 1 0.3 +fix m4 all property/global coefficientFriction peratomtypepair 1 0.5 + +# pair style +pair_style gran model hertz tangential history #Hertzian without cohesion +pair_coeff * * + +timestep 0.00001 + +# walls +fix xwalls1 all wall/gran model hertz tangential history primitive type 1 xplane 0.0 +fix xwalls2 all wall/gran model hertz tangential history primitive type 1 xplane 0.1 +fix ywalls1 all wall/gran model hertz tangential history primitive type 1 yplane 0.0 +fix ywalls2 all wall/gran model hertz tangential history primitive type 1 yplane 0.1 +fix zwalls1 all wall/gran model hertz tangential history primitive type 1 zplane 0.0 +fix zwalls2 all wall/gran model hertz tangential history primitive type 1 zplane 1.1 + +fix gravi all gravity 9.81 vector 0.0 0.0 -1.0 + + +# particle distributions and insertion +region bc block 0. 0.1 0. 0.1 0. 1.1 units box +fix pts1 all particletemplate/sphere 15485863 atom_type 1 density constant 2500 radius constant 0.011 +fix pdd1 all particledistribution/discrete 15485867 1 pts1 1.0 + +fix ins all insert/pack seed 32452843 distributiontemplate pdd1 vel constant 0. 0. -3. insert_every 10000 overlapcheck yes all_in yes particles_in_region 1005 region bc + +# apply nve integration to all particles that are inserted as single particles +fix integr all nve/sphere + +# output settings, include total thermal energy +compute rke all erotate/sphere +thermo_style custom step atoms ke c_rke vol #f_heattransfer +thermo 1000 +thermo_modify lost ignore norm no +compute_modify thermo_temp dynamic yes + +#insert the first particles +run 1 +dump dmp all custom 1000 post/dump.liggghts_init id type x y z ix iy iz vx vy vz fx fy fz omegax omegay omegaz radius #f_heattransfer[0] f_heatFlux[0] + +run 150000 + +write_restart post/restart/liggghts.restart + diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/DEM/in.liggghts_run b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/DEM/in.liggghts_run new file mode 100644 index 0000000..c2bf2c6 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/DEM/in.liggghts_run @@ -0,0 +1,95 @@ +echo both +log ../DEM/log.liggghts +thermo_log ../DEM/post/thermo.txt + +####################################################### +# variables # +####################################################### +variable r0 equal 0.011 +####################################################### + +# read packed bed and calc convective heat transfer +atom_style granular +atom_modify map array +boundary m m m +newton off + +communicate single vel yes + +units si +processors 1 1 2 + +# read the restart file +read_restart ../DEM/post/restart/liggghts.restart + +neighbor ${r0} bin +neigh_modify delay 0 binsize 0.01 + + +# Material properties required for granular pair styles + +fix m1 all property/global youngsModulus peratomtype 5.e6 +fix m2 all property/global poissonsRatio peratomtype 0.45 +fix m3 all property/global coefficientRestitution peratomtypepair 1 0.3 +fix m4 all property/global coefficientFriction peratomtypepair 1 0.5 + +# pair style +pair_style gran model hertz tangential history +pair_coeff * * + +# timestep, gravity +timestep 0.00001 +fix gravi all gravity 9.81 vector 0. 0. -1. + +# walls +fix xwalls1 all wall/gran model hertz tangential history primitive type 1 xplane 0.0 +fix xwalls2 all wall/gran model hertz tangential history primitive type 1 xplane 0.1 +fix ywalls1 all wall/gran model hertz tangential history primitive type 1 yplane 0.0 +fix ywalls2 all wall/gran model hertz tangential history primitive type 1 yplane 0.1 +fix zwalls1 all wall/gran model hertz tangential history primitive type 1 zplane 0.0 +fix zwalls2 all wall/gran model hertz tangential history primitive type 1 zplane 1.1 + +# cfd coupling +fix cfd all couple/cfd couple_every 100 mpi +fix cfd2 all couple/cfd/force + + +# heat transfer +fix ftco all property/global thermalConductivity peratomtype 5. # lambda in [W/(K*m)] +fix ftca all property/global thermalCapacity peratomtype 0.1 # cp in [J/(kg*K)] +fix heattransfer all heat/gran initial_temperature 999 ##temperature not relevant - will be overwritten by ParScale + +#Option 1: cool with implicit coupling +#fix cfd3 all couple/cfd/convectiveImpl #this is an IMPLICIT coupling + +#Option 2: cool with explicit setting of flux +fix cfd3 all couple/cfd/convection T0 0 #Temperature is irrelevant, so set to 0 +fix heatTransCoeff all property/atom heatTransCoeff scalar yes no no 0 #NOT USED, but pulled from ParScale by default, so need to provide something here! +fix heatFluid all property/atom heatFluid scalar yes no no 0 #NOT USED, but pulled from ParScale by default, so need to provide something here! + +# set particle temperature for the bed +run 0 +region total block INF INF INF INF INF INF units box +set region total property/atom Temp 600. + +# apply nve integration to all particles that are inserted as single particles +fix integr all nve/sphere + +#------------------------------Parscale Coupling_pascal----------------------------------------------- + +fix coupling_pascal all couple/pascal reneighbor_at_least_every 1 couple_every 1 +fix heatAv all property/atom heatAv scalar no yes no none #average temperature +fix TempMin all property/atom TempMin scalar no yes no none #minimum particle + +#----------------------------------------------------------------------------------------------------- + +# output settings, include total thermal energy +compute rke all erotate/sphere +thermo_style custom step atoms ke c_rke vol +thermo 1000 +thermo_modify lost ignore norm no +compute_modify thermo_temp dynamic yes + +dump dmp all custom 20000 ../DEM/post/dump*.liggghts_run id type x y z ix iy iz vx vy vz fx fy fz omegax omegay omegaz radius f_Temp[0] f_heatFlux[0] #f_speciesC[0] f_speciesCFlux[0] + +run 1 diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/DEM/post/restart/.gitignore b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/DEM/post/restart/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/cleanCase.sh b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/cleanCase.sh new file mode 100755 index 0000000..fc9925f --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/cleanCase.sh @@ -0,0 +1,71 @@ +#!/bin/bash + +#===================================================================# +# allrun script for testcase as part of test routine +# run settlingTest CFD part +# Christoph Goniva - Feb. 2011 +#===================================================================# + +#- source CFDEM env vars +. ~/.bashrc + +#--------------------------------------------------------------------------------# +#- define variables +casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" +#--------------------------------------------------------------------------------# + + + +#- clean up case +echo "deleting data at: $casePath ?" +#read +rm -r $casePath/*.e* +rm -r $casePath/*.o* +rm -r $casePath/log* +rm -r $casePath/CFD/0.0* +rm -r $casePath/CFD/log.* +rm -r $casePath/CFD/averageProps +rm -r $casePath/CFD/*.OpenFOAM +rm -r $casePath/CFD/*.restart* +rm -r $casePath/CFD/clockData +rm -r $casePath/CFD/*.dat +rm -r $casePath/CFD/*.profile +rm -r $casePath/CFD/octave/*.dat +rm -r $casePath/CFD/octave/*.eps +rm -r $casePath/CFD/octave/octave-workspace +rm -r $casePath/CFD/processor* +rm -r $casePath/CFD/VTK +rm -r $casePath/CFD/volAvU +rm -r $casePath/CFD/couplingFiles +rm -r $casePath/CFD/particles +rm -r $casePath/CFD/probe* +rm -r $casePath/CFD/postProcess* +rm -r $casePath/CFD/particleProbes +rm -r $casePath/CFD/*Restart* +rm -r $casePath/CFD/*restart* +rm -r $casePath/CFD/fluidFlowStats.res +rm -r $casePath/CFD/constant/polyMesh/*.gz +rm -r $casePath/CFD/constant/polyMesh/faces +rm -r $casePath/CFD/constant/polyMesh/neighbour +rm -r $casePath/CFD/constant/polyMesh/owner +rm -r $casePath/CFD/constant/polyMesh/points +rm -r $casePath/CFD/constant/polyMesh/boundary +rm -r $casePath/CFD/constant/polyMesh/sets +rm -r $casePath/CFD/processor* +rm -r $casePath/DEM/postParticles/* +rm -r $casePath/DEM/postGlobal/* +rm -r $casePath/DEM/post/*.* +rm -r $casePath/DEM/post/restart/*.* +rm -r $casePath/DEM/log.* +rm -r $casePath/DEM/*Restart* +rm -r $casePath/DEM/*restart* + +rm -r $casePath/CFD/pascal/0.* +rm -r $casePath/CFD/pascal/1.* +rm -r $casePath/CFD/pascal/2.* +rm -r $casePath/CFD/codeInfo.* +rm -r $casePath/CFD/*.dat + +echo "done" + + diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/parCFDDEMrun.sh b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/parCFDDEMrun.sh new file mode 100755 index 0000000..6f12819 --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/parCFDDEMrun.sh @@ -0,0 +1,94 @@ +#!/bin/bash + +#===================================================================# +# allrun script for testcase as part of test routine +# run settlingTest CFD part +# Christoph Goniva - May. 2011 +#===================================================================# + +#- source CFDEM env vars +. ~/.bashrc + +#- include functions +source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh + +#--------------------------------------------------------------------------------# +#- define variables +casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" +logpath=$casePath +headerText="run_parallel_cfdemSolverPisoSTM_packedBedTempParScale_CFDDEM" +logfileName="log_$headerText" +solverName="cfdemSolverPisoSTM" +nrProcs="2" +machineFileName="none" # yourMachinefileName | none +debugMode="off" # on | off| strict +testHarnessPath="$CFDEM_TEST_HARNESS_PATH" +runOctave="true" +postproc="false" +cleanup="true" +#--------------------------------------------------------------------------------# + +#- call function to run a parallel CFD-DEM case +parCFDDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $machineFileName $debugMode + +#------------------------------# +if [ $runOctave == "true" ] + then + + #- change path + cd octave + + #- rmove old graph + rm *.png + + #- run octave + octave totalPressureDropAndNusselt.m + + #- show plots + eog cfdemSolverPisoSTM_Nusselt.png & + eog cfdemSolverPisoSTM_pressureDrop.png + #------------------------------# + + #- copy log file to test harness + cp ../../$logfileName $testHarnessPath + cp cfdemSolverPisoSTM_Nusselt.png $testHarnessPath + cp cfdemSolverPisoSTM_pressureDrop.png $testHarnessPath + +fi + +#-------------------------------------------------------# +if [ $postproc == "true" ] + then + + #- keep terminal open (if started in new terminal) + echo "simulation finished? ...press enter to proceed" + read + + #- get VTK data from liggghts dump file + cd $casePath/DEM/post + python -i $CFDEM_LPP_DIR/lpp.py dump.liggghts_run + + #- get VTK data from CFD sim + cd $casePath/CFD + foamToVTK #- serial run of foamToVTK + #source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh #- include functions + #pseudoParallelRun "foamToVTK" $nrPostProcProcessors #- pseudo parallel run of foamToVTK + + #- start paraview + paraview + + #- keep terminal open (if started in new terminal) + echo "...press enter to clean up case" + echo "press Ctr+C to keep data" + read +fi + +#- clean up case +if [ $cleanup == "true" ] + then + #- clean up case + keepDEMrestart="false" + cleanCFDEMcase $casePath/CFD $keepDEMrestart +fi + + diff --git a/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/parDEMrun.sh b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/parDEMrun.sh new file mode 100755 index 0000000..660b45a --- /dev/null +++ b/tutorials/cfdemSolverPisoSTM/packedBedTempParScale/parDEMrun.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +#===================================================================# +# DEMrun script for ErgunTestMPI testcase +# init ErgunTestMPI +# Daniel Queteschiner - June 2014 +#===================================================================# + +#- source CFDEM env vars +. ~/.bashrc + +#- include functions +source $CFDEM_SRC_DIR/lagrangian/cfdemParticle/etc/functions.sh + +#--------------------------------------------------------------------------------# +#- define variables +casePath="$(dirname "$(readlink -f ${BASH_SOURCE[0]})")" +logpath="$casePath" +headerText="run_liggghts_init_DEM" +logfileName="log_$headerText" +solverName="in.liggghts_init" +nrProcs="2" +machineFileName="none" # yourMachinefileName | none +#--------------------------------------------------------------------------------# + +#- call function to run DEM case +parDEMrun $logpath $logfileName $casePath $headerText $solverName $nrProcs $machineFileName + diff --git a/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/0/nut b/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/0/nut index dcd36c8..bc53fb9 100644 --- a/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/0/nut +++ b/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/0/nut @@ -23,7 +23,7 @@ boundaryField { wall { - type nutWallFunction; + type nutkWallFunction; Cmu 0.09; kappa 0.41; E 9.8; diff --git a/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/constant/turbulenceProperties b/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/constant/turbulenceProperties index dba43a7..a3dfd6b 100644 --- a/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/constant/turbulenceProperties +++ b/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/constant/turbulenceProperties @@ -15,8 +15,17 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -//simulationType RASModel;//LESModel; //OFversion24x -simulationType laminar; //OFversion30x +//simulationType RASModel;//OFversion24x +simulationType RAS;//OFversion30x + +RAS +{ + RASModel kEpsilon; + + turbulence on; + + printCoeffs on; +} // ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/octave/totalPressureDropAndNusselt.m b/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/octave/totalPressureDropAndNusselt.m index 5471450..6aed5f0 100644 --- a/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/octave/totalPressureDropAndNusselt.m +++ b/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/octave/totalPressureDropAndNusselt.m @@ -48,7 +48,7 @@ title("Ergun pressure drop") legend("analytical - Ergun","simulation") %print('cfdemSolverPiso_settlingTest.eps','-deps2') -print -color "cfdemSolverPisoScalar_pressureDrop.eps" +print -color "cfdemSolverPisoScalar_pressureDrop.png" %*********************************************************************% % heat transfer @@ -120,7 +120,7 @@ title("Nusselt nr") legend("analytical - ","simulation") %print('cfdemSolverPisoScalar_NusseltNr.eps','-deps2') -print -color "cfdemSolverPisoScalar_Nusselt.eps" +print -color "cfdemSolverPisoScalar_Nusselt.png" figure(3) plot(t_sim,Tin_sim,t_sim,Tout_sim) @@ -128,5 +128,5 @@ title("inlet/outlet temperature") legend("inlet","outlet") %print('cfdemSolverPisoScalar_NusseltNr.eps','-deps2') -print -color "cfdemSolverPisoScalar_temperatures.eps" +print -color "cfdemSolverPisoScalar_temperatures.png" diff --git a/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/system/controlDict b/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/system/controlDict index 1b90a56..1995970 100644 --- a/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/system/controlDict +++ b/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/system/controlDict @@ -70,7 +70,7 @@ functions ); // Fields to be probed - fields ( p T); + fields ( p T ); // Write at same frequency as fields outputControl timeStep;//outputTime; diff --git a/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/system/fvSolution b/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/system/fvSolution index 0c017ca..30a7cac 100644 --- a/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/system/fvSolution +++ b/tutorials/cfdemSolverPisoScalar/packedBedTemp/CFD/system/fvSolution @@ -41,6 +41,11 @@ solvers relTol 0; } + UFinal + { + $U + } + k { solver PBiCG; @@ -72,7 +77,8 @@ solvers tolerance 1e-05; relTol 0; } - T + + "(T|C)" { solver PBiCG; preconditioner DILU; @@ -89,5 +95,23 @@ PISO pRefValue 0; } +PIMPLE +{ + nOuterCorrectors 1; +} +relaxationFactors +{ + fields + { + p 1.0; + } + equations + { + "U.*" 1.0; + "k.*" 1.; + "epsilon.*" 1.; + } +} + // ************************************************************************* // diff --git a/tutorials/cfdemSolverPisoScalar/packedBedTemp/DEM/in.liggghts_init b/tutorials/cfdemSolverPisoScalar/packedBedTemp/DEM/in.liggghts_init index 10151d6..78cb9b6 100644 --- a/tutorials/cfdemSolverPisoScalar/packedBedTemp/DEM/in.liggghts_init +++ b/tutorials/cfdemSolverPisoScalar/packedBedTemp/DEM/in.liggghts_init @@ -1,8 +1,6 @@ echo both log ../DEM/log.liggghts -# Particle packing by insertion and successive growing of particles - atom_style granular atom_modify map array boundary m m m @@ -44,8 +42,8 @@ fix zwalls2 all wall/gran model hertz tangential history primitive type 1 zp fix gravi all gravity 9.81 vector 0.0 0.0 -1.0 # heat transfer -fix ftco all property/global thermalConductivity peratomtype 5. -fix ftca all property/global thermalCapacity peratomtype 10. +fix ftco all property/global thermalConductivity peratomtype 5. # lambda in [W/(K*m)] +fix ftca all property/global thermalCapacity peratomtype 10. # cp in [J/(kg*K)] fix heattransfer all heat/gran initial_temperature 263. # particle distributions and insertion diff --git a/tutorials/cfdemSolverPisoScalar/packedBedTemp/DEM/in.liggghts_run b/tutorials/cfdemSolverPisoScalar/packedBedTemp/DEM/in.liggghts_run index 8a69d82..3a8c668 100644 --- a/tutorials/cfdemSolverPisoScalar/packedBedTemp/DEM/in.liggghts_run +++ b/tutorials/cfdemSolverPisoScalar/packedBedTemp/DEM/in.liggghts_run @@ -49,10 +49,15 @@ fix ywalls2 all wall/gran model hertz tangential history primitive type 1 yp fix zwalls1 all wall/gran model hertz tangential history primitive type 1 zplane 0.0 fix zwalls2 all wall/gran model hertz tangential history primitive type 1 zplane 1.1 +# cfd coupling +fix cfd all couple/cfd couple_every 100 mpi +fix cfd2 all couple/cfd/force + # heat transfer fix ftco all property/global thermalConductivity peratomtype 5. # lambda in [W/(K*m)] fix ftca all property/global thermalCapacity peratomtype 0.1 # cp in [J/(kg*K)] +fix cfd3 all couple/cfd/convection T0 600 fix heattransfer all heat/gran initial_temperature 600. # set particle temperature for the bed @@ -60,13 +65,6 @@ run 0 region total block INF INF INF INF INF INF units box set region total property/atom Temp 600. -# cfd coupling -fix cfd all couple/cfd couple_every 100 mpi -fix cfd2 all couple/cfd/force - -# this one invokes heat transfer calculation, transfers per-particle temperature and adds convective heat flux to particles -fix cfd3 all couple/cfd/convection T0 600 - # apply nve integration to all particles that are inserted as single particles fix integr all nve/sphere @@ -77,6 +75,6 @@ thermo 1000 thermo_modify lost ignore norm no compute_modify thermo_temp dynamic yes -dump dmp all custom 100 ../DEM/post/dump.liggghts_run id type x y z ix iy iz vx vy vz fx fy fz omegax omegay omegaz radius f_Temp[0] f_heatFlux[0] +dump dmp all custom 20000 ../DEM/post/dump*.liggghts_run id type x y z ix iy iz vx vy vz fx fy fz omegax omegay omegaz radius f_Temp[0] f_heatFlux[0] run 0 diff --git a/tutorials/cfdemSolverPisoScalar/packedBedTemp/parCFDDEMrun.sh b/tutorials/cfdemSolverPisoScalar/packedBedTemp/parCFDDEMrun.sh index 244dc21..ca0bbc5 100644 --- a/tutorials/cfdemSolverPisoScalar/packedBedTemp/parCFDDEMrun.sh +++ b/tutorials/cfdemSolverPisoScalar/packedBedTemp/parCFDDEMrun.sh @@ -39,20 +39,20 @@ if [ $runOctave == "true" ] cd octave #- rmove old graph - rm *.eps + rm *.png #- run octave octave totalPressureDropAndNusselt.m #- show plots - evince cfdemSolverPisoScalar_Nusselt.eps & - evince cfdemSolverPisoScalar_pressureDrop.eps + eog cfdemSolverPisoScalar_Nusselt.png & + eog cfdemSolverPisoScalar_pressureDrop.png #------------------------------# #- copy log file to test harness cp ../../$logfileName $testHarnessPath - cp cfdemSolverPisoScalar_Nusselt.eps $testHarnessPath - cp cfdemSolverPisoScalar_pressureDrop.eps $testHarnessPath + cp cfdemSolverPisoScalar_Nusselt.png $testHarnessPath + cp cfdemSolverPisoScalar_pressureDrop.png $testHarnessPath fi @@ -86,18 +86,8 @@ fi #- clean up case if [ $cleanup == "true" ] then - echo "deleting data at: $casePath : \n" - source $WM_PROJECT_DIR/bin/tools/CleanFunctions - cd $casePath/CFD - cleanCase - rm -r $casePath/CFD/clockData - rm $casePath/DEM/post/*.* - #rm -r $casePath/DEM/post/restart/*.* - echo "done" - - #- preserve post directory - touch $casePath/DEM/post/.gitignore - touch $casePath/DEM/post/restart/.gitignore + keepDEMrestart="false" + cleanCFDEMcase $casePath/CFD $keepDEMrestart fi