Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes variables named unit to 'iunit' #1394

Merged
merged 44 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from 39 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
7e6e35e
unit to iunit in subroutines mpp_memuse_end and mpp_print_memuse_stat…
abrooks1085 Oct 11, 2023
05a5ded
unit to iunit in subroutine fms_affinity_init in fms_affinity.F90
abrooks1085 Oct 11, 2023
112eee3
unit to iunit in subroutines print_time and print_date in time_manage…
abrooks1085 Oct 11, 2023
b342a08
unit to iunit in functions frac_index and nearest_index in axis_utils…
abrooks1085 Oct 11, 2023
76ba25f
unit to iunit in subroutine horiz_interp_init in horiz_interp.F90
abrooks1085 Oct 11, 2023
7ae2349
unit to iunit in subroutine amip_interp_init in amip_interp.F90
abrooks1085 Oct 11, 2023
2c57964
unit to iunit in subroutine astronomy_init in astronomy.F90
abrooks1085 Oct 11, 2023
c5bee4c
unit to iunit in subroutine column_diagnostics_init in column_diagnos…
abrooks1085 Oct 11, 2023
0d7a407
unit to iunit in subroutine xgrid_init in xgrid.F90
abrooks1085 Oct 11, 2023
38621a5
unit to iunit in subroutine sat_vapor_pres_init in sat_vapor_pres.F90
abrooks1085 Oct 11, 2023
c9c6818
unit to iunit in subroutine read_namelist in topography.F90
abrooks1085 Oct 11, 2023
b0d8ee9
unit to iunit in subroutine read_namelist in gaussian_topog.F90
abrooks1085 Oct 11, 2023
ff123da
unit to iunit in add amip_interp.inc
abrooks1085 Oct 11, 2023
9dbb168
unit to iunit in fms_io.F90
abrooks1085 Oct 11, 2023
0b13137
unit to iunit in functions FRAC_INDEX_ and NEAREST_INDEX_ in axis_uti…
abrooks1085 Oct 12, 2023
16caa8c
unit to iunit in subroutines DATA_OVERRIDE_INIT_IMPL_ and read_table …
abrooks1085 Oct 12, 2023
d79347c
unit to iunit in horiz_interp/include/horiz_interp_bicubic.inc
abrooks1085 Oct 12, 2023
c7140ab
unit to iunit in horiz_interp/include/horiz_interp_bilinear.inc
abrooks1085 Oct 12, 2023
bb66ee6
unit to iunit subroutine print_memuse_stats in memutils/memutils.F90
abrooks1085 Oct 12, 2023
155a320
unit to iunit in subroutines compute_overlaps, fill_overlaps, compute…
abrooks1085 Oct 12, 2023
2f6a8a9
unit to iunit in subroutines mpp_domains_init and mpp_domains_exit in…
abrooks1085 Oct 12, 2023
42f7a11
unit to iunit in subroutines mpp_open and mpp_close in mpp/include/mp…
abrooks1085 Oct 12, 2023
779a342
unit to iunit in subroutines mpp_io_init, mpp_io_exit, and mpp_flush …
abrooks1085 Oct 12, 2023
5265165
unit to iunit in subroutines mpp_read_ and mpp_read_region for 0D to …
abrooks1085 Oct 12, 2023
b69cb31
unit to iunit in subroutines and functions that use the keyword unit …
abrooks1085 Oct 12, 2023
ef611e7
unit to iunit in subroutines that use the keyword unit as variable na…
abrooks1085 Oct 12, 2023
2a5c536
unit to iunit in subroutines that use the keyword unit as name for va…
abrooks1085 Oct 12, 2023
884c6c4
unit to iunit in subroutines that use the keyword unit as a variable …
abrooks1085 Oct 12, 2023
c08ca93
unit to iunit in subroutine MPP_READ_DISTRIBUTED_ASCII_1D_ in mpp/inc…
abrooks1085 Oct 12, 2023
511736c
unit to iunit in mpp/include/mpp_write.fh
abrooks1085 Oct 12, 2023
a40b1fe
unit to iunit in subroutines that use the keyword unit as a variable …
abrooks1085 Oct 12, 2023
01181d3
unit to iunit in subroutines that use the keyword unit as a variable …
abrooks1085 Oct 12, 2023
bc86e63
unit to iunit in mpp/include/mpp_write_unlimited_axis.fh
abrooks1085 Oct 12, 2023
948e408
unit to iunit
abrooks1085 Oct 17, 2023
d65a4c7
unit to iunit in subroutines that use the keyword unit as a variable …
abrooks1085 Oct 17, 2023
4fb6983
unit to iunit in fms/write_data.inc
abrooks1085 Oct 17, 2023
4177859
unit to iunit subroutines that use the keyword unit as a variable nam…
abrooks1085 Oct 17, 2023
e845181
unit to iunit in time_interp/time_interp_external.F90
abrooks1085 Oct 17, 2023
5143adb
split line into two to conform to style guide (Line lenghth <= 120).
abrooks1085 Oct 17, 2023
aa35299
Removed unit keyword replacement for deprecated files
abrooks1085 Oct 19, 2023
225101e
remove trailing white space
abrooks1085 Oct 20, 2023
577cfd7
Remove changes from deprecated files
abrooks1085 Nov 9, 2023
c433e92
Removed unit variable name change for optional variables
abrooks1085 Nov 13, 2023
c2e03cd
Merge branch 'main' into keyword_unit
abrooks1085 Nov 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions affinity/fms_affinity.F90
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ subroutine fms_affinity_init()
!--- local variables
integer:: io_stat
integer:: ierr
integer:: unit
integer:: iunit

!--- return if module is initialized
if (module_is_initialized) return
Expand All @@ -105,8 +105,8 @@ subroutine fms_affinity_init()

!--- output information to logfile
call write_version_number("fms_affinity_mod", version)
unit = stdlog()
write(unit,nml=fms_affinity_nml)
iunit = stdlog()
write(iunit,nml=fms_affinity_nml)

module_is_initialized = .TRUE.

Expand Down
8 changes: 4 additions & 4 deletions amip_interp/amip_interp.F90
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ module amip_interp_mod
! ---- global unit & date ----

integer, parameter :: maxc = 128
integer :: unit
integer :: iunit
character(len=maxc) :: file_name_sst, file_name_ice
type(FmsNetcdfFile_t), target :: fileobj_sst, fileobj_ice

Expand Down Expand Up @@ -367,7 +367,7 @@ module amip_interp_mod

!> initialize @ref amip_interp_mod for use
subroutine amip_interp_init
integer :: unit,io,ierr
integer :: iunit,io,ierr

!-----------------------------------------------------------------------

Expand All @@ -381,9 +381,9 @@ subroutine amip_interp_init
! ----- write namelist/version info -----
call write_version_number("AMIP_INTERP_MOD", version)

unit = stdlog ( )
iunit = stdlog ( )
if (mpp_pe() == 0) then
write (unit,nml=amip_interp_nml)
write (iunit,nml=amip_interp_nml)
endif

if (use_mpp_io) then
Expand Down
6 changes: 3 additions & 3 deletions amip_interp/include/amip_interp.inc
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ subroutine GET_AMIP_SST_ (Time, Interp, sst, err_msg, lon_model, lat_model)
! end add by JHC
logical, parameter :: DEBUG = .false. !> switch for debugging output
!> These are fms_io specific
integer :: unit
integer :: iunit
integer, parameter :: lkind = FMS_AMIP_INTERP_KIND_

if(present(err_msg)) err_msg = ''
Expand Down Expand Up @@ -103,7 +103,7 @@ if ( .not.use_daily ) then
Date2 = date_type( year2, month2, 0 )

! -- open/rewind file --
unit = -1
iunit = -1
!-----------------------------------------------------------------------

if (Date1 /= Interp%Date1) then
Expand Down Expand Up @@ -368,7 +368,7 @@ else
Date1 = date_type( year1, month1, 0 )
Date2 = date_type( year2, month2, 0 )

unit = -1
iunit = -1
!-----------------------------------------------------------------------

if (Date1 /= Interp%Date1) then
Expand Down
6 changes: 3 additions & 3 deletions astronomy/astronomy.F90
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ subroutine astronomy_init (latb, lonb)
!-------------------------------------------------------------------
! local variables:
!-------------------------------------------------------------------
integer :: unit, ierr, io, seconds, days, jd, id
integer :: iunit, ierr, io, seconds, days, jd, id
character(len=17) :: err_str

!-------------------------------------------------------------------
Expand All @@ -463,8 +463,8 @@ subroutine astronomy_init (latb, lonb)
!---------------------------------------------------------------------
call write_version_number("ASTRONOMY_MOD", version)
if (mpp_pe() == mpp_root_pe() ) then
unit = stdlog()
write (unit, nml=astronomy_nml)
iunit = stdlog()
write (iunit, nml=astronomy_nml)
endif
!--------------------------------------------------------------------
!> Be sure input values are within valid ranges.
Expand Down
24 changes: 12 additions & 12 deletions axis_utils/axis_utils.F90
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ end subroutine tranlon
!!
!! @return real frac_index
function frac_index (value, array)
integer :: ia, i, ii, unit
integer :: ia, i, ii, iunit
real :: value !< arbitrary data...same units as elements in "array"
real :: frac_index
real, dimension(:) :: array !< array of data points (must be monotonically increasing)
Expand All @@ -415,13 +415,13 @@ function frac_index (value, array)

do i=2,ia
if (array(i) < array(i-1)) then
unit = stdout()
write (unit,*) &
iunit = stdout()
write (iunit,*) &
'=> Error: "frac_index" array must be monotonically increasing when searching for nearest value to ', value
write (unit,*) ' array(i) < array(i-1) for i=',i
write (unit,*) ' array(i) for i=1..ia follows:'
write (iunit,*) ' array(i) < array(i-1) for i=',i
write (iunit,*) ' array(i) for i=1..ia follows:'
do ii=1,ia
write (unit,*) 'i=',ii, ' array(i)=',array(ii)
write (iunit,*) 'i=',ii, ' array(i)=',array(ii)
enddo
call mpp_error(FATAL,' "frac_index" array must be monotonically increasing.')
endif
Expand Down Expand Up @@ -489,7 +489,7 @@ function nearest_index (value, array)
!! if "value" is outside the domain of "array" then nearest_index = 1
!! or "ia" depending on whether array(1) or array(ia) is
!! closest to "value"
Integer :: i, ii, unit
Integer :: i, ii, iunit
integer :: ia !< dimension of "array"
real :: value !< arbitrary data...same units as elements in "array"
real, dimension(:) :: array !< array of data points (must be monotonically increasing)
Expand All @@ -499,13 +499,13 @@ function nearest_index (value, array)

do i=2,ia
if (array(i) < array(i-1)) then
unit = stdout()
write (unit,*) '=> Error: "nearest_index" array must be monotonically increasing &
iunit = stdout()
write (iunit,*) '=> Error: "nearest_index" array must be monotonically increasing &
&when searching for nearest value to ',value
write (unit,*) ' array(i) < array(i-1) for i=',i
write (unit,*) ' array(i) for i=1..ia follows:'
write (iunit,*) ' array(i) < array(i-1) for i=',i
write (iunit,*) ' array(i) for i=1..ia follows:'
do ii=1,ia
write (unit,*) 'i=',ii, ' array(i)=',array(ii)
write (iunit,*) 'i=',ii, ' array(i)=',array(ii)
enddo
call mpp_error(FATAL,' "nearest_index" array must be monotonically increasing.')
endif
Expand Down
24 changes: 12 additions & 12 deletions axis_utils/include/axis_utils2.inc
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@

function FRAC_INDEX_(value, array)

integer :: ia, i, ii, unit
integer :: ia, i, ii, iunit
real(kind=FMS_AU_KIND_) :: value !< arbitrary data...same units as elements in "array"
real(kind=FMS_AU_KIND_) :: FRAC_INDEX_
real(kind=FMS_AU_KIND_), dimension(:) :: array !< array of data points (must be monotonically increasing)
Expand All @@ -230,13 +230,13 @@

do i = 2, ia
if (array(i) < array(i-1)) then
unit = stdout()
write (unit,*) '=> Error: "frac_index" array must be monotonically' &
iunit = stdout()
write (iunit,*) '=> Error: "frac_index" array must be monotonically' &
& // 'increasing when searching for nearest value to ', value
write (unit,*) ' array(i) < array(i-1) for i=',i
write (unit,*) ' array(i) for i=1..ia follows:'
write (iunit,*) ' array(i) < array(i-1) for i=',i
write (iunit,*) ' array(i) for i=1..ia follows:'
do ii = 1, ia
write (unit,*) 'i=',ii, ' array(i)=',array(ii)
write (iunit,*) 'i=',ii, ' array(i)=',array(ii)
enddo
call mpp_error(FATAL,' "frac_index" array must be monotonically increasing.')
endif
Expand Down Expand Up @@ -302,7 +302,7 @@

integer :: NEAREST_INDEX_
integer :: ia !< dimension of "array"
integer :: i, ii, unit
integer :: i, ii, iunit
real(kind=FMS_AU_KIND_) :: value !< arbitrary data...same units as elements in "array"
real(kind=FMS_AU_KIND_), dimension(:) :: array !< array of data points (must be monotonically increasing)
logical :: keep_going
Expand All @@ -311,13 +311,13 @@

do i = 2, ia
if (array(i) < array(i-1)) then
unit = stdout()
write (unit,*) '=> Error: "nearest_index" array must be monotonically increasing' &
iunit = stdout()
write (iunit,*) '=> Error: "nearest_index" array must be monotonically increasing' &
& // 'when searching for nearest value to ', value
write (unit,*) ' array(i) < array(i-1) for i=',i
write (unit,*) ' array(i) for i=1..ia follows:'
write (iunit,*) ' array(i) < array(i-1) for i=',i
write (iunit,*) ' array(i) for i=1..ia follows:'
do ii = 1, ia
write (unit,*) 'i=',ii, ' array(i)=', array(ii)
write (iunit,*) 'i=',ii, ' array(i)=', array(ii)
enddo
call mpp_error(FATAL,' "nearest_index" array must be monotonically increasing.')
endif
Expand Down
6 changes: 3 additions & 3 deletions column_diagnostics/column_diagnostics.F90
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ subroutine column_diagnostics_init
!--------------------------------------------------------------------
! local variables:
!
integer :: unit !< unit number for nml file
integer :: iunit !< unit number for nml file
integer :: ierr !< error return flag
integer :: io !< error return code

Expand Down Expand Up @@ -164,8 +164,8 @@ subroutine column_diagnostics_init
!---------------------------------------------------------------------
call write_version_number("COLUMN_DIAGNOSTICS_MOD", version)
if (mpp_pe() == mpp_root_pe()) then
unit = stdlog()
write (unit, nml=column_diagnostics_nml)
iunit = stdlog()
write (iunit, nml=column_diagnostics_nml)
endif
!--------------------------------------------------------------------
module_is_initialized = .true.
Expand Down
6 changes: 3 additions & 3 deletions data_override/include/data_override.inc
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ subroutine DATA_OVERRIDE_INIT_IMPL_(Atm_domain_in, Ocean_domain_in, Ice_domain_i

character(len=128) :: grid_file = 'INPUT/grid_spec.nc'
integer :: is,ie,js,je,use_get_grid_version
integer :: i, unit, io_status, ierr
integer :: i, iunit, io_status, ierr
logical :: atm_on, ocn_on, lnd_on, ice_on, lndUG_on
logical :: file_open
type(FmsNetcdfFile_t) :: fileobj
Expand All @@ -156,8 +156,8 @@ subroutine DATA_OVERRIDE_INIT_IMPL_(Atm_domain_in, Ocean_domain_in, Ice_domain_i

read (input_nml_file, data_override_nml, iostat=io_status)
ierr = check_nml_error(io_status, 'data_override_nml')
unit = stdlog()
write(unit, data_override_nml)
iunit = stdlog()
write(iunit, data_override_nml)

! grid_center_bug is no longer supported.
if (grid_center_bug) then
Expand Down
6 changes: 3 additions & 3 deletions exchange/xgrid.F90
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ subroutine xgrid_init(remap_method)
integer, intent(out) :: remap_method !< exchange grid interpolation method. It has four possible values:
!! FIRST_ORDER (=1), SECOND_ORDER(=2).

integer :: unit, ierr, io, out_unit
integer :: iunit, ierr, io, out_unit

if (module_is_initialized) return
module_is_initialized = .TRUE.
Expand All @@ -534,9 +534,9 @@ subroutine xgrid_init(remap_method)
!--------- write version number and namelist ------------------
call write_version_number("XGRID_MOD", version)

unit = stdlog ( )
iunit = stdlog ( )
out_unit = stdout()
if ( mpp_pe() == mpp_root_pe() ) write (unit,nml=xgrid_nml)
if ( mpp_pe() == mpp_root_pe() ) write (iunit,nml=xgrid_nml)

if (use_mpp_io) then
! FATAL error if trying to use mpp_io
Expand Down
Loading
Loading