Conflict resolution: re-named gpp and npp accumulation/hold variables…

… needed to be applied to the new restart variable list.
NGEET · Dec 6, 2016 · fc8c670 · fc8c670
2 parents d11fff3 + 5c5928f
commit fc8c670
Show file tree

Hide file tree

Showing 16 changed files with 163 additions and 120 deletions.
diff --git a/cime/cime_config/cesm/machines/config_compilers.xml b/cime/cime_config/cesm/machines/config_compilers.xml
@@ -556,6 +556,7 @@ for mct, etc.
 <compiler COMPILER="gnu" MACH="eddi">
   <NETCDF_PATH>$(NETCDF_HOME)</NETCDF_PATH>
   <ADD_CPPDEFS> -DLinux -DCPRGNU </ADD_CPPDEFS>
+  <ADD_FFLAGS> -ffree-line-length-132 </ADD_FFLAGS>
   <ADD_FFLAGS DEBUG="TRUE"> -ffpe-trap=invalid,zero,overflow </ADD_FFLAGS>  <!---finit-integer=0-->
   <ADD_SLIBS> -L$(NETCDF_HOME)/lib/ -lnetcdff -lnetcdf -lcurl -llapack -lblas</ADD_SLIBS>
   <GPTL_CPPDEFS> -DHAVE_VPRINTF -DHAVE_GETTIMEOFDAY </GPTL_CPPDEFS>

diff --git a/components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml b/components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml
@@ -1973,6 +1973,6 @@ lnd/clm2/surfdata_map/surfdata_ne120np4_78pfts_simyr1850_c160216.nc</fsurdat>
 <use_lch4            bgc_mode="ed"  >.false.</use_lch4>
 <use_nitrif_denitrif bgc_mode="ed"  >.false.</use_nitrif_denitrif>
 
-<use_ed_spit_fire    use_ed=".true.">.true.</use_ed_spit_fire>
+<use_ed_spit_fire    use_ed=".true.">.false.</use_ed_spit_fire>
 
 </namelist_defaults>
diff --git a/components/clm/cime_config/testdefs/testlist_clm.xml b/components/clm/cime_config/testdefs/testlist_clm.xml
@@ -694,8 +694,8 @@
     <grid name="1x1_brazil">
       <test name="ERS_D_Mmpi-serial_Ld5">
         <machine compiler="ed" testtype="ed" testmods="clm/edTest">ed</machine>
-        <machine compiler="ed" testtype="ed" testmods="clm/edTest">hobart</machine>
         <machine compiler="nag" testtype="aux_clm45" testmods="clm/edTest">hobart</machine>
+        <machine compiler="ed" testtype="ed" testmods="clm/edTest">hobart</machine>
         <machine compiler="gnu" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
         <machine compiler="intel" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
         <machine compiler="pgi" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
@@ -709,8 +709,8 @@
       </test>
       <test name="SMS_D_Mmpi-serial_Ld5">
         <machine compiler="ed" testtype="ed" testmods="clm/edTest">ed</machine>
-        <machine compiler="ed" testtype="ed" testmods="clm/edTest">hobart</machine>
         <machine compiler="nag" testtype="aux_clm45" testmods="clm/edTest">hobart</machine>
+        <machine compiler="ed" testtype="ed" testmods="clm/edTest">hobart</machine>
         <machine compiler="intel" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
         <machine compiler="pgi" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
       </test>
@@ -724,15 +724,15 @@
     <grid name="f10_f10">
       <test name="ERS_D_Ld5">
         <machine compiler="ed" testtype="ed" testmods="clm/edTest">ed</machine>
-        <machine compiler="ed" testtype="ed" testmods="clm/edTest">hobart</machine>
-        <machine compiler="ed" testtype="ed" testmods="clm/edNoFire">ed</machine>
+        <machine compiler="ed" testtype="ed" testmods="clm/edFire">ed</machine>
         <machine compiler="nag" testtype="aux_clm45" testmods="clm/edTest">hobart</machine>
+        <machine compiler="ed" testtype="ed" testmods="clm/edTest">hobart</machine>
         <machine compiler="intel" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
       </test>
       <test name="SMS_D_Ld5">
         <machine compiler="ed" testtype="ed" testmods="clm/edTest">ed</machine>
-        <machine compiler="ed" testtype="ed" testmods="clm/edTest">hobart</machine>
         <machine compiler="nag" testtype="aux_clm45" testmods="clm/edTest">hobart</machine>
+        <machine compiler="ed" testtype="ed" testmods="clm/edTest">hobart</machine>
         <machine compiler="gnu" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
         <machine compiler="intel" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>
         <machine compiler="pgi" testtype="aux_clm45" testmods="clm/edTest">yellowstone</machine>

diff --git a/...tmods_dirs/clm/edNoFire/include_user_mods → ...estmods_dirs/clm/edFire/include_user_mods b/...tmods_dirs/clm/edNoFire/include_user_mods → ...estmods_dirs/clm/edFire/include_user_mods
diff --git a/...testmods_dirs/clm/edNoFire/shell_commands → ...s/testmods_dirs/clm/edFire/shell_commands b/...testmods_dirs/clm/edNoFire/shell_commands → ...s/testmods_dirs/clm/edFire/shell_commands
diff --git a/components/clm/cime_config/testdefs/testmods_dirs/clm/edFire/user_nl_clm b/components/clm/cime_config/testdefs/testmods_dirs/clm/edFire/user_nl_clm
@@ -0,0 +1,2 @@
+use_ed_spit_fire  = .true.
+
diff --git a/components/clm/cime_config/testdefs/testmods_dirs/clm/edNoFire/user_nl_clm b/components/clm/cime_config/testdefs/testmods_dirs/clm/edNoFire/user_nl_clm
diff --git a/components/clm/src/ED/biogeochem/EDCanopyStructureMod.F90 b/components/clm/src/ED/biogeochem/EDCanopyStructureMod.F90
@@ -742,7 +742,7 @@ subroutine canopy_summarization( nsites, sites, bc_in )
              if(currentCohort%balive <= 0._r8)then
                 write(fates_log(),*) 'ED: balive is zero in canopy_summarization',currentCohort%balive
              endif
-             
+
              currentCohort => currentCohort%taller
 
           enddo ! ends 'do while(associated(currentCohort))
@@ -995,8 +995,6 @@ subroutine leaf_area_profile( currentSite , snow_depth_si, frac_sno_eff_si)
                 layer_bottom_hite = currentCohort%hite-(((iv+1)/currentCohort%NV) * currentCohort%hite * &
                       EDecophyscon%crown(currentCohort%pft)) ! pftcon%vertical_canopy_frac(ft))
 
-                write(fates_log(), *) 'calc snow 2', snow_depth_si , frac_sno_eff_si
-
                 fraction_exposed =1.0_r8
 
                 currentPatch%tlai_profile(L,ft,iv) = currentPatch%tlai_profile(L,ft,iv)+ dinc_ed * fleaf * &
@@ -1014,9 +1012,12 @@ subroutine leaf_area_profile( currentSite , snow_depth_si, frac_sno_eff_si)
                 currentPatch%layer_height_profile(L,ft,iv) = currentPatch%layer_height_profile(L,ft,iv) + (dinc_ed * fleaf * &
                       currentCohort%c_area/currentPatch%total_canopy_area *(layer_top_hite+layer_bottom_hite)/2.0_r8) !average height of layer. 
 
-                write(fates_log(), *) 'LHP', currentPatch%layer_height_profile(L,ft,iv)
-                if ( DEBUG ) write(fates_log(), *) 'EDCLMLink 1246 ', currentPatch%elai_profile(1,ft,iv)
-
+                if ( DEBUG ) then
+                   write(fates_log(), *) 'calc snow 2', snow_depth_si , frac_sno_eff_si
+                   write(fates_log(), *) 'LHP', currentPatch%layer_height_profile(L,ft,iv)
+                   write(fates_log(), *) 'EDCLMLink 1246 ', currentPatch%elai_profile(1,ft,iv)
+                end if
+
              end do
 
              !Bottom layer