Skip to content

Commit 57f02a2

Browse files
pwolframpwolfram
committed
Merge PR #32 'ocean/LIGHT_restart_cleanup' into ocean/develop
Cleans up LIGHT data structures for improved inter-processor communication efficiency.
2 parents 2528944 + ec5adec commit 57f02a2

File tree

5 files changed

+860
-929
lines changed

5 files changed

+860
-929
lines changed

‎src/core_ocean/analysis_members/Registry_lagrangian_particle_tracking.xml

Lines changed: 6 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
description="Number of times to apply filtering operation."
3232
possible_values="0, 1, 2, ..."
3333
/>
34+
<nml_option name="config_AM_lagrPartTrack_timeIntegration" type="integer" default_value="2" units="unitless"
35+
description="type of temporal interpolation with possible_values='EE(1), RK2(2), RK4(4)' as ENUMs"
36+
possible_values="1, 2, 4,..."
37+
/>
3438
<nml_option name="config_AM_lagrPartTrack_reset_criteria" type="character" default_value="none" units="unitless"
3539
description="Specify whether particles should not be reset ('none'), be reset on a timer for each particle ('particle_time'), be reset on config_AM_lagrPartTrack_reset_time_globally value ('global_time'), be reset based on regions ('region'), or be reset for all conditions ('all')."
3640
possible_values="'none','particle_time','global_time', 'region','all'"
@@ -92,16 +96,11 @@
9296
<var name="resetTime"/>
9397
<var name="numTimesReset"/>
9498
<var name="buoyancyParticle"/>
95-
<var name="vertexReconstMethod"/>
96-
<var name="horizontalTreatment"/>
9799
<var name="verticalTreatment"/>
98100
<var name="dtParticle"/>
99-
<var name="timeIntegration"/>
100101
<var name="indexLevel"/>
101102
<var name="cellOwnerBlock"/>
102103
<var name="transfered"/>
103-
<var name="lonVel"/>
104-
<var name="latVel"/>
105104
<var name="buoyancySurfaceValues"/>
106105
<var name="buoyancySurfaceVelocityMeridional"/>
107106
<var name="buoyancySurfaceVelocityZonal"/>
@@ -137,18 +136,10 @@
137136
<var name="resetTime"/>
138137
<var name="numTimesReset"/>
139138
<var name="buoyancyParticle"/>
140-
<var name="vertexReconstMethod"/>
141-
<var name="horizontalTreatment"/>
142139
<var name="verticalTreatment"/>
143140
<var name="dtParticle"/>
144-
<var name="timeIntegration"/>
145141
<var name="indexLevel"/>
146142
<var name="transfered"/>
147-
<var name="sumU"/>
148-
<var name="sumV"/>
149-
<var name="sumUU"/>
150-
<var name="sumUV"/>
151-
<var name="sumVV"/>
152143
<var name="buoyancySurfaceValues"/>
153144
</stream>
154145

@@ -174,11 +165,8 @@
174165
<var name="currentCellReset"/>
175166
<var name="resetTime"/>
176167
<var name="buoyancyParticle"/>
177-
<var name="vertexReconstMethod"/>
178-
<var name="horizontalTreatment"/>
179168
<var name="verticalTreatment"/>
180169
<var name="dtParticle"/>
181-
<var name="timeIntegration"/>
182170
<var name="indexLevel"/>
183171
<var name="transfered"/>
184172
<var name="buoyancySurfaceValues"/>
@@ -304,15 +292,6 @@
304292
<var name="numTimesReset" type ="integer" dimensions="nParticles Time" units="unitless"
305293
description="flag to specify how many times the particle was reset" default_value="0"
306294
/>
307-
<var name="vertexReconstMethod" type="integer" dimensions="nParticles Time" units="unitless"
308-
description="type of vertex reconstruction method, with possible_values='RBFlinear(1)' as ENUMs"
309-
/>
310-
<var name="timeIntegration" type="integer" dimensions="nParticles Time" units="unitless"
311-
description="type of temporal interpolation with possible_values='EE(1), RK2(2), RK4(4)' as ENUMs"
312-
/>
313-
<var name="horizontalTreatment" type="integer" dimensions="nParticles Time" units="unitless"
314-
description="select type of horizontal treatment to be used, with possible_values='wachspress' as ENUMs"
315-
/>
316295
<var name="verticalTreatment" type="integer" dimensions="nParticles Time" units="unitless"
317296
description="select type of vertical treatment to be used, with possible_values='indexLevel','fixedZLevel','passiveFloat','buoyancySurface','argoFloat' (ENUM)"
318297
/>
@@ -328,30 +307,11 @@
328307
<var name="transfered" type ="integer" dimensions="nParticles Time" units="unitless"
329308
description="flag to monitor if the particle was transfered"
330309
/>
331-
<var name="sumU" type="real" dimensions="nParticles Time" units="m s^{-1}"
332-
description="summed velocity: $\sum_i U_i$"
333-
/>
334-
<var name="sumV" type="real" dimensions="nParticles Time" units="m s^{-1}"
335-
description="summed velocity: $\sum_i V_i$"
336-
/>
337-
<var name="sumUU" type="real" dimensions="nParticles Time" units="m^2 s^{-2}"
338-
description="summed energy: $\sum_i U*U$"
339-
/>
340-
<var name="sumUV" type="real" dimensions="nParticles Time" units="m^2 s^{-2}"
341-
description="summed energy: $\sum_i U*V$"
342-
/>
343-
<var name="sumVV" type="real" dimensions="nParticles Time" units="m^2 s^{-2}"
344-
description="summed energy: $\sum_i V*V$"
345-
/>
346-
<var name="lonVel" type="real" dimensions="nParticles Time" units="m s^{-1}"
347-
description="u velocity of particle - zonal direction"
348-
/>
349-
<var name="latVel" type="real" dimensions="nParticles Time" units="m s^{-1}"
350-
description="v velocity of particle - meridional direction"
351-
/>
352310
</var_struct>
311+
<!--
353312
<var_struct name="lagrPartTrackNonHalo" time_levs="1" packages="lagrPartTrackAMPKG">
354313
</var_struct>
314+
-->
355315
<var_struct name="lagrPartTrackScratch" time_levs="1" packages="lagrPartTrackAMPKG">
356316
<var name="ucReconstructX" type="real" dimensions="nVertLevels nCells" units="m s^{-1}"
357317
description="reconstructed cell center velocity- x component"

0 commit comments

Comments
 (0)