[Dart-dev] DART/branches Revision: 12264

[dart at ucar.edu]

nancy at ucar.edu
2018-01-03 13:29:46 -0700 (Wed, 03 Jan 2018)
133
second try at isolating nag dependencies.  when i get this
right on the 'recam' branch, these changes should move to
the rma_trunk.




Modified: DART/branches/recam/assimilation_code/modules/utilities/mpi_utilities_mod.f90
===================================================================
--- DART/branches/recam/assimilation_code/modules/utilities/mpi_utilities_mod.f90	2018-01-03 20:25:48 UTC (rev 12263)
+++ DART/branches/recam/assimilation_code/modules/utilities/mpi_utilities_mod.f90	2018-01-03 20:29:46 UTC (rev 12264)
@@ -43,7 +43,7 @@
 ! edit this by hand for NAG.
 
 !#ifdef __NAG__
-! use F90_unix_proc, only : sleep, system, exit
+! use F90_unix_proc, only : sleep, system
 !#endif
 
 implicit none
@@ -59,16 +59,16 @@
 ! this directory.  It is a sed script that comments in and out the interface
 ! block below.  Please leave the BLOCK comment lines unchanged.
 
-! !!SYSTEM_BLOCK_EDIT START COMMENTED_OUT
-! ! interface block for getting return code back from system() routine
-! interface
-!  function system(string)
-!   character(len=*) :: string
-!   integer :: system
-!  end function system
-! end interface
-! ! end block
-! !!SYSTEM_BLOCK_EDIT END COMMENTED_OUT
+ !!SYSTEM_BLOCK_EDIT START COMMENTED_IN
+ ! interface block for getting return code back from system() routine
+ interface
+  function system(string)
+   character(len=*) :: string
+   integer :: system
+  end function system
+ end interface
+ ! end block
+ !!SYSTEM_BLOCK_EDIT END COMMENTED_IN
 
 
 ! allow global sum to be computed for integers, r4, and r8s
@@ -1820,7 +1820,6 @@
 
 !-----------------------------------------------------------------------------
 subroutine sleep_seconds(naplength)
- use F90_unix_proc, only : sleep
  real(r8), intent(in) :: naplength
 
 ! Wrapper for the sleep command.  Argument is a real

Modified: DART/branches/recam/assimilation_code/modules/utilities/mpi_utilities_mod.nag.f90
===================================================================
--- DART/branches/recam/assimilation_code/modules/utilities/mpi_utilities_mod.nag.f90	2018-01-03 20:25:48 UTC (rev 12263)
+++ DART/branches/recam/assimilation_code/modules/utilities/mpi_utilities_mod.nag.f90	2018-01-03 20:29:46 UTC (rev 12264)
@@ -43,7 +43,7 @@
 ! edit this by hand for NAG.
 
 !#ifdef __NAG__
- use F90_unix_proc, only : sleep, system, exit
+ use F90_unix_proc, only : sleep, system
 !#endif
 
 implicit none
@@ -1820,7 +1820,6 @@
 
 !-----------------------------------------------------------------------------
 subroutine sleep_seconds(naplength)
- use F90_unix_proc, only : sleep
  real(r8), intent(in) :: naplength
 
 ! Wrapper for the sleep command.  Argument is a real

Modified: DART/branches/recam/assimilation_code/modules/utilities/null_mpi_utilities_mod.f90
===================================================================
--- DART/branches/recam/assimilation_code/modules/utilities/null_mpi_utilities_mod.f90	2018-01-03 20:25:48 UTC (rev 12263)
+++ DART/branches/recam/assimilation_code/modules/utilities/null_mpi_utilities_mod.f90	2018-01-03 20:29:46 UTC (rev 12264)
@@ -18,7 +18,7 @@
 
 
 !#ifdef __NAG__
-! use F90_unix_proc, only : sleep, system, exit
+! use F90_unix_proc, only : sleep, system
 !#endif
 
 
@@ -33,16 +33,16 @@
 ! this directory.  It is a sed script that comments in and out the interface
 ! block below.  Please leave the BLOCK comment lines unchanged.
 
-! !!SYSTEM_BLOCK_EDIT START COMMENTED_OUT
-! ! interface block for getting return code back from system() routine
-! interface
-!  function system(string)    
-!   character(len=*) :: string
-!   integer :: system         
-!  end function system
-! end interface
-! ! end block                 
-! !!SYSTEM_BLOCK_EDIT END COMMENTED_OUT
+ !!SYSTEM_BLOCK_EDIT START COMMENTED_IN
+ ! interface block for getting return code back from system() routine
+ interface