From 092fa60ee3bdb0d97690d37035c0458378d85898 Mon Sep 17 00:00:00 2001 From: "Rusty.Benson" Date: Wed, 22 Apr 2020 15:57:55 -0400 Subject: [PATCH 1/3] remove a debug statement causing issues with GNU compilation --- model/fv_control.F90 | 1 - 1 file changed, 1 deletion(-) diff --git a/model/fv_control.F90 b/model/fv_control.F90 index 5f67f344b..66015c04f 100644 --- a/model/fv_control.F90 +++ b/model/fv_control.F90 @@ -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) From fdfe171c574ee5be7223343c5160adb58b362dfa Mon Sep 17 00:00:00 2001 From: "Rusty.Benson" Date: Wed, 22 Apr 2020 15:58:33 -0400 Subject: [PATCH 2/3] fix non-conformant if-tests in fv_restart.F90 --- tools/fv_restart.F90 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/fv_restart.F90 b/tools/fv_restart.F90 index 4fd8a9e2d..473a009fd 100644 --- a/tools/fv_restart.F90 +++ b/tools/fv_restart.F90 @@ -80,8 +80,10 @@ module fv_restart_mod ! ! subroutine fv_restart_init() + call fv_io_init() module_is_initialized = .TRUE. + end subroutine fv_restart_init ! NAME="fv_restart_init" @@ -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 @@ -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 @@ -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 From 756f1f77e888878e3d390577776d95ea1ed01f2c Mon Sep 17 00:00:00 2001 From: "Rusty.Benson" Date: Wed, 22 Apr 2020 15:59:09 -0400 Subject: [PATCH 3/3] move namelist specification to be above functional statements to fix GNU compilation --- tools/test_cases.F90 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/test_cases.F90 b/tools/test_cases.F90 index ea77c2c0f..c0a130940 100644 --- a/tools/test_cases.F90 +++ b/tools/test_cases.F90 @@ -6811,13 +6811,14 @@ subroutine read_namelist_test_case_nml(nml_filename) #include + 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