Skip to content

Commit

Permalink
build fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
montyvesselinov committed Feb 29, 2016
1 parent fb362c1 commit 4680ca7
Show file tree
Hide file tree
Showing 34 changed files with 1,442 additions and 1,023 deletions.
6 changes: 5 additions & 1 deletion .travis.yml
Expand Up @@ -3,9 +3,13 @@ os:
- osx
- linux
julia:
- nightly
- 0.4
- 0.5
notifications:
email: false
script:
- if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- julia -e 'Pkg.clone(pwd()); ENV["PYTHON"]=""; import Conda; Conda.add("yaml"); Pkg.build("Mads"); Pkg.test("Mads")';
- julia -e 'Pkg.clone(pwd()); ENV["PYTHON"]=""; import Conda; Conda.add("yaml"); Pkg.build("Mads"); Pkg.test("Mads")';
after_success:
- julia -e 'cd(Pkg.dir("Mads")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())';
22 changes: 22 additions & 0 deletions EXAMPLES.md
@@ -0,0 +1,22 @@
MADS examples
=============

In Julia REPL, do the following commands:

`import Mads`

To explore getting-started instructions, execute:

`Mads.help()`

There are various examples located in the `examples` directory of the `Mads` repository.

For example, execute

`include(Mads.madsdir * "/../examples/contamination/analysis.jl")`

to perform various analyses related to contaminant transport, or execute

`include(Mads.madsdir * "/../examples/bigdt/bigdt.jl")`

to perform BIG-DT analysis.
45 changes: 45 additions & 0 deletions INSTALLATION.md
@@ -0,0 +1,45 @@
Installation
============

After starting Julia, execute:

```
Pkg.add("Mads")
```

Installation of MADS behind a firewall
------------------------------

Julia uses git for package management. Add in the `.gitconfig` file in your home directory:

```
[url "https://"]
insteadOf = git://
```

or execute:

```
git config --global url."https://".insteadOf git://
```

Set proxies:

```
export ftp_proxy=http://proxyout.<your_site>:8080
export rsync_proxy=http://proxyout.<your_site>:8080
export http_proxy=http://proxyout.<your_site>:8080
export https_proxy=http://proxyout.<your_site>:8080
export no_proxy=.<your_site>
```

For example, if you are doing this at LANL, you will need to execute the
following lines in your bash command-line environment:

```
export ftp_proxy=http://proxyout.lanl.gov:8080
export rsync_proxy=http://proxyout.lanl.gov:8080
export http_proxy=http://proxyout.lanl.gov:8080
export https_proxy=http://proxyout.lanl.gov:8080
export no_proxy=.lanl.gov
```
10 changes: 9 additions & 1 deletion MADS.md
Expand Up @@ -26,4 +26,12 @@ For additional information:
* git:
- `git clone git@github.com:madsjulia/Mads.jl`
- `git clone git@gitlab.com:mads/Mads.jl`
* email: [mads@lanl.gov](mads@lanl.gov)
* email: [mads@lanl.gov](mads@lanl.gov)

[![Mads](http://pkg.julialang.org/badges/Mads_0.4.svg)](http://pkg.julialang.org/?pkg=Mads&ver=0.4) [![Mads](http://pkg.julialang.org/badges/Mads_0.5.svg)](http://pkg.julialang.org/?pkg=Mads&ver=0.5)

[![Build Status](https://travis-ci.org/madsjulia/Mads.jl.svg?branch=master)](https://travis-ci.org/madsjulia/Mads.jl)

[![Coverage Status](https://coveralls.io/repos/madsjulia/Mads.jl/badge.svg?branch=master)](https://coveralls.io/r/madsjulia/Mads.jl?branch=master)


4 changes: 3 additions & 1 deletion README.md
@@ -1,10 +1,12 @@
MADS (Model Analysis & Decision Support)
=======================================

[![Mads](http://pkg.julialang.org/badges/Mads_0.4.svg)](http://pkg.julialang.org/?pkg=Mads&ver=0.4)
[![Mads](http://pkg.julialang.org/badges/Mads_0.4.svg)](http://pkg.julialang.org/?pkg=Mads&ver=0.4) [![Mads](http://pkg.julialang.org/badges/Mads_0.5.svg)](http://pkg.julialang.org/?pkg=Mads&ver=0.5)

[![Build Status](https://travis-ci.org/madsjulia/Mads.jl.svg?branch=master)](https://travis-ci.org/madsjulia/Mads.jl)

[![Coverage Status](https://coveralls.io/repos/madsjulia/Mads.jl/badge.svg?branch=master)](https://coveralls.io/r/madsjulia/Mads.jl?branch=master)

MADS is an open-source [Julia](http://julialang.org) code designed as an integrated high-performance computational framework performing a wide range of model-based analyses:

* Sensitivity Analysis
Expand Down
4 changes: 3 additions & 1 deletion deps/build.jl
@@ -1,4 +1,6 @@
info("Python YAML ...")
import Conda
ENV["PYTHON"]=""
Conda.add("yaml")
Conda.add("yaml")
info("Rebuild PyCall ...")
Pkg.build("PyCall")

0 comments on commit 4680ca7

Please sign in to comment.