Skip to content

Commit ea25179

Browse files
authored
move float_or_date_time in NCDatasetsExt (#4884)
1 parent 38ae265 commit ea25179

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

ext/OceananigansNCDatasetsExt.jl

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module OceananigansNCDatasetsExt
22

33
using NCDatasets
4-
import NCDatasets: defVar
54

6-
using Dates: AbstractTime, UTC, now
5+
using Dates: AbstractTime, UTC, now, DateTime
76
using Printf: @sprintf
87
using OrderedCollections: OrderedDict
8+
using SeawaterPolynomials: BoussinesqEquationOfState
99

1010
using Oceananigans: initialize!, prettytime, pretty_filesize, AbstractModel
1111
using Oceananigans.Architectures: CPU, GPU, on_architecture
@@ -20,11 +20,8 @@ using Oceananigans.Grids: Center, Face, Flat, Periodic, Bounded,
2020
constructor_arguments
2121
using Oceananigans.ImmersedBoundaries: ImmersedBoundaryGrid, GridFittedBottom, GFBIBG, GridFittedBoundary, PartialCellBottom, PCBIBG
2222
using Oceananigans.Models: ShallowWaterModel, LagrangianParticles
23-
using Oceananigans.TimeSteppers: float_or_date_time
2423
using Oceananigans.Utils: TimeInterval, IterationInterval, WallTimeInterval, materialize_schedule,
2524
versioninfo_with_gpu, oceananigans_versioninfo, prettykeys
26-
using SeawaterPolynomials: BoussinesqEquationOfState
27-
2825
using Oceananigans.OutputWriters:
2926
auto_extension,
3027
output_averaging_schedule,
@@ -41,6 +38,7 @@ using Oceananigans.OutputWriters:
4138
fetch_and_convert_output,
4239
show_array_type
4340

41+
import NCDatasets: defVar
4442
import Oceananigans: write_output!
4543
import Oceananigans.OutputWriters:
4644
NetCDFWriter,
@@ -1379,6 +1377,10 @@ function save_output!(ds, output::LagrangianParticles, model, ow, time_index, na
13791377
return nothing
13801378
end
13811379

1380+
# Convert to a base Julia type (a float or DateTime).
1381+
float_or_date_time(t) = t
1382+
float_or_date_time(t::AbstractTime) = DateTime(t)
1383+
13821384
"""
13831385
write_output!(ow::NetCDFWriter, model)
13841386

src/TimeSteppers/clock.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,6 @@ unit_time(t) = t
121121
unit_time(t::Millisecond) = t.value / 1_000
122122
unit_time(t::Nanosecond) = t.value / 1_000_000_000
123123

124-
# Convert to a base Julia type (a float or DateTime). Mainly used by NetCDFWriter.
125-
float_or_date_time(t) = t
126-
float_or_date_time(t::AbstractTime) = DateTime(t)
127-
128124
function tick!(clock, Δt; stage=false)
129125

130126
tick_time!(clock, Δt)

0 commit comments

Comments
 (0)