lanl · shane-mckinney · Feb 14, 2019 · Mar 14, 2019 · Mar 14, 2019 · Mar 15, 2019
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,5 @@
 *.mod
 debug/*
 build/*
-src/dated.f
 *.pyc
 *DS_Store
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,34 @@
+language: c
+sudo: required
+
+os:
+  - linux
+  - osx
+
+compiler:
+  - gcc
+
+branches:
+  only:
+    - master
+
+before_install:
+  - |
+    if [ $TRAVIS_OS_NAME = linux ]; then
+      sudo apt-get purge cmake
+      sudo apt-key update
+      sudo apt-get update
+      sudo apt-get -y -f install gfortran python3 cmake
+    fi
+  - |
+    if [ $TRAVIS_OS_NAME = osx ]; then
+      brew update && brew install gcc
+    fi
+
+script:
+  - cd src
+  - make all
+  - make debug
+
+after_success:
+  - echo FEHM compilation successful
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,31 +1,18 @@
+# LICENSE
+
 This software is open source software available under the BSD-3 license.
 
-Copyright (c) 2018, Los Alamos National Security, LLC
-All rights reserved.
-
-Copyright 2018. Los Alamos National Security, LLC. This software was produced under U.S. Government contract DE-AC52-06NA25396 for Los Alamos National Laboratory (LANL), which is operated by Los Alamos National Security, LLC for the U.S. Department of Energy. The U.S. Government has rights to use, reproduce, and distribute this software.  NEITHER THE GOVERNMENT NOR LOS ALAMOS NATIONAL SECURITY, LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY LIABILITY FOR THE USE OF THIS SOFTWARE.  If software is modified to produce derivative works, such modified software should be clearly marked, so as not to confuse it with the version available from LANL.
-
-Additionally, redistribution and use in source and binary forms, with or without modification, 
-are permitted provided that the following conditions are met:
 
+Copyright © 2018. This program was produced under U.S. Government contract 89233218CNA000001 for Los Alamos National Laboratory (LANL), which is operated by Triad National Security, LLC for the U.S. Department of Energy/National Nuclear Security Administration. All rights in the program are reserved by Triad National Security, LLC, and the U.S. Department of Energy/National Nuclear Security Administration. The Government is granted for itself and others acting on its behalf a nonexclusive, paid-up, irrevocable worldwide license in this material to reproduce, prepare derivative works, distribute copies to the public, perform publicly and display publicly, and to permit others to do so. This is open source software; you can redistribute it and/or modify it under the terms of the BSD-3 License. If software is modified to produce derivative works, such modified software should be clearly marked, so as not to confuse it with the version available from LANL.
 
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
+Additionally, redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
-2. Redistributions in binary form must reproduce the above copyright notice, 
-this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
 
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 
-3. Neither the name of Los Alamos National Security, LLC, Los Alamos National Laboratory, LANL, the U.S. Government, 
-nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
+3. Neither the name of Triad National Security, LLC, Los Alamos National Laboratory, LANL, the U.S. Government, nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY LOS ALAMOS NATIONAL SECURITY, LLC AND CONTRIBUTORS "AS IS" 
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
-LOS ALAMOS NATIONAL SECURITY, LLC OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+
+THIS SOFTWARE IS PROVIDED BY TRIAD NATIONAL SECURITY, LLC AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL TRIAD NATIONAL SECURITY, LLC OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/README.md b/README.md
@@ -2,9 +2,12 @@
 **LANL Software: LA-CC-2012-083  No. C13022**
 **LANL Documents: LA-UR-12-24493**
 
+[![Build Status](https://travis-ci.org/lanl/FEHM.svg?branch=master)](https://travis-ci.org/lanl/FEHM)
+
 The numerical background of the FEHM computer code can be traced to the early 1970s when it was used to simulate geothermal and hot dry rock reservoirs. The primary use over a number of years was to assist in the understanding of flow fields and mass transport in the saturated and unsaturated zones below the potential Yucca Mountain repository. Today FEHM is used to simulate groundwater and contaminant flow and transport in deep and shallow, fractured and un-fractured porous media throughout the US DOE complex. FEHM has proved to be a valuable asset on a variety of projects of national interest including Environmental Remediation of the Nevada Test Site, the LANL Groundwater Protection Program, geologic CO2 sequestration, Enhanced Geothermal Energy (EGS) programs, Oil and Gas production, Nuclear Waste Isolation, and Arctic Permafrost. Subsurface physics has ranged from single fluid/single phase fluid flow when simulating basin scale groundwater aquifers to complex multifluid/ multi-phase fluid flow that includes phase change with boiling and condensing in applications such as unsaturated zone surrounding nuclear waste storage facility or leakage of CO2/brine through faults or wellbores. The numerical method used in FEHM is the control volume method (CV) for fluid flow and heat transfer equations which allows FEHM to exactly enforce energy/mass conservation; while an option is available to use the finite element (FE) method for displacement equations to obtain more accurate stress calculations. In addition to these standard methods, an option to use FE for flow is available, as well as a simple Finite Difference scheme.
 
-[FEHM Home at fehm.lanl.gov](https://fehm.lanl.gov) • [Fehmpytests](http://lanl.github.io/FEHM/fehmpytests/html/index.html)
+
+#### [FEHM Homepage](https://fehm.lanl.gov) • [FEHM Documentation](http://lanl.github.io/FEHM/) • [Fehmpytests Documentation](http://lanl.github.io/FEHM/fehmpytests/html/index.html)
 
 
 ## License ##

diff --git a/docs/.nojekyll b/docs/.nojekyll
diff --git a/docs/fehmpytests/.DS_Store b/docs/fehmpytests/.DS_Store
diff --git a/docs/fehmpytests/doctrees/creating_new_test_cases.doctree b/docs/fehmpytests/doctrees/creating_new_test_cases.doctree
diff --git a/docs/fehmpytests/doctrees/environment.pickle b/docs/fehmpytests/doctrees/environment.pickle
diff --git a/docs/fehmpytests/doctrees/index.doctree b/docs/fehmpytests/doctrees/index.doctree
diff --git a/docs/fehmpytests/doctrees/installation.doctree b/docs/fehmpytests/doctrees/installation.doctree
diff --git a/docs/fehmpytests/doctrees/introduction.doctree b/docs/fehmpytests/doctrees/introduction.doctree
diff --git a/docs/fehmpytests/doctrees/test_case_desc.doctree b/docs/fehmpytests/doctrees/test_case_desc.doctree
diff --git a/docs/fehmpytests/doctrees/testing_fehm.doctree b/docs/fehmpytests/doctrees/testing_fehm.doctree
diff --git a/docs/fehmpytests/html/.buildinfo b/docs/fehmpytests/html/.buildinfo
diff --git a/docs/fehmpytests/html/_sources/creating_new_test_cases.rst.txt b/docs/fehmpytests/html/_sources/creating_new_test_cases.rst.txt
diff --git a/docs/fehmpytests/html/_sources/index.rst.txt b/docs/fehmpytests/html/_sources/index.rst.txt
diff --git a/docs/fehmpytests/html/_sources/installation.rst.txt b/docs/fehmpytests/html/_sources/installation.rst.txt
diff --git a/docs/fehmpytests/html/_sources/introduction.rst.txt b/docs/fehmpytests/html/_sources/introduction.rst.txt
diff --git a/docs/fehmpytests/html/_sources/test_case_desc.rst.txt b/docs/fehmpytests/html/_sources/test_case_desc.rst.txt
diff --git a/docs/fehmpytests/html/_sources/testing_fehm.rst.txt b/docs/fehmpytests/html/_sources/testing_fehm.rst.txt
diff --git a/docs/fehmpytests/html/_static/ajax-loader.gif b/docs/fehmpytests/html/_static/ajax-loader.gif