reverted changes for issue NOAA-EMC#694 to test Dave's new intel mpi lib

TingLei-daprediction · May 13, 2024 · 3f8b15a · 3f8b15a
1 parent 0e9ab7c
commit 3f8b15a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/gsi/gsi_rfv3io_mod.f90 b/src/gsi/gsi_rfv3io_mod.f90
@@ -4171,8 +4171,8 @@ subroutine gsi_fv3ncdf_writeuv(grd_uv,ges_u,ges_v,add_saved,fv3filenamegin)
        else
           call check( nf90_inq_varid(gfile_loc,'u',ugrd_VarId) )
           call check( nf90_inq_varid(gfile_loc,'v',vgrd_VarId) )
-          call check( nf90_var_par_access(gfile_loc, ugrd_VarId, nf90_collective))
-          call check( nf90_var_par_access(gfile_loc, vgrd_VarId, nf90_collective))
+!clt          call check( nf90_var_par_access(gfile_loc, ugrd_VarId, nf90_collective))
+!          call check( nf90_var_par_access(gfile_loc, vgrd_VarId, nf90_collective))
           call check( nf90_get_var(gfile_loc,ugrd_VarId,work_bu,start=u_startloc,count=u_countloc) )
           call check( nf90_get_var(gfile_loc,vgrd_VarId,work_bv,start=v_startloc,count=v_countloc) )
        endif
@@ -4390,9 +4390,9 @@ subroutine gsi_fv3ncdf_writeuv_v1(grd_uv,ges_u,ges_v,add_saved,fv3filenamegin)
     call check( nf90_open(filenamein,ior(nf90_write, nf90_mpiio),gfile_loc,comm=mpi_comm_read,info=MPI_INFO_NULL) )
 
     call check( nf90_inq_varid(gfile_loc,'u_s',u_sgrd_VarId) )
-    call check( nf90_var_par_access(gfile_loc, u_sgrd_VarId, nf90_collective))
+!clt    call check( nf90_var_par_access(gfile_loc, u_sgrd_VarId, nf90_collective))
     call check( nf90_inq_varid(gfile_loc,'u_w',u_wgrd_VarId) )
-    call check( nf90_var_par_access(gfile_loc, u_wgrd_VarId, nf90_collective))
+!clt    call check( nf90_var_par_access(gfile_loc, u_wgrd_VarId, nf90_collective))
     call check( nf90_inq_varid(gfile_loc,'v_s',v_sgrd_VarId) )
     call check( nf90_var_par_access(gfile_loc, v_sgrd_VarId, nf90_collective))
     call check( nf90_inq_varid(gfile_loc,'v_w',v_wgrd_VarId) )

diff --git a/ush/sub_hercules b/ush/sub_hercules
@@ -130,7 +130,7 @@ echo "module purge"                                        >> $cfile
 echo "module use $modulefiles"                      >> $cfile
 echo "module load gsi_hercules.intel" >> $cfile
 #TODO reenable I_MPI_EXTRA_FILESYSTEM once regional ctests can properly handle parallel I/O on Hercules
-echo "unset I_MPI_EXTRA_FILESYSTEM"         >> $cfile
+#echo "unset I_MPI_EXTRA_FILESYSTEM"         >> $cfile
 
 cat $exec >> $cfile