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.

Sign up for GitHub

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

add missed routine prefixes from libfms #87

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add missed routine prefixes from libfms #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions SHiELD/coupler_main.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ subroutine coupler_init
!----- read namelist -------
!----- for backwards compatibilty read from file coupler.nml -----
read(fms_mpp_input_nml_file, nml=coupler_nml, iostat=io)
ierr = check_nml_error(io, 'coupler_nml')
ierr = fms_check_nml_error(io, 'coupler_nml')

!----- write namelist to logfile -----
call fms_write_version_number (version, tag)
Expand All @@ -241,7 +241,7 @@ subroutine coupler_init
!----- use namelist value (either no restart or override flag on) ---
if ( force_date_from_namelist ) then
if ( sum(current_date) <= 0 ) then
call error_mesg ('program coupler', &
call fms_error_mesg ('program coupler', &
'no namelist value for current_date', FATAL)
else
date = current_date
Expand Down Expand Up @@ -299,7 +299,7 @@ subroutine coupler_init
!
! (NOTE: if run length in months then starting day must be <= 28)
if ( months > 0 .and. date(3) > 28 ) &
call error_mesg ('program coupler', &
call fms_error_mesg ('program coupler', &
'if run length in months then starting day must be <= 28', FATAL)

Time_end = Time_atmos
Expand Down Expand Up @@ -365,19 +365,19 @@ subroutine coupler_init

!----- initial time cannot be greater than current time -------

if ( Time_init > Time_atmos ) call error_mesg ('program coupler', &
if ( Time_init > Time_atmos ) call fms_error_mesg ('program coupler', &
'initial time is greater than current time', FATAL)

!----- make sure run length is a multiple of ocean time step ------

if ( num_cpld_calls * Time_step_ocean /= Run_length ) &
call error_mesg ('program coupler', &
call fms_error_mesg ('program coupler', &
'run length must be multiple of ocean time step', FATAL)

! ---- make sure cpld time step is a multiple of atmos time step ----

if ( num_atmos_calls * Time_step_atmos /= Time_step_ocean ) &
call error_mesg ('program coupler', &
call fms_error_mesg ('program coupler', &
'atmos time step is not a multiple of the ocean time step', FATAL)

!------ initialize component models ------
Expand Down Expand Up @@ -449,7 +449,7 @@ subroutine coupler_end

!----- check time versus expected ending time ----

if (Time_atmos /= Time_end) call error_mesg ('program coupler', &
if (Time_atmos /= Time_end) call fms_error_mesg ('program coupler', &
'final time does not match expected ending time', WARNING)

!----- write restart file ------
Expand Down
8 changes: 4 additions & 4 deletions full/atm_land_ice_flux_exchange.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,12 +422,12 @@ subroutine atm_land_ice_flux_exchange_init(Time, Atm, Land, Ice, atmos_ice_bound
enddo

if (isphum==NO_TRACER) then
call error_mesg('atm_land_ice_flux_exchange_mod',&
call fms_error_mesg('atm_land_ice_flux_exchange_mod',&
'tracer "sphum" must be present in the atmosphere', FATAL )
endif

if (ico2==NO_TRACER) then
call error_mesg('atm_land_ice_flux_exchange_mod',&
call fms_error_mesg('atm_land_ice_flux_exchange_mod',&
'tracer "co2" not present in the atmosphere', NOTE )
endif

Expand Down Expand Up @@ -715,7 +715,7 @@ subroutine sfc_boundary_layer ( dt, Time, Atm, Land, Ice, Land_Ice_Atmos_Boundar
integer :: isc,iec,jsc,jec

! [1] check that the module was initialized
if (do_init) call error_mesg ('atm_land_ice_flux_exchange_mod', &
if (do_init) call fms_error_mesg ('atm_land_ice_flux_exchange_mod', &
'must call atm_land_ice_flux_exchange_init first', FATAL)
!Balaji
call fms_mpp_clock_begin(cplClock)
Expand Down Expand Up @@ -3698,7 +3698,7 @@ subroutine diag_field_init ( Time, atmos_axes, land_axes, land_pe )
! needed for cmorizing various diagnostics.
!--------------------------------------------------------------------
area_id = fms_diag_get_field_id ('dynamics', 'area')
if (area_id .eq. DIAG_FIELD_NOT_FOUND) call error_mesg &
if (area_id .eq. DIAG_FIELD_NOT_FOUND) call fms_error_mesg &
('diag_field_init in atm_land_ice_flux_exchange_mod', &
'diagnostic field "dynamics", "area" is not in the diag_table', NOTE)

Expand Down
12 changes: 6 additions & 6 deletions full/coupler_main.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,7 +1208,7 @@ subroutine coupler_init
!----- read namelist -------

read (fms_mpp_input_nml_file, coupler_nml, iostat=io)
ierr = check_nml_error (io, 'coupler_nml')
ierr = fms_check_nml_error (io, 'coupler_nml')

!----- read date and calendar type from restart file -----
if (fms2_io_file_exists('INPUT/coupler.res')) then
Expand All @@ -1226,7 +1226,7 @@ subroutine coupler_init
if ( force_date_from_namelist ) then

if ( sum(current_date) <= 0 ) then
call error_mesg ('program coupler', &
call fms_error_mesg ('program coupler', &
'no namelist value for base_date or current_date', FATAL)
else
date = current_date
Expand Down Expand Up @@ -1658,19 +1658,19 @@ subroutine coupler_init

!----- initial time cannot be greater than current time -------

if ( Time_init > Time ) call error_mesg ('program coupler', &
if ( Time_init > Time ) call fms_error_mesg ('program coupler', &
'initial time is greater than current time', FATAL)

!----- make sure run length is a multiple of ocean time step ------

if ( num_cpld_calls * Time_step_cpld /= Run_length ) &
call error_mesg ('program coupler', &
call fms_error_mesg ('program coupler', &
'run length must be multiple of coupled time step', FATAL)

! ---- make sure cpld time step is a multiple of atmos time step ----

if ( num_atmos_calls * Time_step_atmos /= Time_step_cpld ) &
call error_mesg ('program coupler', &
call fms_error_mesg ('program coupler', &
'cpld time step is not a multiple of the atmos time step', FATAL)

!
Expand Down Expand Up @@ -1979,7 +1979,7 @@ subroutine coupler_end()

!----- check time versus expected ending time ----

if (Time /= Time_end) call error_mesg ('program coupler', &
if (Time /= Time_end) call fms_error_mesg ('program coupler', &
'final time does not match expected ending time', WARNING)

!-----------------------------------------------------------------------
Expand Down
26 changes: 13 additions & 13 deletions full/flux_exchange.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,17 +728,17 @@ subroutine flux_exchange_init ( Time, Atm, Land, Ice, Ocean, Ocean_state,&
!----- read namelist -------

read (fms_mpp_input_nml_file, flux_exchange_nml, iostat=io)
ierr = check_nml_error (io, 'flux_exchange_nml')
ierr = fms_check_nml_error (io, 'flux_exchange_nml')

!----- write namelist to logfile -----
call fms_write_version_number (version, tag)
if( fms_mpp_pe() == fms_mpp_root_pe() )write( logunit, nml=flux_exchange_nml )
if(nblocks<1) call error_mesg ('flux_exchange_mod', &
if(nblocks<1) call fms_error_mesg ('flux_exchange_mod', &
'flux_exchange_nml nblocks must be positive', FATAL)
if(nblocks .NE. nthreads) then
write(errmsg, '(a,i3,a,i3)')'flux_exchange_nml nblocks is set to ', nblocks, &
' is different from the default value (number of threads) = ', nthreads
call error_mesg ('flux_exchange_mod', errmsg, NOTE)
call fms_error_mesg ('flux_exchange_mod', errmsg, NOTE)
endif

! required by stock_move, all fluxes used to update stocks will be zero if dt_atmos,
Expand Down Expand Up @@ -904,12 +904,12 @@ subroutine check_atm_grid(Atm, grid_file)
call fms_mpp_get_current_pelist(pes)

if ( .not. fms2_io_open_file(grid_file_obj, grid_file, "read", pelist=pes)) then
call error_mesg ('atm_land_ice_flux_exchange_mod', &
call fms_error_mesg ('atm_land_ice_flux_exchange_mod', &
& 'Error opening '//trim(grid_file), FATAL)
endif

if(size(Atm%lon_bnd,1) .NE. iec-isc+2 .OR. size(Atm%lon_bnd,2) .NE. jec-jsc+2) then
call error_mesg ('atm_land_ice_flux_exchange_mod', &
call fms_error_mesg ('atm_land_ice_flux_exchange_mod', &
'size of Atm%lon_bnd does not match the Atm computational domain', FATAL)
endif
ioff = lbound(Atm%lon_bnd,1) - isc
Expand All @@ -926,7 +926,7 @@ subroutine check_atm_grid(Atm, grid_file)
'atmosphere has', nxg, 'longitudes,', &
nyg, 'latitudes (see xba.dat and yba.dat)'
end if
call error_mesg ('atm_land_ice_flux_exchange_mod', &
call fms_error_mesg ('atm_land_ice_flux_exchange_mod', &
'grid_spec.nc incompatible with atmosphere resolution', FATAL)
end if
allocate( atmlonb(isg:ieg+1) )
Expand All @@ -938,7 +938,7 @@ subroutine check_atm_grid(Atm, grid_file)
if(abs(atmlonb(i)-Atm%lon_bnd(i+ioff,jsc+joff)*45.0/atan(1.0))>bound_tol) then
print *, 'GRID_SPEC/ATMOS LONGITUDE INCONSISTENCY at i= ',i, ': ', &
atmlonb(i), Atm%lon_bnd(i+ioff,jsc+joff)*45.0/atan(1.0)
call error_mesg ('atm_land_ice_flux_exchange_mod', &
call fms_error_mesg ('atm_land_ice_flux_exchange_mod', &
'grid_spec.nc incompatible with atmosphere longitudes (see xba.dat and yba.dat)'&
, FATAL)
endif
Expand All @@ -947,7 +947,7 @@ subroutine check_atm_grid(Atm, grid_file)
if(abs(atmlatb(j)-Atm%lat_bnd(isc+ioff,j+joff)*45.0/atan(1.0))>bound_tol) then
print *, 'GRID_SPEC/ATMOS LATITUDE INCONSISTENCY at j= ',j, ': ', &
atmlatb(j), Atm%lat_bnd(isc+ioff, j+joff)*45.0/atan(1.0)
call error_mesg ('atm_land_ice_flux_exchange_mod', &
call fms_error_mesg ('atm_land_ice_flux_exchange_mod', &
'grid_spec.nc incompatible with atmosphere latitudes (see xba.dat and yba.dat)'&
, FATAL)
endif
Expand All @@ -957,7 +957,7 @@ subroutine check_atm_grid(Atm, grid_file)
call fms2_io_read_data(grid_file_obj, 'atm_mosaic_file', atm_mosaic_file)

if ( .not. fms2_io_open_file(atm_mosaic_file_obj, "INPUT/"//trim(atm_mosaic_file)//"", "read", pelist=pes)) then
call error_mesg ('atm_land_ice_flux_exchange_mod', &
call fms_error_mesg ('atm_land_ice_flux_exchange_mod', &
& 'Error opening '//trim(atm_mosaic_file), FATAL)
endif

Expand Down Expand Up @@ -985,7 +985,7 @@ subroutine check_atm_grid(Atm, grid_file)

!< This is will open the correct atm_mosaic_file for the current tile, i.e "C96_grid.tile1.nc"
if ( .not. fms2_io_open_file(tile_file_obj, "INPUT/"//trim(tile_file)//"", "read", domain2)) then
call error_mesg ('atm_land_ice_flux_exchange_mod', &
call fms_error_mesg ('atm_land_ice_flux_exchange_mod', &
& 'Error opening '//trim(tile_file), FATAL)
endif

Expand All @@ -1002,7 +1002,7 @@ subroutine check_atm_grid(Atm, grid_file)
print *, 'atmosphere mosaic tile has', nlon, 'longitudes,', nlat, 'latitudes; ', &
'atmosphere has', nxg, 'longitudes,', nyg, 'latitudes'
end if
call error_mesg ('atm_land_ice_flux_exchange_mod', &
call fms_error_mesg ('atm_land_ice_flux_exchange_mod', &
'atmosphere mosaic tile grid file incompatible with atmosphere resolution', FATAL)
end if

Expand All @@ -1028,14 +1028,14 @@ subroutine check_atm_grid(Atm, grid_file)
if (abs(tmpx(2*i-1,2*j-1)-Atm%lon_bnd(i+ioff,j+joff)*45.0/atan(1.0))>bound_tol) then
print *, 'GRID_SPEC/ATMOS LONGITUDE INCONSISTENCY at i= ',i, ', j= ', j, ': ', &
tmpx(2*i-1,2*j-1), Atm%lon_bnd(i+ioff,j+joff)*45.0/atan(1.0)
call error_mesg ('atm_land_ice_flux_exchange_mod', &
call fms_error_mesg ('atm_land_ice_flux_exchange_mod', &
'grid_spec.nc incompatible with atmosphere longitudes (see '//trim(tile_file)//')'&
,FATAL)
end if
if (abs(tmpy(2*i-1,2*j-1)-Atm%lat_bnd(i+ioff,j+joff)*45.0/atan(1.0))>bound_tol) then
print *, 'GRID_SPEC/ATMOS LATITUDE INCONSISTENCY at i= ',i, ', j= ', j, ': ', &
tmpy(2*i-1,2*j-1), Atm%lat_bnd(i+ioff,j+joff)*45.0/atan(1.0)
call error_mesg ('atm_land_ice_flux_exchange_mod', &
call fms_error_mesg ('atm_land_ice_flux_exchange_mod', &
'grid_spec.nc incompatible with atmosphere latitudes (see '//trim(tile_file)//')'&
,FATAL)
end if
Expand Down
2 changes: 1 addition & 1 deletion shared/surface_flux.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ subroutine surface_flux_init

! read namelist
read (fms_mpp_input_nml_file, surface_flux_nml, iostat=io)
ierr = check_nml_error(io,'surface_flux_nml')
ierr = fms_check_nml_error(io,'surface_flux_nml')

! write version number
call fms_write_version_number(version, tagname)
Expand Down
14 changes: 7 additions & 7 deletions simple/coupler_main.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ subroutine coupler_init
!----- for backwards compatibilty read from file coupler.nml -----

read (fms_mpp_input_nml_file, nml=coupler_nml, iostat=io)
ierr = check_nml_error(io, 'coupler_nml')
ierr = fms_check_nml_error(io, 'coupler_nml')

!----- write namelist to logfile -----

Expand Down Expand Up @@ -297,7 +297,7 @@ subroutine coupler_init
if ( force_date_from_namelist ) then

if ( sum(current_date) <= 0 ) then
call error_mesg ('program coupler', &
call fms_error_mesg ('program coupler', &
'no namelist value for current_date', FATAL)
else
date = current_date
Expand Down Expand Up @@ -365,7 +365,7 @@ subroutine coupler_init
! (NOTE: if run length in months then starting day must be <= 28)

if ( months > 0 .and. date(3) > 28 ) &
call error_mesg ('program coupler', &
call fms_error_mesg ('program coupler', &
'if run length in months then starting day must be <= 28', FATAL)

Time_end = Time_atmos
Expand Down Expand Up @@ -413,19 +413,19 @@ subroutine coupler_init

!----- initial time cannot be greater than current time -------

if ( Time_init > Time_atmos ) call error_mesg ('program coupler', &
if ( Time_init > Time_atmos ) call fms_error_mesg ('program coupler', &
'initial time is greater than current time', FATAL)

!----- make sure run length is a multiple of ocean time step ------

if ( num_cpld_calls * Time_step_ocean /= Run_length ) &
call error_mesg ('program coupler', &
call fms_error_mesg ('program coupler', &
'run length must be multiple of ocean time step', FATAL)

! ---- make sure cpld time step is a multiple of atmos time step ----

if ( num_atmos_calls * Time_step_atmos /= Time_step_ocean ) &
call error_mesg ('program coupler', &
call fms_error_mesg ('program coupler', &
'atmos time step is not a multiple of the ocean time step', FATAL)


Expand Down Expand Up @@ -491,7 +491,7 @@ subroutine coupler_end

!----- check time versus expected ending time ----

if (Time_atmos /= Time_end) call error_mesg ('program coupler', &
if (Time_atmos /= Time_end) call fms_error_mesg ('program coupler', &
'final time does not match expected ending time', WARNING)

!----- write restart file ------
Expand Down
12 changes: 6 additions & 6 deletions simple/flux_exchange.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ subroutine sfc_boundary_layer ( dt, Time, Atm, Land, Ice, Boundary )

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

if (do_init) call error_mesg ('sfc_boundary_layer', &
if (do_init) call fms_error_mesg ('sfc_boundary_layer', &
'must call simple_surface_init first', FATAL)

!-----------------------------------------------------------------------
Expand Down Expand Up @@ -685,13 +685,13 @@ subroutine flux_exchange_init ( Time, Atm, Land, Ice, &
num_prog=n_atm_tr)
isphum = fms_tracer_manager_get_tracer_index( MODEL_ATMOS, 'sphum' )
if (isphum==NO_TRACER) &
call error_mesg('flux_exchange_mod', 'Cannot find water vapor in ATM tracer table', FATAL)
call fms_error_mesg('flux_exchange_mod', 'Cannot find water vapor in ATM tracer table', FATAL)
!-----------------------------------------------------------------------
!------ allocate atmos_land_boundary ------

call fms_mpp_domains_get_compute_domain ( Land%Domain, isc, iec, jsc, jec )
if (isc /= is .or. iec /= ie .or. jsc /= js .or. jec /= je ) &
call error_mesg ('flux_exchange_init', 'land model '// &
call fms_error_mesg ('flux_exchange_init', 'land model '// &
'domain does not match atmosphere domain', FATAL)
kd = size(Land%mask,3) ! must be 1 (should check)
! allocate( atmos_land_boundary%t_flux (is:ie,js:je,kd) )
Expand Down Expand Up @@ -735,7 +735,7 @@ subroutine flux_exchange_init ( Time, Atm, Land, Ice, &

call fms_mpp_domains_get_compute_domain ( Ice%Domain, isc, iec, jsc, jec )
if (isc /= is .or. iec /= ie .or. jsc /= js .or. jec /= je ) &
call error_mesg ('flux_exchange_init', 'ice model '// &
call fms_error_mesg ('flux_exchange_init', 'ice model '// &
'domain does not match atmosphere domain', FATAL)

allocate( atmos_ice_boundary%u_star(is:ie,js:je) )
Expand Down Expand Up @@ -837,7 +837,7 @@ subroutine read_namelist
integer :: ierr, io

read (fms_mpp_input_nml_file, nml=flux_exchange_nml, iostat=io)
ierr = check_nml_error(io, 'flux_exchange_nml')
ierr = fms_check_nml_error(io, 'flux_exchange_nml')

do_read_nml = .false.

Expand Down Expand Up @@ -1056,7 +1056,7 @@ subroutine diag_field_init ( Time, atmos_axes )
! needed for cmorizing various diagnostics.
!--------------------------------------------------------------------
area_id = fms_diag_get_field_id ('dynamics', 'area')
if (area_id .eq. DIAG_FIELD_NOT_FOUND) call error_mesg &
if (area_id .eq. DIAG_FIELD_NOT_FOUND) call fms_error_mesg &
('diag_field_init in atm_land_ice_flux_exchange_mod', &
'diagnostic field "dynamics", "area" is not in the diag_table', NOTE)
!-----------------------------------------------------------------------
Expand Down
Loading