Merge clm4_5_6_r153, commit 'a638af5' into andre/ed-clm-r16x

NGEET · Apr 7, 2016 · 56dfb03 · 56dfb03
2 parents c55eec8 + a638af5
commit 56dfb03
Show file tree

Hide file tree

Showing 14 changed files with 262 additions and 26 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,127 @@
 ===============================================================
+Tag name:  clm4_5_6_r153
+Originator(s):  Sean Swenson, Bill Sacks
+Date: Tue Nov 17 06:01:47 MST 2015
+One-line Summary: Fix snow cover fraction bug
+
+Purpose of changes
+------------------
+
+The fix for infinite snow growth made in clm4_5_3_r144 turned out to have a bug
+of its own: It prevented snow cover fraction from going above 0.8.
+
+This tag fixes the snow cover fraction bug while still (it appears) preventing
+infinite snow growth.
+
+This results in a potentially large change in model behavior, so the version
+number is bumped from clm4_5_5 to clm4_5_6. However, this is mainly due to
+backing out some of the (buggy) changes that were put in place in
+clm4_5_3_r144. That is, if the changes in this new tag were made on top of
+clm4_5_3_r143, the differences would likely be relatively small.
+
+Changes made by Sean Swenson, brought to trunk by Bill Sacks.
+
+
+Notes of particular relevance for users
+---------------------------------------
+
+Caveats for users (e.g., need to run initial conditions through init_interp): none
+
+Changes to CLM's user interface (e.g., new/renamed XML or namelist variables): none
+
+Changes made to namelist defaults (e.g., changed parameter values): none
+
+Changes to the datasets (e.g., parameter, surface or initial files): none
+
+Substantial timing or memory changes: none
+
+
+Code reviews and testing
+------------------------
+
+Code reviewed by: Bill Sacks
+
+CLM testing:
+
+  build-namelist tests:
+
+    yellowstone - not run
+
+  unit-tests (components/clm/src):
+
+    yellowstone - pass
+
+  tools-tests (components/clm/test/tools):
+
+    yellowstone - not run
+
+  PTCLM testing (components/clm/tools/shared/PTCLM/test):
+
+     yellowstone - not run
+
+  regular tests (aux_clm40, aux_clm45):
+
+    yellowstone_intel - ok
+    yellowstone_pgi - ok
+    yellowstone_gnu (clm45 only) - ok
+    hobart_nag - ok
+
+    'ok' means: tests pass, but answers change for CLM45 / CLM50 cases
+
+CLM tag used for the baseline comparisons: clm4_5_5_r152
+
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: YES
+
+  If a tag changes answers relative to baseline comparison the
+  following should be filled in (otherwise remove this section):
+
+  Summarize any changes to answers, i.e.,
+    - what code configurations: All CLM45 / CLM50 cases
+    - what platforms/compilers: All
+    - nature of change (roundoff; larger than roundoff/same climate; new climate): 
+      New climate
+
+      Main changes are due to backing out some of the (buggy) changes that were
+      put in place in clm4_5_3_r144. That is, if the changes in this new tag
+      were made on top of clm4_5_3_r143, the differences would likely be
+      relatively small.
+
+   If bitwise differences were observed, how did you show they were no worse
+   than roundoff? N/A
+
+   If this tag changes climate describe the run(s) done to evaluate the new
+   climate (put details of the simulations in the experiment database)
+       - casename: N/A
+
+   URL for LMWG diagnostics output used to validate new climate: N/A
+
+
+Detailed list of changes
+------------------------
+
+List any svn externals directories updated (cime, rtm, cism, etc.): none
+
+List all files eliminated: none
+
+List all files added and what they do: none
+
+List all existing files that have been modified, and describe the changes:
+
+========= Main changes. The change to CanopyHydrologyMod backs out a change that
+          was made in r144. The change to SnowHydrologyMod is new.
+M       components/clm/src/biogeophys/CanopyHydrologyMod.F90
+M       components/clm/src/biogeophys/SnowHydrologyMod.F90
+
+========= Unrelated change: get rid of a write statement that was resulting in
+          lots of messages to the log file
+M       components/clm/src/biogeophys/SoilHydrologyMod.F90
+
+===============================================================
+===============================================================
 Tag name:  clm4_5_5_r152
 Originator(s):  sacks (Bill Sacks)
 Date: Tue Nov 17 05:22:58 MST 2015

diff --git a/components/clm/doc/ChangeLog b/components/clm/doc/ChangeLog
@@ -1,4 +1,127 @@
 ===============================================================
+Tag name:  clm4_5_6_r153
+Originator(s):  Sean Swenson, Bill Sacks
+Date: Tue Nov 17 06:01:47 MST 2015
+One-line Summary: Fix snow cover fraction bug
+
+Purpose of changes
+------------------
+
+The fix for infinite snow growth made in clm4_5_3_r144 turned out to have a bug
+of its own: It prevented snow cover fraction from going above 0.8.
+
+This tag fixes the snow cover fraction bug while still (it appears) preventing
+infinite snow growth.
+
+This results in a potentially large change in model behavior, so the version
+number is bumped from clm4_5_5 to clm4_5_6. However, this is mainly due to
+backing out some of the (buggy) changes that were put in place in
+clm4_5_3_r144. That is, if the changes in this new tag were made on top of
+clm4_5_3_r143, the differences would likely be relatively small.
+
+Changes made by Sean Swenson, brought to trunk by Bill Sacks.
+
+
+Notes of particular relevance for users
+---------------------------------------
+
+Caveats for users (e.g., need to run initial conditions through init_interp): none
+
+Changes to CLM's user interface (e.g., new/renamed XML or namelist variables): none
+
+Changes made to namelist defaults (e.g., changed parameter values): none
+
+Changes to the datasets (e.g., parameter, surface or initial files): none
+
+Substantial timing or memory changes: none
+
+
+Code reviews and testing
+------------------------
+
+Code reviewed by: Bill Sacks
+
+CLM testing:
+
+  build-namelist tests:
+
+    yellowstone - not run
+
+  unit-tests (components/clm/src):
+
+    yellowstone - pass
+
+  tools-tests (components/clm/test/tools):
+
+    yellowstone - not run
+
+  PTCLM testing (components/clm/tools/shared/PTCLM/test):
+
+     yellowstone - not run
+
+  regular tests (aux_clm40, aux_clm45):
+
+    yellowstone_intel - ok
+    yellowstone_pgi - ok
+    yellowstone_gnu (clm45 only) - ok
+    hobart_nag - ok
+
+    'ok' means: tests pass, but answers change for CLM45 / CLM50 cases
+
+CLM tag used for the baseline comparisons: clm4_5_5_r152
+
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: YES
+
+  If a tag changes answers relative to baseline comparison the
+  following should be filled in (otherwise remove this section):
+
+  Summarize any changes to answers, i.e.,
+    - what code configurations: All CLM45 / CLM50 cases
+    - what platforms/compilers: All
+    - nature of change (roundoff; larger than roundoff/same climate; new climate): 
+      New climate
+
+      Main changes are due to backing out some of the (buggy) changes that were
+      put in place in clm4_5_3_r144. That is, if the changes in this new tag
+      were made on top of clm4_5_3_r143, the differences would likely be
+      relatively small.
+
+   If bitwise differences were observed, how did you show they were no worse
+   than roundoff? N/A
+
+   If this tag changes climate describe the run(s) done to evaluate the new
+   climate (put details of the simulations in the experiment database)
+       - casename: N/A
+
+   URL for LMWG diagnostics output used to validate new climate: N/A
+
+
+Detailed list of changes
+------------------------
+
+List any svn externals directories updated (cime, rtm, cism, etc.): none
+
+List all files eliminated: none
+
+List all files added and what they do: none
+
+List all existing files that have been modified, and describe the changes:
+
+========= Main changes. The change to CanopyHydrologyMod backs out a change that
+          was made in r144. The change to SnowHydrologyMod is new.
+M       components/clm/src/biogeophys/CanopyHydrologyMod.F90
+M       components/clm/src/biogeophys/SnowHydrologyMod.F90
+
+========= Unrelated change: get rid of a write statement that was resulting in
+          lots of messages to the log file
+M       components/clm/src/biogeophys/SoilHydrologyMod.F90
+
+===============================================================
+===============================================================
 Tag name:  clm4_5_5_r152
 Originator(s):  sacks (Bill Sacks)
 Date: Tue Nov 17 05:22:58 MST 2015

diff --git a/components/clm/doc/ChangeSum b/components/clm/doc/ChangeSum
@@ -1,5 +1,6 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+   clm4_5_6_r153    sacks 11/17/2015 Fix snow cover fraction bug
    clm4_5_5_r152    sacks 11/17/2015 Fix glc_mec energy conservation bug
    clm4_5_4_r151     erik 11/13/2015 Fix broken r150 tag, with bgc_spinup issue in it
    clm4_5_4_r150     erik 11/13/2015 Some needed answer changing fixes for: fire, disallow 

diff --git a/components/clm/doc/UsersGuide/clm_ug.xml b/components/clm/doc/UsersGuide/clm_ug.xml
@@ -162,7 +162,7 @@ The purpose of this guide is to instruct both the novice and experienced user, a
 </para>
 </abstract>
 
-<releaseinfo>$URL: https://svn-ccsm-models.cgd.ucar.edu/clm2/trunk_tags/clm4_5_5_r152/components/clm/doc/UsersGuide/clm_ug.xml $</releaseinfo>
+<releaseinfo>$URL: https://svn-ccsm-models.cgd.ucar.edu/clm2/trunk_tags/clm4_5_6_r153/components/clm/doc/UsersGuide/clm_ug.xml $</releaseinfo>
 
 <date>&build_date;</date>
 

diff --git a/components/clm/src/biogeophys/CanopyHydrologyMod.F90 b/components/clm/src/biogeophys/CanopyHydrologyMod.F90
@@ -518,7 +518,7 @@ subroutine CanopyHydrology(bounds, &
              !======================  FSCA PARAMETERIZATIONS  ======================
              ! fsca parameterization based on *changes* in swe
              ! first compute change from melt during previous time step
-             if(snowmelt(c) >= 0._r8) then
+             if(snowmelt(c) > 0._r8) then
 
                 smr=min(1._r8,(h2osno(c))/(int_snow(c)))
 

diff --git a/components/clm/src/biogeophys/SnowHydrologyMod.F90 b/components/clm/src/biogeophys/SnowHydrologyMod.F90
@@ -625,10 +625,12 @@ subroutine SnowCompaction(bounds, num_snowc, filter_snowc, &
                       ddz3 = max(0._r8,min(1._r8,(swe_old(c,j) - wx)/wx))
 
                       ! 2nd term is delta fsno over fsno, allowing for negative values for ddz3
-                      wsum = sum(h2osoi_liq(c,snl(c)+1:0)+h2osoi_ice(c,snl(c)+1:0))
-                      fsno_melt = 1. - (acos(2.*min(1._r8,wsum/int_snow(c)) - 1._r8)/rpi)**(n_melt(c))
-
-                      ddz3 = ddz3 - max(0._r8,(fsno_melt - frac_sno(c))/frac_sno(c))
+                      if((swe_old(c,j) - wx) > 0._r8) then
+                         wsum = sum(h2osoi_liq(c,snl(c)+1:0)+h2osoi_ice(c,snl(c)+1:0))
+                         fsno_melt = 1. - (acos(2.*min(1._r8,wsum/int_snow(c)) - 1._r8)/rpi)**(n_melt(c))
+
+                         ddz3 = ddz3 - max(0._r8,(fsno_melt - frac_sno(c))/frac_sno(c))
+                      endif
                       ddz3 = -1._r8/dtime * ddz3
                    else
                       ddz3 = - 1._r8/dtime * max(0._r8,(frac_iceold(c,j) - fi)/frac_iceold(c,j))

diff --git a/components/clm/src/biogeophys/SoilHydrologyMod.F90 b/components/clm/src/biogeophys/SoilHydrologyMod.F90
@@ -2209,19 +2209,6 @@ subroutine LateralFlowPowerLaw(bounds, num_hydrologyc, filter_hydrologyc, &
 !          rsub_top(c) = rsub_top(c) - xs(c)/dtime
           qflx_rsub_sat(c) = qflx_rsub_sat(c) - xs(c)/dtime
 
-          if(xs(c)/dtime > 1.e-6) then
-             g = col%gridcell(c)
-             write(iulog,*) 'xs drainage: ', c, xs(c), xs(c)/dtime
-             write(iulog,*) 'lat/lon: ', grc%latdeg(g), grc%londeg(g)
-             write(iulog,*) 'h2osno, h2osfc'
-             write(iulog,'(i8,2f14.6)') c,h2osno(c),h2osfc(c)
-             write(iulog,*) 'soil liq/ice'
-             do k = 1, nlevsoi
-                write(iulog,'(i4,2f14.6)') k, h2osoi_liq(c,k),h2osoi_ice(c,k)
-             enddo
-             write(iulog,*) ' '
-          endif
-
        end do
 
        do fc = 1, num_hydrologyc

diff --git a/components/clm/src_clm40/main/findHistFields.pl b/components/clm/src_clm40/main/findHistFields.pl
@@ -180,7 +180,7 @@ sub XML_Header {
   my $filename    = shift;
 
   print STDERR " Write out header to history fields file to: $outfilename\n";
-  my $svnurl = '$URL: https://svn-ccsm-models.cgd.ucar.edu/clm2/trunk_tags/clm4_5_5_r152/components/clm/src_clm40/main/findHistFields.pl $';
+  my $svnurl = '$URL: https://svn-ccsm-models.cgd.ucar.edu/clm2/trunk_tags/clm4_5_6_r153/components/clm/src_clm40/main/findHistFields.pl $';
   my $svnid  = '$Id: findHistFields.pl 69899 2015-04-10 20:45:24Z erik $';
   print $outfh <<"EOF";
 <?xml version="1.0"?>

diff --git a/components/clm/tools/clm4_0/interpinic/src/interpinic.F90 b/components/clm/tools/clm4_0/interpinic/src/interpinic.F90
@@ -1389,7 +1389,7 @@ subroutine addglobal (ncid, cmdline)
     character(len= 5) :: zone
     character(len=18) :: datetime
     character(len=256):: version = &
-         "$HeadURL: https://svn-ccsm-models.cgd.ucar.edu/clm2/trunk_tags/clm4_5_5_r152/components/clm/tools/clm4_0/interpinic/src/interpinic.F90 $"
+         "$HeadURL: https://svn-ccsm-models.cgd.ucar.edu/clm2/trunk_tags/clm4_5_6_r153/components/clm/tools/clm4_0/interpinic/src/interpinic.F90 $"
     character(len=256)  :: revision_id = "$Id: interpinic.F90 55582 2013-11-23 21:15:59Z erik $"
     character(len=16)   :: logname
     character(len=16)   :: hostname

diff --git a/components/clm/tools/clm4_0/mksurfdata_map/src/mkfileMod.F90 b/components/clm/tools/clm4_0/mksurfdata_map/src/mkfileMod.F90
@@ -93,7 +93,7 @@ subroutine mkfile(domain, fname, dynlanduse, urban_format)
          'Source', len_trim(str), trim(str)), subname)
 
     str = &
-'$HeadURL: https://svn-ccsm-models.cgd.ucar.edu/clm2/trunk_tags/clm4_5_5_r152/components/clm/tools/clm4_0/mksurfdata_map/src/mkfileMod.F90 $'
+'$HeadURL: https://svn-ccsm-models.cgd.ucar.edu/clm2/trunk_tags/clm4_5_6_r153/components/clm/tools/clm4_0/mksurfdata_map/src/mkfileMod.F90 $'
     call check_ret(nf_put_att_text (ncid, NF_GLOBAL, &
          'Version', len_trim(str), trim(str)), subname)
 

diff --git a/components/clm/tools/clm4_5/mksurfdata_map/src/mkfileMod.F90 b/components/clm/tools/clm4_5/mksurfdata_map/src/mkfileMod.F90
@@ -92,7 +92,7 @@ subroutine mkfile(domain, fname, dynlanduse)
          'Source', len_trim(str), trim(str)), subname)
 
     str = &
-'$HeadURL: https://svn-ccsm-models.cgd.ucar.edu/clm2/trunk_tags/clm4_5_5_r152/components/clm/tools/clm4_5/mksurfdata_map/src/mkfileMod.F90 $'
+'$HeadURL: https://svn-ccsm-models.cgd.ucar.edu/clm2/trunk_tags/clm4_5_6_r153/components/clm/tools/clm4_5/mksurfdata_map/src/mkfileMod.F90 $'
     call check_ret(nf_put_att_text (ncid, NF_GLOBAL, &
          'Version', len_trim(str), trim(str)), subname)
 

diff --git a/components/clm/tools/shared/mkmapdata/rmdups.ncl b/components/clm/tools/shared/mkmapdata/rmdups.ncl
@@ -118,7 +118,7 @@ begin
     nco@history = nco@history + " Removed duplicate weights from mapping file with: rmdups.ncl "
     nco@rmdups_Logname       = logname;
     nco@rmdups_mod_date      = ldate;
-    nco@rmdups_version       = "$HeadURL: https://svn-ccsm-models.cgd.ucar.edu/clm2/trunk_tags/clm4_5_5_r152/components/clm/tools/shared/mkmapdata/rmdups.ncl $";
+    nco@rmdups_version       = "$HeadURL: https://svn-ccsm-models.cgd.ucar.edu/clm2/trunk_tags/clm4_5_6_r153/components/clm/tools/shared/mkmapdata/rmdups.ncl $";
     nco@rmdups_revision_id   = "$Id: rmdups.ncl 47629 2013-05-31 08:59:50Z erik $";
 
     print("Successfully removed duplicate weights from mapping file" );

diff --git a/components/clm/tools/shared/mkmapgrids/mkscripgrid.ncl b/components/clm/tools/shared/mkmapgrids/mkscripgrid.ncl
@@ -158,7 +158,7 @@ end
   nc = addfile( outfilename, "w" );
   nc@history = ldate+": create using mkscripgrid.ncl";
   nc@comment = "Ocean is assumed to non-existant at this point";
-  nc@Version = "$HeadURL: https://svn-ccsm-models.cgd.ucar.edu/clm2/trunk_tags/clm4_5_5_r152/components/clm/tools/shared/mkmapgrids/mkscripgrid.ncl $";
+  nc@Version = "$HeadURL: https://svn-ccsm-models.cgd.ucar.edu/clm2/trunk_tags/clm4_5_6_r153/components/clm/tools/shared/mkmapgrids/mkscripgrid.ncl $";
   nc@Revision = "$Id: mkscripgrid.ncl 72547 2015-08-25 16:28:29Z erik $";
   if ( printn )then
     print( "================================================================================================" );

diff --git a/components/clm/tools/shared/ncl_scripts/getco2_historical.ncl b/components/clm/tools/shared/ncl_scripts/getco2_historical.ncl
@@ -109,7 +109,7 @@ begin
    fileattdef ( nco, ncg );
    nco@history  = ldate+": Convert by getco2_historical.ncl";
    nco@source   = "Convert from:"+ghgfile;
-   nco@Version  = "$HeadURL: https://svn-ccsm-models.cgd.ucar.edu/clm2/trunk_tags/clm4_5_5_r152/components/clm/tools/shared/ncl_scripts/getco2_historical.ncl $";
+   nco@Version  = "$HeadURL: https://svn-ccsm-models.cgd.ucar.edu/clm2/trunk_tags/clm4_5_6_r153/components/clm/tools/shared/ncl_scripts/getco2_historical.ncl $";
    nco@Revision = "$Id: getco2_historical.ncl 69995 2015-04-14 20:26:21Z erik $";
    ;
    ; Set static variables