Merge branch 'main' into bugfix_debug

NCAR · Jan 18, 2024 · 22f2ee6 · 22f2ee6
2 parents b5aa9ce + 4fe284c
commit 22f2ee6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/examples/basic/kinds_mod.F90 b/examples/basic/kinds_mod.F90
@@ -2,7 +2,7 @@
 
  module kinds_mod
 
-!BOP
+!
 ! !MODULE: kinds_mod
 !
 ! !DESCRIPTION:
@@ -31,9 +31,9 @@ module kinds_mod
       r4        = selected_real_kind(6)  ,&
       r8        = selected_real_kind(13)
 
-!EOP
-!BOC
-!EOC
+!
+!
+!
 !***********************************************************************
 
  end module kinds_mod

diff --git a/src/flib/piolib_mod.F90 b/src/flib/piolib_mod.F90
@@ -1343,8 +1343,7 @@ end function pio_iotype_available
   !! @param file The returned file descriptor
   !! @param iotype @copydoc PIO_iotype
   !! @param fname The name of the file to open
-  !! @param amode_in The NetCDF creation mode flag - NC_NOWRITE for
-  !! read-only access or NC_WRITE for read-write access.
+  !! @param amode_in The NetCDF creation mode flag:  PIO_CLOBBER, PIO_NOCLOBBER, PIO_64BIT_OFFSET, PIO_64BIT_DATA
   !! @retval ierr @copydoc error_return
   !! @author Jim Edwards
   !<

diff --git a/src/gptl/perf_utils.F90 b/src/gptl/perf_utils.F90
@@ -317,7 +317,7 @@ END SUBROUTINE shr_mpi_bcastl0
 
 !================== Routines from csm_share/shr/shr_file_mod.F90 ===============
 !===============================================================================
-!BOP ===========================================================================
+!===========================================================================
 !
 ! !IROUTINE: shr_file_getUnit -- Get a free FORTRAN unit number
 !
@@ -333,7 +333,7 @@ INTEGER FUNCTION shr_file_getUnit ()
 
    implicit none
 
-!EOP
+!
 
    !----- local parameters -----
    integer(SHR_KIND_IN),parameter :: shr_file_minUnit = 10      ! Min unit number to give
@@ -367,7 +367,7 @@ END FUNCTION shr_file_getUnit
 !===============================================================================
 
 !===============================================================================
-!BOP ===========================================================================
+!===============================================================================
 !
 ! !IROUTINE: shr_file_freeUnit -- Free up a FORTRAN unit number
 !
@@ -387,7 +387,7 @@ SUBROUTINE shr_file_freeUnit ( unit)
 
    integer(SHR_KIND_IN),intent(in) :: unit  ! unit number to be freed
 
-!EOP
+!
 
    !----- local parameters -----
    integer(SHR_KIND_IN),parameter :: shr_file_minUnit = 10      ! Min unit number to give