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

Jump to bottom

GNU -Wall Warning Reduction: ampersand and tabs #425

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

GNU -Wall Warning Reduction: ampersand and tabs #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bebb821
Fixed GNU warning 'Warning: Missing '&' in continued character consta…
scrasmussen Jan 15, 2024
4ce0db3
Fixing 'Warning: Nonconforming tab character at (1) [-Wtabs]' warning…
scrasmussen Jan 14, 2024
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
2 changes: 1 addition & 1 deletion scm/src/GFS_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5087,7 +5087,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
if ( Model%do_ugwp_v1_w_gsldrag) then
if(Model%gwd_opt == 1 )then
Model%gwd_opt =2
Model%nmtvr = 24
Model%nmtvr = 24
endif
Model%do_gsl_drag_ls_bl = .true.
Model%do_gsl_drag_tofd = .true.
Expand Down
2 changes: 1 addition & 1 deletion scm/src/scm_forcing.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ subroutine interpolate_forcing(scm_input, scm_state, in_spinup)
if(scm_state%model_time >= scm_input%input_time(scm_input%input_ntimes)) then
!> - If so, hold the forcing terms constant at the last supplied values. The forcing still needs to be interpolated to the grid.
write(*,*) "The model_time has exceeded the specifed period of forcing. Forcing will now be held constant at the last &
specified values."
&specified values."

if(scm_state%input_type == 0) then

Expand Down
56 changes: 28 additions & 28 deletions scm/src/scm_input.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ subroutine get_case_init(scm_state, scm_input)
else
call check(NF90_INQUIRE_DIMENSION(ncid, varID, tmpName, input_nsoilcat),"nf90_inq_dim(nsoilcat)")
end if

!> - Allocate the dimension variables.
allocate(input_pres(input_nlev),input_time(input_ntimes), stat=allocate_status)

Expand Down Expand Up @@ -732,7 +732,7 @@ subroutine get_case_init(scm_state, scm_input)
call check(NF90_CLOSE(NCID=ncid),"nf90_close()")

call scm_input%create(input_ntimes, input_nlev, input_nsoil, input_nsnow, input_nice, input_nvegcat, input_nsoilcat)

! GJF already done in scm_input%create routine
!scm_input%input_nlev = input_nlev
!scm_input%input_ntimes = input_ntimes
Expand Down Expand Up @@ -1072,7 +1072,7 @@ subroutine get_case_init_DEPHY(scm_state, scm_input)
real(kind=dp), allocatable :: input_lakedepth(:) !< lake depth (m)
real(kind=dp), allocatable :: input_vegtype_frac(:,:) !< fraction of horizontal grid area occupied by given vegetation category
real(kind=dp), allocatable :: input_soiltype_frac(:,:) !< fraction of horizontal grid area occupied by given soil category

real(kind=dp), allocatable :: input_tvxy(:) !< vegetation temperature (K)
real(kind=dp), allocatable :: input_tgxy(:) !< ground temperature for Noahmp (K)
real(kind=dp), allocatable :: input_tahxy(:) !< canopy air temperature (K)
Expand Down Expand Up @@ -1188,7 +1188,7 @@ subroutine get_case_init_DEPHY(scm_state, scm_input)
logical :: needed_for_lsm_ics, needed_for_model_ics, lev_in_altitude

integer :: input_n_init_times, input_n_forcing_times, input_n_lev, input_n_snow, input_n_ice, input_n_soil, input_nvegcat, input_nsoilcat

missing_value_eps = missing_value + 0.01

!> - Open the case input file found in the processed_case_input dir corresponding to the experiment name.
Expand All @@ -1215,7 +1215,7 @@ subroutine get_case_init_DEPHY(scm_state, scm_input)
write(0,'(a,i0,a)') "The variable 'lev' in the case data file had units different than 'm', 'pa', or 'Pa', but it is expected to be altitude in m or pressure in Pa. Stopping..."
STOP
end if

!### TO BE USED IF DEPHY-SCM can be extended to include model ICs ###
!possible dimensions (if using model ICs)
ierr = NF90_INQ_DIMID(ncid,"nsoil",varID)
Expand Down Expand Up @@ -1247,8 +1247,8 @@ subroutine get_case_init_DEPHY(scm_state, scm_input)
input_nsoilcat = missing_nsoilcat
else
call check(NF90_INQUIRE_DIMENSION(ncid, varID, tmpName, input_nsoilcat),"nf90_inq_dim(nsoilcat)")
end if
end if

!> - Allocate the dimension variables.
allocate(input_t0 (input_n_init_times), &
input_time (input_n_forcing_times), &
Expand Down Expand Up @@ -1501,14 +1501,14 @@ subroutine get_case_init_DEPHY(scm_state, scm_input)
input_sfalb_ice ( input_n_init_times), &
input_emis_ice ( input_n_init_times), &
stat=allocate_status)

needed_for_lsm_ics = .False.
needed_for_model_ics = .False.
if (scm_state%lsm_ics .or. trim(input_surfaceForcingLSM) == "lsm") needed_for_lsm_ics = .True.
if (scm_state%model_ics) needed_for_model_ics = .True.

!> - Read in the initial profiles.

if (lev_in_altitude) then
call NetCDF_read_var(ncid, "pa", .True., input_pres)
!zh could be defined in addition to lev, use if so
Expand All @@ -1532,7 +1532,7 @@ subroutine get_case_init_DEPHY(scm_state, scm_input)
end do
end if
end if

call NetCDF_read_var(ncid, "ps", .True., input_pres_surf)
call NetCDF_read_var(ncid, "ua", .True., input_u)
call NetCDF_read_var(ncid, "va", .True., input_v)
Expand All @@ -1553,7 +1553,7 @@ subroutine get_case_init_DEPHY(scm_state, scm_input)
call NetCDF_read_var(ncid, "ri", .False., input_ri)
call NetCDF_read_var(ncid, "hur", .False., input_rh)
call NetCDF_read_var(ncid, "tke", .False., input_tke)

call NetCDF_read_var(ncid, "o3", .False., input_ozone)
call NetCDF_read_var(ncid, "area", .False., input_area)
!orographic parameters
Expand All @@ -1578,7 +1578,7 @@ subroutine get_case_init_DEPHY(scm_state, scm_input)
call NetCDF_read_var(ncid, "lakedepth", needed_for_model_ics, input_lakedepth)
call NetCDF_read_var(ncid, "vegtype_frac", needed_for_model_ics, input_vegtype_frac)
call NetCDF_read_var(ncid, "soiltype_frac", needed_for_model_ics, input_soiltype_frac)

!NSST variables
call NetCDF_read_var(ncid, "tref", needed_for_model_ics, input_tref)
call NetCDF_read_var(ncid, "z_c", needed_for_model_ics, input_z_c)
Expand All @@ -1598,8 +1598,8 @@ subroutine get_case_init_DEPHY(scm_state, scm_input)
call NetCDF_read_var(ncid, "ifd", needed_for_model_ics, input_ifd)
call NetCDF_read_var(ncid, "dt_cool", needed_for_model_ics, input_dt_cool)
call NetCDF_read_var(ncid, "qrain", needed_for_model_ics, input_qrain)


!> - Allocate the forcing variables.

!allocate all, but conditionally read forcing variables given global atts; set unused forcing variables to missing
Expand Down Expand Up @@ -1666,7 +1666,7 @@ subroutine get_case_init_DEPHY(scm_state, scm_input)
end do
end do
end if

!conditionally read forcing vars (or set to missing); if the global attribute is set to expect a variable and it doesn't exist, stop the model
call NetCDF_conditionally_read_var(adv_u, "adv_ua", "tnua_adv", trim(adjustl(scm_state%case_name))//'.nc', ncid, input_force_u_adv)
call NetCDF_conditionally_read_var(adv_v, "adv_va", "tnva_adv", trim(adjustl(scm_state%case_name))//'.nc', ncid, input_force_v_adv)
Expand Down Expand Up @@ -1735,13 +1735,13 @@ subroutine get_case_init_DEPHY(scm_state, scm_input)
!
! Surface forcing Model LSM ICs
!

call NetCDF_read_var(ncid, "stc", .False., input_stc)
call NetCDF_read_var(ncid, "smc", .False., input_smc)
call NetCDF_read_var(ncid, "slc", .False., input_slc)

call NetCDF_read_var(ncid, "tiice", .False., input_tiice)

call NetCDF_read_var(ncid, "vegsrc", .False., input_vegsrc )
call NetCDF_read_var(ncid, "vegtyp", .False., input_vegtyp )
call NetCDF_read_var(ncid, "soiltyp", .False., input_soiltyp )
Expand Down Expand Up @@ -1779,14 +1779,14 @@ subroutine get_case_init_DEPHY(scm_state, scm_input)
call NetCDF_read_var(ncid, "zorll", .False., input_zorll)
call NetCDF_read_var(ncid, "zorli", .False., input_zorli)
call NetCDF_read_var(ncid, "zorlw", .False., input_zorlw)

!NoahMP parameters
call NetCDF_read_var(ncid, "snicexy", .False., input_snicexy)
call NetCDF_read_var(ncid, "snliqxy", .False., input_snliqxy)
call NetCDF_read_var(ncid, "tsnoxy", .False., input_tsnoxy )
call NetCDF_read_var(ncid, "smoiseq", .False., input_smoiseq)
call NetCDF_read_var(ncid, "zsnsoxy", .False., input_zsnsoxy)

call NetCDF_read_var(ncid, "tvxy", .False., input_tvxy)
call NetCDF_read_var(ncid, "tgxy", .False., input_tgxy)
call NetCDF_read_var(ncid, "tahxy", .False., input_tahxy)
Expand Down Expand Up @@ -1836,12 +1836,12 @@ subroutine get_case_init_DEPHY(scm_state, scm_input)
call NetCDF_read_var(ncid, "sfalb_lnd_bck", .False., input_sfalb_lnd_bck)
call NetCDF_read_var(ncid, "emis_ice", .False., input_emis_ice)
call NetCDF_read_var(ncid, "lai", .False., input_lai)


call check(NF90_CLOSE(NCID=ncid),"nf90_close()")

call scm_input%create(input_n_forcing_times, input_n_lev, input_n_soil, input_n_snow, input_n_ice, input_nvegcat, input_nsoilcat)

!fill the scm_input DDT

!There may need to be logic to control which of the lon, lat, and init_times to use in the future, but for now, just take the first
Expand Down Expand Up @@ -2090,7 +2090,7 @@ subroutine get_case_init_DEPHY(scm_state, scm_input)
scm_input%input_lakedepth= input_lakedepth(active_init_time)
scm_input%input_vegtype_frac = input_vegtype_frac(:,active_init_time)
scm_input%input_soiltype_frac = input_soiltype_frac(:,active_init_time)

scm_input%input_tref = input_tref(active_init_time)
scm_input%input_z_c = input_z_c(active_init_time)
scm_input%input_c_0 = input_c_0(active_init_time)
Expand Down Expand Up @@ -2240,7 +2240,7 @@ subroutine get_case_init_DEPHY(scm_state, scm_input)
scm_input%input_lh_flux_sfc = input_force_sfc_lat_flx(:)
end if
end if

if (trim(input_surfaceForcingLSM) == 'lsm') then
!these were considered required variables above, so they should not need to be checked for missing
scm_input%input_stc = input_stc(:,active_init_time)
Expand Down Expand Up @@ -2748,7 +2748,7 @@ subroutine get_reference_profile(scm_state, scm_reference)
open(unit=1, file='McCProfiles.dat', status='old', action='read', iostat=ioerror)
if(ioerror /= 0) then
write(*,*) 'There was an error opening the file McCprofiles.dat in the processed_case_input directory. &
Error code = ',ioerror
&Error code = ',ioerror
error stop "There was an error opening the file McCprofiles.dat in the processed_case_input directory."
endif

Expand Down
2 changes: 1 addition & 1 deletion scm/src/scm_vgrid.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ subroutine get_FV3_vgrid(scm_input, scm_state)
open(unit=1, file=scm_state%vert_coord_file, status='old', action='read', iostat=ierr)
if(ierr /= 0) then
write(*,*) 'There was an error opening the file ', scm_state%vert_coord_file, ' in the run directory. &
Error code = ',ierr
&Error code = ',ierr
error stop
endif

Expand Down
Loading