Merge pull request #32 from bensonr/master_#31

fix gnu compilation issues
NOAA-GFDL · Apr 22, 2020 · b00dead · b00dead
2 parents 62c0f1d + 756f1f7
commit b00dead
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git 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)

diff --git a/tools/fv_restart.F90 b/tools/fv_restart.F90
@@ -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"
 
@@ -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

diff --git a/tools/test_cases.F90 b/tools/test_cases.F90
@@ -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