Merge branch worleyph/clm/CLM45_VOCEmissionMod_fix (PR#90)

eliminating reference to unallocated arrays in VOCEmissionMod (fixes #81), moving misplaced t_stopf (fixes #94), and replacing pgi version for Titan (fixes #62) (PR#90) * worleyph/clm/CLM45_VOCEmissionMod_fix: replacing pgi/14.2.0 with pgi/14.10.home for Titan when using PGI compiler moving misplaced t_stopf call in CLM4.5 eliminating reference to unallocated arrays in VOCEmissionMod [BFB]
E3SM-Project · Feb 3, 2015 · dd18120 · dd18120
2 parents d497d36 + 23bdb67
commit dd18120
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/models/lnd/clm/src/biogeochem/VOCEmissionMod.F90 b/models/lnd/clm/src/biogeochem/VOCEmissionMod.F90
@@ -86,9 +86,11 @@ subroutine Init(this, bounds)
     class(vocemis_type) :: this
     type(bounds_type), intent(in)    :: bounds  
 
-    call this%InitAllocate(bounds) 
-    call this%InitHistory(bounds)
-    call this%InitCold(bounds)
+    if ( shr_megan_mechcomps_n > 0) then
+       call this%InitAllocate(bounds) 
+       call this%InitHistory(bounds)
+       call this%InitCold(bounds)
+    end if
 
   end subroutine Init
 
@@ -114,8 +116,6 @@ subroutine InitAllocate(this, bounds)
     type(shr_megan_megcomp_t), pointer :: meg_cmp
     !-----------------------------------------------------------------------
 
-    if ( shr_megan_mechcomps_n < 1) return
-
     begg = bounds%begg; endg = bounds%endg
     begp = bounds%begp; endp = bounds%endp
 

diff --git a/models/lnd/clm/src/main/clm_driver.F90 b/models/lnd/clm/src/main/clm_driver.F90
@@ -679,7 +679,6 @@ subroutine clm_drv(doalb, nextsw_cday, declinp1, declin, rstwr, nlend, rdate)
                      filter(nc)%num_nolakep, filter(nc)%nolakep, &
                      waterstate_vars, canopystate_vars)
              end if
-             call t_stopf('ecosysdyn')
 
           end if  ! end of if-use_cn
 
@@ -702,6 +701,8 @@ subroutine clm_drv(doalb, nextsw_cday, declinp1, declin, rstwr, nlend, rdate)
 
        end if  ! end of if-use_ed
 
+       call t_stopf('ecosysdyn')
+
        ! Dry Deposition of chemical tracers (Wesely (1998) parameterizaion)
        call t_startf('depvel')
        call depvel_compute(bounds_clump, &

diff --git a/scripts/ccsm_utils/Machines/env_mach_specific.titan b/scripts/ccsm_utils/Machines/env_mach_specific.titan
@@ -10,6 +10,7 @@
 
 if (-e /opt/modules/default/init/csh) then
   source /opt/modules/default/init/csh
+  setenv  MODULEPATH ${MODULEPATH}:/ccs/home/norton/.modules
   module rm PrgEnv-intel
   module rm PrgEnv-pgi
   module rm PrgEnv-cray
@@ -32,10 +33,11 @@ if (-e /opt/modules/default/init/csh) then
 
   if ($COMPILER == "pgicuda") then
     module load PrgEnv-pgi
-    module switch pgi pgi/14.2.0
+#    module switch pgi pgi/14.2.0
+    module switch pgi pgi/14.10.home
     module load cray-mpich/6.3.0
     module load cray-libsci/12.1.3
-    module switch xt-asyncpe xt-asyncpe/5.24
+    module switch xt-asyncpe xt-asyncpe/5.27
     module load esmf/5.2.0rp2
 
     module add cudatoolkit
@@ -44,10 +46,11 @@ if (-e /opt/modules/default/init/csh) then
 
   if ( $COMPILER == "pgi" ) then
     module load PrgEnv-pgi
-    module switch pgi pgi/14.2.0
+#    module switch pgi pgi/14.2.0
+    module switch pgi pgi/14.10.home
     module load cray-mpich/6.3.0
     module load cray-libsci/12.1.3
-    module switch xt-asyncpe xt-asyncpe/5.24
+    module switch xt-asyncpe xt-asyncpe/5.27
     module load esmf/5.2.0rp2
   endif
 
@@ -84,8 +87,8 @@ limit stacksize unlimited
 
 # The environment variable below increase the stack size, which is necessary for
 # CICE to run threaded on this machine.
-setenv MPSTKZ 64M
-setenv OMP_STACKSIZE 64M
+setenv MPSTKZ 128M
+setenv OMP_STACKSIZE 128M
 if ( $COMPILER == "intel" ) then
 	setenv XTPE_LINK_TYPE dynamic
 endif