Commit 04824a5e authored by Michele Rosso's avatar Michele Rosso
Browse files

Merge branch 'master' of https://github.com/AMReX-Codes/MFIX-Exa

parents c9b78679 55968bc9

.github/workflows/build.yml

0 → 100644
+41 −0
Changes for .github/workflows/build.yml: 41 added lines, 0 removed lines.
Original line number Diff line number Diff line 
name: Build-and-Deploy



# Run this workflow every time a new commit pushed to your repository

on: push



jobs:

  # Set the job key. The key is displayed as the job name

  # when a job name is not provided

  publish:

    # Name the Job

    name: Build Sphinx manual HTML target

    # Set the type of machine to run on

    runs-on: ubuntu-latest



    steps:

      - name: Checkout

        uses: actions/checkout@v2



      - name: Install Doxygen

        run: sudo apt install doxygen



      - name: Install Sphinx

        run: pip install sphinx sphinx-rtd-theme



      - name: Checkout code

        uses: actions/checkout@v2



      - name: Build MFiX-Exa HTML manual

        run: make -C docs

        env:

          DEFAULT_BRANCH: main

          GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}



      - name: Deploy to GitHub Pages

        if: success()

        uses: crazy-max/ghaction-github-pages@v2

        with:

          target_branch: gh-pages

          build_dir: docs/webroot

        env:

          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.travis.yml

deleted100644 → 0
+0 −31
Changes for .travis.yml: 0 added lines, 31 removed lines.
Original line number Diff line number Diff line 
dist: xenial



language: generic



python:

  - 3.6



install:

  - python -m pip install --user sphinx sphinx-rtd-theme



script: bash ./build_and_deploy.sh



env:

  global:

  - COMMIT_AUTHOR_EMAIL: "jpblaschke@lbl.gov"



addons:

  apt:

    packages:

      - doxygen



deploy:

  provider: pages

  target-branch: gh-pages

  local-dir: docs/webroot

  skip-cleanup: true

  github-token: $GITHUB_TOKEN  # Set in travis-ci.org dashboard, marked secure

  keep-history: true

  verbose: true

  on:

    branch: master

docs/source/Inputs_Chapter.rst

+1 −1
Changes for docs/source/Inputs_Chapter.rst: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ keywords such as ``mfix``, ``amr``, ``geometry``, ``nodal_proj`` etc. 
.. toctree::

   :maxdepth: 1



   Units, mesh, geometry, species, fluid, DEM, regions, inital and boundary conditions <inputs/InputsProblemDefinition>

   Units, mesh, geometry, species, fluid, DEM, regions, initial and boundary conditions <inputs/InputsProblemDefinition>

   Particle drag <inputs/InputsDrag>

   inputs/InputsTimeStepping

   inputs/InputsInitialization

docs/source/eb/EBWalls.rst

+1 −1
Changes for docs/source/eb/EBWalls.rst: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ The :cpp:`mfix` class stores the following EB data: 


As discussed in the previous sub-section, the difference between

:cpp:`mfix::eb_levels` and :cpp:`mfix::particle_eb_levels` enables the user to

specify a modfied EB geometry for particles only. Whereas the fluid sees the EB

specify a modified EB geometry for particles only. Whereas the fluid sees the EB

geometry in :cpp:`mfix::eb_levels`. If no addition particle EB geometry is

specified (point 4 in the previous section), then

:cpp:`mfix::particle_eb_levels` points to :cpp:`mfix::eb_levels`.

docs/source/inputs/InputsDrag.rst

+1 −1
Changes for docs/source/inputs/InputsDrag.rst: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ With the variables defined as follows: 
     *    Mug     - gas laminar viscosity

     *    ROpg    - gas density * EP_g

     *    vrel    - magnitude of gas-solids relative velocity

     *    DPM     - particle diamater of solids phase M

     *    DPM     - particle diameter of solids phase M

     *    DPA     - average particle diameter

     *    PHIS    - solids volume fraction of solids phases

     *    fvelx   - x component of the fluid velocity at the particle position