Merge pull request #13 from NCAR/lipscomb_leguy/cism21_cleanup2

Various pre-release changes

This PR includes a number of loosely connected changes in advance of the CISM 2.1 release. Among the changes are:

* Reorganization and updates in the test directories. The 'higher-order' directory was removed, and its subdirectories moved up to sit directly under 'tests'. ISMIP-HOM C tests now run in parallel with the more accurate which_ho_babc = 8. A MISMIP directory was added, and MISMIP3d and MISMIP+ tests were updated. A bug in the Halfar config file was fixed.

* A bug was fixed to restore exact restart for ice temperatures.

* The gradient_margin options were revised and renamed.  The new default option 1 is a hybrid between land- and marine-margin gradients, with answer changes compared to the old option 1 (and roundoff-level changes compared to the old option 3, which was removed).

ChangeLog

@@ -17,7 +17,7 @@ CISM version 2.0, which originated from Glimmer-CISM and Glimmer, has a number o
 * new and updated documentation
 
 More information including full documentation of the code can be found at:
-http://oceans11.lanl.gov/cism/
+https://github.com/CISM/cism-documentation
 
 CISM version 2.0 will be hosted at the CISM Github organization:
 https://github.com/cism/cism

NEWS

@@ -21,7 +21,7 @@ relative to these previous codes:
 * new and updated documentation
 
 More information including full documentation of the code can be found at:
-http://oceans11.lanl.gov/cism/index.html
+https://github.com/CISM/cism-documentation
 
 The original Glimmer-CISM and Glimmer codes can be found at the Glimmer-CISM Github organization:
 https://github.com/glimmer-cism

README

@@ -4,7 +4,7 @@ CISM README file:
 
 CISM is a land ice model designed to be used as part of an earth-system model 
 or as a stand-alone model. Full documentation can be found at:
-http://oceans11.lanl.gov/cism/documentation.html
+https://github.com/CISM/cism-documentation
 
 Licensing:
 =========
@@ -52,7 +52,7 @@ Building / Installing CISM:
 ===========================
 
 For detailed instructions on how to install and build CISM, please see Chapter 2 of the users
-guide (available at: http://oceans11.lanl.gov/cism/documentation.html)
+guide (available at: https://github.com/CISM/cism-documentation)
 
 
 last updated: 10/21/2014

builds/hopper-gnu-felix/hopper-gnu-bisicles-cmake → builds/cori-gnu-felix/cori-gnu-bisicles-cmake

@@ -1,14 +1,14 @@
-# run this script by typing: source hopper-gnu-bisicles-cmake
+# run this script by typing: source cori-gnu-bisicles-cmake
 # After thus script completes, type: make -j 8
 # If rebuilding, type 'make clean' before running 'make -j 8'
 
 # This cmake configuration script builds cism_driver
-# on hopper using the gnu compiler suite.  It no longer relies on a build
+# on cori using the gnu compiler suite.  It no longer relies on a build
 # of Trilinos, but does need a BISICLES build located in BISICLES_INTERFACE_DIR
 # (currently set to /global/u2/d/dmartin/BISICLES/code/interface)
 
 
-# This script should be run from the builds/hopper-pgi subdirectory
+# This script should be run from the builds/cori-pgi subdirectory
 # of the main seacism repository (reflected in the two instances
 # of "../.." below).
 
@@ -24,10 +24,10 @@
 # CISM_USE_GPTL_INSTRUMENTATION -- ON by default, set to OFF to not use GPTL instrumentation.
 # CISM_COUPLED -- OFF by default, set to ON to build with CESM.
 echo
-echo Run this script by typing: source hopper-gnu-bisicles-cmake
+echo Run this script by typing: source cori-gnu-bisicles-cmake
 echo
 
-#echo Warning: Python problem.  After the last hopper system updates 1/28/13, in order to run simple_glide
+#echo Warning: Python problem.  After the last cori system updates 1/28/13, in order to run simple_glide
 #echo or simple_bisicles, you need to replace the python/2.7.3 module with the python/2.7.1 module.
 #echo The easiest way to do this: In your .cshrc.ext or .bashrc.ext add the lines:
 #echo module unload python