Merge pull request #357 from matt-frey/test-branch

Beltrami stable version
EPIC-model · Apr 8, 2022 · ce88f53 · ce88f53
2 parents 88c1367 + 6d39a10
commit ce88f53
Show file tree

Hide file tree

Showing 15 changed files with 377 additions and 392 deletions.
diff --git a/src/3d/epic3d.f90 b/src/3d/epic3d.f90
@@ -21,7 +21,7 @@ program epic3d
     use field_netcdf, only : field_io_timer
     use field_diagnostics, only : field_stats_timer
     use field_diagnostics_netcdf, only : field_stats_io_timer
-    use inversion_mod, only : vor2vel_timer, db_timer
+    use inversion_mod, only : vor2vel_timer, vtend_timer
     use inversion_utils, only : init_fft
     use parcel_interpl, only : grid2par_timer, par2grid_timer
     use parcel_init, only : init_parcels, init_timer
@@ -72,7 +72,7 @@ subroutine pre_run
             call register_timer('field diagnostics', field_stats_timer)
             call register_timer('field diagnostics I/O', field_stats_io_timer)
             call register_timer('vor2vel', vor2vel_timer)
-            call register_timer('buoyancy derivatives', db_timer)
+            call register_timer('vorticity tendency', vtend_timer)
             call register_timer('parcel push', rk4_timer)
             call register_timer('merge nearest', merge_nearest_timer)
             call register_timer('merge tree resolve', merge_tree_resolve_timer)

diff --git a/src/3d/fields/fields.f90 b/src/3d/fields/fields.f90
@@ -17,6 +17,7 @@ module fields
     double precision, allocatable, dimension(:, :, :, :) :: &
         velog,     &   ! velocity vector field (u, v, w)
         vortg,     &   ! vorticity vector field (\omegax, \omegay, \omegaz)
+        vtend,     &   ! vorticity tendency
         velgradg       ! velocity gradient tensor
                        ! ordering: du/dx, du/dy,
                        !                  dv/dy,
@@ -34,8 +35,6 @@ module fields
         dbuoyg,    &   ! dry buoyancy (or liquid-water buoyancy)
 #endif
         tbuoyg,    &   ! buoyancy
-        dbdx,      &   ! buoyancy derivative in x
-        dbdy,      &   ! buoyancy derivative in y
 #ifndef NDEBUG
         sym_volg,  &   ! symmetry volume (debug mode only)
 #endif
@@ -64,9 +63,7 @@ subroutine field_alloc
 
             allocate(vortg(-1:nz+1, 0:ny-1, 0:nx-1, 3))
 
-            allocate(dbdx(-1:nz+1, 0:ny-1, 0:nx-1))
-
-            allocate(dbdy(-1:nz+1, 0:ny-1, 0:nx-1))
+            allocate(vtend(-1:nz+1, 0:ny-1, 0:nx-1, 3))
 
             allocate(tbuoyg(-1:nz+1, 0:ny-1, 0:nx-1))
 
@@ -87,8 +84,7 @@ subroutine field_default
             velgradg = zero
             volg     = zero
             vortg    = zero
-            dbdx     = zero
-            dbdy     = zero
+            vtend    = zero
             tbuoyg   = zero
 #ifndef ENABLE_DRY_MODE
             dbuoyg   = zero