Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tweak for Python config script. #508

Merged
merged 1 commit into from
Oct 11, 2020
Merged

Tweak for Python config script. #508

merged 1 commit into from
Oct 11, 2020

Conversation

jmansour
Copy link
Contributor

Yo JG. Can we fast track this one? It's just a tweak for Python config required for a machine I'm helping with.

Copy link
Member

@julesghub julesghub left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look good to me.

@jmansour jmansour merged commit a369589 into development Oct 11, 2020
@jmansour
Copy link
Contributor Author

Thanks JG!

@jmansour jmansour deleted the py_config branch October 11, 2020 03:56
julesghub added a commit that referenced this pull request Oct 26, 2020
commit 245ef71
Author: John Mansour <mansourjohn@gmail.com>
Date:   Wed Oct 21 05:46:10 2020 +1100

    Docker updates (#510)

    Docker updates:
    * Switch to ubuntu 20.04 base image
    * Some rework of multistage builds
    * Use repo osmesa as it now supports offscreen without xvfb.
    * Switch to petsc 3.14
    * Switch to mpich 3.3.2
    * Switch to development version h5py
    * Add jupyterlab
    * Update CHANGES.md
    * Remove old docker files.

commit 41ded25
Merge: a369589 1d93888
Author: Julian Giordani <julesghub@users.noreply.github.com>
Date:   Tue Oct 20 16:25:30 2020 +1100

    Merge pull request #506 from underworldcode/master_merge

    Master merge

commit a369589
Merge: 29b2dec 0393486
Author: John Mansour <mansourjohn@gmail.com>
Date:   Sun Oct 11 14:39:18 2020 +1100

    Merge pull request #508 from underworldcode/py_config

    Tweak for Python config script.

commit 0393486
Author: jmansour <mansourjohn@gmail.com>
Date:   Sun Oct 11 13:33:35 2020 +1100

    Tweak for Python config script.

commit 1d93888
Merge: 29b2dec fd5847c
Author: jmansour <mansourjohn@gmail.com>
Date:   Wed Sep 23 13:09:53 2020 +1000

    Merge branch 'master' into master_merge

commit 29b2dec
Merge: f4cc104 8f709b5
Author: John Mansour <mansourjohn@gmail.com>
Date:   Tue Sep 22 15:01:30 2020 +1000

    Merge pull request #498 from underworldcode/system-gauss-arg

    Adding argument 'gauss_swarm' to all fem system objects.

commit 8f709b5
Merge: ac435a7 f4cc104
Author: John Mansour <mansourjohn@gmail.com>
Date:   Tue Sep 22 15:00:01 2020 +1000

    Merge branch 'development' into system-gauss-arg

commit ac435a7
Author: jmansour <mansourjohn@gmail.com>
Date:   Tue Sep 22 14:57:05 2020 +1000

    * added test
    * added count function for test
    * some style changes
    * fix preconditioner bug.

commit fd5847c
Author: julian <house.of.jules@gmail.com>
Date:   Fri Aug 28 12:02:49 2020 +1000

    Update minor version numbers and CHANGES.md

commit e413039
Author: julian <house.of.jules@gmail.com>
Date:   Fri Aug 28 11:57:24 2020 +1000

    Updating UWGeodynamics' docs in Dockerfile

commit d44e7cf
Author: julian <house.of.jules@gmail.com>
Date:   Fri Jul 31 10:23:16 2020 +1000

    Adding argument 'gauss_swarm' to all fem system objects.

    If provided the 'gauss_swarm' will be used for numerical
    integration rather than a default gauss integration swarm that is
    automatically generated and dependent on the element order of the mesh.

    NB: if a voronoi_swarm is defined it OVERRIDES this gauss_swarm as the
    preferred integration swarm (quadrature method).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants