Merge branch 'sarats/machinefiles/summitdev-updates' (PR #1641)

Update netcdf-fortran modules for IBM XL compilers.
Update project to CSC249 which has a bigger allocation.

Move Depends.summitdev.ibm file to correct location.

Fixes #1622

[BFB]
P2-80

* sarats/machinefiles/summitdev-updates:
  Update environment on Summitdev
  Move Summitdev Depends file

config/acme/machines/config_machines.xml

@@ -2504,7 +2504,7 @@
 	 <PES_PER_NODE>20</PES_PER_NODE>
 	 <MAX_TASKS_PER_NODE>160</MAX_TASKS_PER_NODE>
 	 <PROJECT_REQUIRED>TRUE</PROJECT_REQUIRED>
-	 <PROJECT>csc190</PROJECT>
+	 <PROJECT>csc249</PROJECT>
 	 <PIO_CONFIG_OPTS> -D PIO_BUILD_TIMING:BOOL=ON </PIO_CONFIG_OPTS>
 
 	 <mpirun mpilib="openmpi">
@@ -2550,7 +2550,6 @@
       <modules compiler="pgi">
         <command name="rm">xl</command>
         <command name="load">pgi/17.4</command>
-        <command name="load">netcdf-fortran/4.4.4</command>
         <command name="ls"/>
       </modules>
       <modules compiler="ibm">
@@ -2562,10 +2561,12 @@
       <!-- mpi lib settings -->
       <modules mpilib="mpi-serial">
         <command name="load">netcdf/4.4.1</command>
+        <command name="load">netcdf-fortran/4.4.4</command>
       </modules>
       <modules mpilib="!mpi-serial">
         <command name="load">spectrum_mpi/10.1.0.2-20161221</command>
         <command name="load">netcdf/4.4.1</command>
+        <command name="load">netcdf-fortran/4.4.4</command>
         <command name="load">parallel-netcdf/1.7.0</command>
         <command name="load">hdf5/1.10.0-patch1-parallel</command>
       </modules>
@@ -2575,12 +2576,10 @@
 		  <env name="MPILIB">$MPILIB</env>
 		  <env name="OMP_STACKSIZE">128M</env>
 		  <env name="NETCDF_C_PATH">$ENV{OLCF_NETCDF_ROOT}</env>
-		  <env name="NETCDF_FORTRAN_PATH" compiler="pgi">$ENV{OLCF_NETCDF_FORTRAN_ROOT}</env>
-		  <env name="PNETCDF_PATH" compiler="pgi" mpilib="!mpi-serial">$ENV{OLCF_PARALLEL_NETCDF_ROOT}</env>
+		  <env name="NETCDF_FORTRAN_PATH">$ENV{OLCF_NETCDF_FORTRAN_ROOT}</env>
+		  <env name="PNETCDF_PATH" mpilib="!mpi-serial">$ENV{OLCF_PARALLEL_NETCDF_ROOT}</env>
 		  <env name="HDF5_PATH">$ENV{OLCF_HDF5_ROOT}</env>
 		  <env name="ESSL_PATH">$ENV{OLCF_ESSL_ROOT}</env>
-		  <env name="NETCDF_FORTRAN_PATH" compiler="ibm">/lustre/atlas/proj-shared/cli115/summitdev/soft/netcdf/fortran-4.4.4</env>
-		  <env name="LD_LIBRARY_PATH" compiler="ibm">$ENV{LD_LIBRARY_PATH}:/lustre/atlas/proj-shared/cli115/summitdev/soft/netcdf/fortran-4.4.4/lib</env>
       </environment_variables>
     </module_system>
 </machine>