Merge pull request #394 from ekluzek/fincleanup

Some final cleanup

.gitignore

@@ -65,10 +65,17 @@ clm.input_data_list.previous
 tools/mksurfdata_map/mksurfdata_map
 tools/mkprocdata_map/mkprocdata_map
 
+# mkmapdata output files
+tools/mkmapdata/PET*.RegridWeightGen.Log
+tools/mkmapdata/regrid.*.out
+tools/mkmapdata/regrid.*.err
+tools/mkmapdata/regrid.o*
+
 # build output
 *.o
 *.mod
 core.*
 *.gz
 *.log !run.log
 *.pyc
+Depends

Externals.cfg

@@ -8,29 +8,29 @@ required = True
 local_path = components/cism
 protocol = git
 repo_url = https://github.com/ESCOMP/cism-wrapper
-tag = release-v2.1.00
+tag = release-v2.1.01
 externals = Externals_CISM.cfg
 required = True
 
 [rtm]
 local_path = components/rtm
 protocol = git
 repo_url = https://github.com/ESCOMP/rtm
-tag = rtm1_0_66
+tag = release-cesm2.0.00
 required = True
 
 [mosart]
 local_path = components/mosart
 protocol = git
 repo_url = https://github.com/ESCOMP/mosart
-tag = mosart1_0_31
+tag = release-cesm2.0.00
 required = True
 
 [cime]
 local_path = cime
 protocol = git
 repo_url = https://github.com/ESMCI/cime
-hash = a67dceae95567cc7529c4cfed153017f4b65b210
+tag = cime_cesm2_0_rel_03
 required = True
 
 [externals_description]

Externals_CLM.cfg

@@ -9,7 +9,7 @@ required = True
 local_path = tools/PTCLM
 protocol = git
 repo_url = https://github.com/ESCOMP/ptclm
-tag = PTCLM2_180214
+tag = PTCLM2_180611
 required = True
 
 [externals_description]

bld/namelist_files/namelist_definition_clm4_5.xml

@@ -349,7 +349,7 @@ Index of lower boundary condition for Richards equation.
 lower_boundary_condition = 1 : flux lower boundary condition                                     (use with soilwater_movement_method=adaptive time stepping)
 lower_boundary_condition = 2 : zero-flux lower boundary condition                                (use with soilwater_movement_method=adaptive time stepping)
 lower_boundary_condition = 3 : water table head-based lower boundary condition w/ aquifer layer. (use with soilwater_movement_method=adaptive time stepping)
-lower_boundary_condition = 4 : 11-layer solution w/ aquifer layer                                (only used with soilwater_movement_method=Zeng&Decker 2009)
+lower_boundary_condition = 4 : 11-layer solution w/ aquifer layer                                (only used with soilwater_movement_method=Zeng&Decker 2009)
 
 TODO(bja, 2015-09) these should be strings so they have meaningful names instead of ints. 
 </entry>
@@ -1082,6 +1082,11 @@ in its attributes. (Only used if scripgriddata_src_type = UGRID.)
 <!--                                                   -->
 <!-- mksurfdata namelist                               -->
 <!--                                                   -->
+<entry id="gitdescribe" type="char*80" category="mksurfdata"
+       group="clmexp" valid_values="" >
+Output of "git describe" to give the tag/commit the version being used corresponds to
+</entry>
+
 <entry id="mksrf_filename" type="char*256" category="mksurfdata"
        group="default_settings" 
        valid_values="mksrf_fsoitex,mksrf_forganic,mksrf_flakwat,mksrf_fwetlnd,mksrf_fmax,mksrf_fmax,mksrf_fglacier,mksrf_fglacierregion,mksrf_fvocef,mksrf_furbtopo,firrig,mksrf_furban,mksrf_fvegtyp,mksrf_fhrvtyp,mksrf_fsoicol,mksrf_flai,mksrf_fgdp,mksrf_fpeat,mksrf_fsoildepth,mksrf_fabm,mksrf_ftopostats,mksrf_fvic,mksrf_fch4" >

cime_config/testdefs/ExpectedTestFails.xml

@@ -2,7 +2,7 @@
 
 <expectedFails>
   <category name="aux_clm">
-    <entry issue="#169"     >PEND ERP_D_Ld10.f10_f10_musgs.IHistClm50BgcCrop.cheyenne_intel.clm-ciso_decStart SHAREDLIB_BUILD</entry>
+    <entry issue="#404"     >FAIL ERP_D_Ld10_P36x2.f10_f10_musgs.IHistClm50BgcCrop.cheyenne_intel.clm-ciso_decStart RUN</entry>
     <entry issue="#158"     >FAIL ERS_Lm20_Mmpi-serial.1x1_smallvilleIA.I2000Clm50BgcCropGs.cheyenne_gnu.clm-monthly RUN</entry>
     <entry issue="#158"     >FAIL ERS_Lm20_Mmpi-serial.1x1_smallvilleIA.I2000Clm50BgcCropGs.cheyenne_intel.clm-monthly RUN</entry>
     <entry issue="#339"     >FAIL ERS_D_Ld3.f10_f10_musgs.I1850Clm50BgcCrop.cheyenne_gnu.clm-default COMPARE_base_rest</entry>