PrognosticVariables generator function

SpeedyWeather · Oct 4, 2023 · fb43f8f · fb43f8f
1 parent 9789053
commit fb43f8f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/src/dynamics/models.jl b/src/dynamics/models.jl
@@ -66,9 +66,9 @@ function initialize!(model::Barotropic)
     initialize!(horizontal_diffusion,model)
 
     # initial conditions
-    prognostic_variables = initial_conditions(model)
+    prognostic_variables = PrognosticVariables(spectral_grid,model)
     initialize!(prognostic_variables,model.initial_conditions,model)
-    
+
     diagnostic_variables = DiagnosticVariables(spectral_grid,Barotropic)
     return Simulation(prognostic_variables,diagnostic_variables,model)
 end
@@ -128,7 +128,7 @@ function initialize!(model::ShallowWater)
     initialize!(orography,planet,spectral_transform,geometry)
 
     # initial conditions
-    prognostic_variables = initial_conditions(model)
+    prognostic_variables = PrognosticVariables(spectral_grid,model)
     initialize!(prognostic_variables,model.initial_conditions,model)
 
     diagnostic_variables = DiagnosticVariables(spectral_grid,ShallowWater)
@@ -200,7 +200,7 @@ function initialize!(model::PrimitiveDry)
     # initialize!(model.vertical_diffusion,model)
 
     # initial conditions
-    prognostic_variables = initial_conditions(model)
+    prognostic_variables = PrognosticVariables(spectral_grid,model)
     initialize!(prognostic_variables,model.initial_conditions,model)
 
     diagnostic_variables = DiagnosticVariables(spectral_grid,PrimitiveDry)
@@ -276,7 +276,7 @@ function initialize!(model::PrimitiveWet)
     # initialize!(model.vertical_diffusion,model)
 
     # initial conditions
-    prognostic_variables = initial_conditions(model)
+    prognostic_variables = PrognosticVariables(spectral_grid,model)
     initialize!(prognostic_variables,model.initial_conditions,model)
 
     diagnostic_variables = DiagnosticVariables(spectral_grid,PrimitiveWet)

diff --git a/src/dynamics/prognostic_variables.jl b/src/dynamics/prognostic_variables.jl
@@ -92,11 +92,8 @@ Base.@kwdef struct PrognosticVariablesSurface{NF<:AbstractFloat} <: AbstractVari
     "Spectral resolution as max degree of spherical harmonics"
     trunc::Int
 
-    "log of surface pressure [log(Pa)]"
+    "log of surface pressure [log(Pa)] for PrimitiveEquation, interface displacement [m] for ShallowWaterModel"
     pres::LTM{Complex{NF}} = zeros(LTM{Complex{NF}},trunc+2,trunc+1)
-
-    "Interface displacement in the ShallowWaterModel [m]"
-    eta::LTM{Complex{NF}} = zeros(LTM{Complex{NF}},trunc+2,trunc+1)
 end
 
 # generator function based on a SpectralGrid
@@ -183,7 +180,7 @@ struct PrognosticVariables{NF<:AbstractFloat,Grid<:AbstractGrid{NF},M<:ModelSetu
     clock::Clock
 end
 
-function Base.zeros(::Type{PrognosticVariables},SG::SpectralGrid,Model::Type{<:ModelSetup})
+function PrognosticVariables(SG::SpectralGrid,::Model) where Model<:ModelSetup
 
     (;trunc,nlat_half,nlev,Grid,NF) = SG