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

fix gnu compilation issues #32

Merged
merged 3 commits into from
Apr 22, 2020
Merged

fix gnu compilation issues #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
092fa60
remove a debug statement causing issues with GNU compilation
bensonr Apr 22, 2020
fdfe171
fix non-conformant if-tests in fv_restart.F90
bensonr Apr 22, 2020
756f1f7
move namelist specification to be above functional statements to fix …
bensonr Apr 22, 2020
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
1 change: 0 additions & 1 deletion model/fv_control.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,6 @@ subroutine setup_update_regions
upoff = Atm(this_grid)%neststruct%upoff

do n=2,ngrids
write(*,'(I, A, 4I)') mpp_pe(), 'SETUP_UPDATE_REGIONS 0: ', mpp_pe(), tile_coarse(n), Atm(this_grid)%global_tile
if (tile_coarse(n) == Atm(this_grid)%global_tile) then

isu = nest_ioffsets(n)
Expand Down
7 changes: 5 additions & 2 deletions tools/fv_restart.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,10 @@ module fv_restart_mod
! </DESCRIPTION>
!
subroutine fv_restart_init()

call fv_io_init()
module_is_initialized = .TRUE.

end subroutine fv_restart_init
! </SUBROUTINE> NAME="fv_restart_init"

Expand Down Expand Up @@ -179,6 +181,7 @@ subroutine fv_restart(fv_domain, Atm, dt_atmos, seconds, days, cold_start, grid_
!2. Register restarts
!--- call fv_io_register_restart to register restart field to be written out in fv_io_write_restart
if ( n==this_grid ) call fv_io_register_restart(Atm(n)%domain,Atm(n:n))

!if (Atm(n)%neststruct%nested) call fv_io_register_restart_BCs(Atm(n)) !TODO put into fv_io_register_restart


Expand Down Expand Up @@ -440,7 +443,7 @@ subroutine fv_restart(fv_domain, Atm, dt_atmos, seconds, days, cold_start, grid_


do n = ntileMe,1,-1
if (new_nest_topo(n)) then
if (new_nest_topo(n) > 0) then
call twoway_topo_update(Atm(n), n==this_grid)
endif
end do
Expand All @@ -465,7 +468,7 @@ subroutine fv_restart(fv_domain, Atm, dt_atmos, seconds, days, cold_start, grid_
ntdiag = size(Atm(n)%qdiag,4)


if (.not. ideal_test_case(n)) then
if (ideal_test_case(n) == 0) then
#ifdef SW_DYNAMICS
Atm(n)%pt(:,:,:)=1.
#else
Expand Down
3 changes: 2 additions & 1 deletion tools/test_cases.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6811,13 +6811,14 @@ subroutine read_namelist_test_case_nml(nml_filename)

#include<file_version.h>

namelist /test_case_nml/test_case, bubble_do, alpha, nsolitons, soliton_Umax, soliton_size

unit = stdlog()

! Make alpha = 0 the default:
alpha = 0.
bubble_do = .false.
test_case = 11 ! (USGS terrain)
namelist /test_case_nml/test_case, bubble_do, alpha, nsolitons, soliton_Umax, soliton_size

#ifdef INTERNAL_FILE_NML
! Read Test_Case namelist
Expand Down