Merge pull request #420 from jedwards4b/nag_port

Nag port
E3SM-Project · Aug 17, 2016 · 949cebb · 949cebb
2 parents 196c7dc + b7f163a
commit 949cebb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/cime_config/cesm/machines/config_machines.xml b/cime_config/cesm/machines/config_machines.xml
@@ -629,9 +629,9 @@
       <modules compiler="nag">
 	<command name="load">compiler/nag/6.1</command>
       </modules>
-      <modules compiler="nag" mpilib="mvapich2">
+<!--      <modules compiler="nag" mpilib="mvapich2">
 	  <command name="load">  tool/parallel-netcdf/1.7.0/nag/mvapich2 </command>
-      </modules>
+      </modules> -->
       <modules compiler="gnu">
 	<command name="load">compiler/gnu/4.8.5</command>
       </modules>

diff --git a/cime_config/cesm/machines/config_pio.xml b/cime_config/cesm/machines/config_pio.xml
@@ -49,6 +49,7 @@
       <value mach="constance">netcdf</value>
       <value mach="pleiades.*">netcdf</value>
       <value mach="hobart" compiler="pgi">netcdf</value>
+      <value mach="hobart" compiler="nag">netcdf</value>
       <value mpilib="mpi-serial">netcdf</value>
     </values>
   </entry>

diff --git a/share/csm_share/shr/shr_pio_mod.F90 b/share/csm_share/shr/shr_pio_mod.F90
@@ -67,8 +67,10 @@ module shr_pio_mod
 contains
 !>
 !! @public
-!! @brief should be the first routine called after mpi_init. It reads the pio default settings from file drv_in, namelist pio_default_inparm
-!! and, if pio_async_interface is true, splits the IO tasks away from the Compute tasks.  It then returns the new compute comm in
+!! @brief should be the first routine called after mpi_init. 
+!! It reads the pio default settings from file drv_in, namelist pio_default_inparm
+!! and, if pio_async_interface is true, splits the IO tasks away from the 
+!! Compute tasks.  It then returns the new compute comm in
 !! Global_Comm and sets module variable io_comm.
 !!
 !<
@@ -759,8 +761,10 @@ subroutine shr_pio_rearr_opts_set(comm, pio_rearr_comm_type, pio_rearr_comm_fcd,
         ! very large process count runs. Can improve this by
         ! communicating between iotasks first, and then non-iotasks
         ! to iotasks (TO DO)
-        write(shr_log_unit, *) "Invalid PIO rearranger comm max pend req (comp2io), ", pio_rearr_comm_max_pend_req_comp2io
-        write(shr_log_unit, *) "Resetting PIO rearranger comm max pend req (comp2io) to ", max(PIO_REARR_COMM_DEF_MAX_PEND_REQ, 2 * pio_numiotasks)
+        write(shr_log_unit, *) "Invalid PIO rearranger comm max pend req (comp2io), ",&
+             pio_rearr_comm_max_pend_req_comp2io
+        write(shr_log_unit, *) "Resetting PIO rearranger comm max pend req (comp2io) to ", &
+             max(PIO_REARR_COMM_DEF_MAX_PEND_REQ, 2 * pio_numiotasks)
         buf(3) = max(PIO_REARR_COMM_DEF_MAX_PEND_REQ, 2 * pio_numiotasks)
       else
         buf(3) = pio_rearr_comm_max_pend_req_comp2io