Merge pull request #14 from GEOS-ESM/feature/mathomp4/readme-update

Updates to README and gitignore

.gitignore

@@ -3,6 +3,6 @@
 /@modules/
 /@env/
 /BUILD/
-/build/
-/install/
+/build*/
+/install*/
 parallel_build.o*

README.md

@@ -1,15 +1,32 @@
 # GEOS ADAS Fixture
 
-## How to build GEOS ADAS on Discover
+## How to build GEOS ADAS
 
 ### Preliminary Steps
 
 #### Load Build Modules
 
 In your `.bashrc` or `.tcshrc` or other rc file add a line:
+
+##### NCCS (SLES11)
+
 ```
 module use -a /discover/nobackup/projects/gmao/sit/modulefiles-SLES11
 ```
+
+##### NAS
+```
+module use -a /nobackup/gmao_SIteam/modulefiles
+```
+
+##### GMAO Desktops
+On the GMAO desktops, the SI Team modulefiles should automatically be
+part of running `module avail` but if not, they are in:
+
+```
+module use -a /ford1/share/gmao_SIteam/modulefiles
+```
+
 Also do this in any interactive window you have. This allows you to get module files needed to correctly checkout and build the model.
 
 Now load the `GEOSenv` module:

parallel_build.csh

@@ -331,7 +331,7 @@ endif
 #--------------------------
 source $ESMADIR/@env/g5_modules
 setenv Pbuild_source_directory  $ESMADIR
-if ($debug) then
+if ($?debug) then
    setenv Pbuild_build_directory   $ESMADIR/build-Debug
    setenv Pbuild_install_directory $ESMADIR/install-Debug
 else
@@ -543,15 +543,18 @@ build:
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #                             BUILD SYSTEM
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-chdir $Pbuild_build_directory
-
-setenv ARCH `uname -s`
 
 if ( $cleanFLAG == "realclean" ) then
    rm -rf $Pbuild_build_directory
+   rm -rf $Pbuild_install_directory
+
    mkdir -p $Pbuild_build_directory
 endif
 
+chdir $Pbuild_build_directory
+
+setenv ARCH `uname -s`
+
 #=================================================
 # create $BUILD_LOG_DIR, plus LOG and info files
 #=================================================