Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 8 additions & 5 deletions model/dyn_core.F90
Original file line number Diff line number Diff line change
Expand Up @@ -684,8 +684,8 @@ subroutine dyn_core(npx, npy, npz, ng, sphum, nq, bdt, n_map, n_split, zvir, cp,
npx, npy, npz, gridstruct%bounded_domain, .false., .false., .false., bd)

endif

#endif SW_DYNAMICS
!endif SW_DYNAMICS
#endif

endif ! end hydro check

Expand Down Expand Up @@ -1160,7 +1160,8 @@ subroutine dyn_core(npx, npy, npz, ng, sphum, nq, bdt, n_map, n_split, zvir, cp,
call complete_group_halo_update(i_pack(5), domain)
call timing_off('COMM_TOTAL')
endif
#endif SW_DYNAMICS
!endif SW_DYNAMICS
#endif
endif ! end hydro check

#ifdef SW_DYNAMICS
Expand Down Expand Up @@ -1356,7 +1357,8 @@ subroutine dyn_core(npx, npy, npz, ng, sphum, nq, bdt, n_map, n_split, zvir, cp,
0, 0, npx, npy, npz, bd, split_timestep_BC+1, real(n_split*flagstruct%k_split), &
neststruct%w_BC, bctype=neststruct%nestbctype )
end if
#endif SW_DYNAMICS
!endif SW_DYNAMICS
#endif
call nested_grid_BC_apply_intT(u, &
0, 1, npx, npy, npz, bd, split_timestep_BC+1, real(n_split*flagstruct%k_split), &
neststruct%u_BC, bctype=neststruct%nestbctype )
Expand All @@ -1377,7 +1379,8 @@ subroutine dyn_core(npx, npy, npz, ng, sphum, nq, bdt, n_map, n_split, zvir, cp,
isd, ied, jsd, jed, &
reg_bc_update_time,it )
endif
#endif SW_DYNAMICS
!endif SW_DYNAMICS
#endif

call regional_boundary_update(u, 'u', &
isd, ied, jsd, jed+1, npz, &
Expand Down
3 changes: 2 additions & 1 deletion model/fv_dynamics.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1248,7 +1248,8 @@ subroutine Rayleigh_Super(dt, npx, npy, npz, ks, pm, phis, tau, tau_w, u, v, w,
enddo
enddo
#endif
#ifdef SMALL_EARTH_TEST ! changed!!!
!SMALL_EARTH_TEST has changed
#ifdef SMALL_EARTH_TEST
tau0 = abs( tau )
tau1 = abs( tau_w )
#else
Expand Down
4 changes: 3 additions & 1 deletion tools/fv_diagnostics.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1808,7 +1808,9 @@ subroutine fv_diag(Atm, zvir, Time, print_freq)
#else
trange_bad(1),trange_bad(2), bad_range, Time)
#endif
#endif ! SW_DYNAMICS

!endif SW_DYNAMICS
#endif

call range_check('Qv', Atm(n)%q(:,:,:,sphum), isc, iec, jsc, jec, ngc, npz, Atm(n)%gridstruct%agrid, &
-1.e-8, 1.e20, bad_range, Time)
Expand Down
4 changes: 3 additions & 1 deletion tools/fv_diagnostics.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,6 @@
#else
integer :: id_o3w
#endif
#endif _FV_DIAG__

!endif _FV_DIAG__
#endif
4 changes: 2 additions & 2 deletions tools/fv_eta.h
Original file line number Diff line number Diff line change
Expand Up @@ -980,5 +980,5 @@
0.984542, 0.988500, 0.991984, 0.995003, 0.997630, 1.000000 /



#endif _FV_ETA_
!endif _FV_ETA_
#endif