Skip to content
This repository was archived by the owner on Oct 23, 2020. It is now read-only.

Moving particle routines from analysis members to shared #1468

Open
davelee2804 wants to merge 6 commits into
base: ocean/develop
Choose a base branch
from
Open

Moving particle routines from analysis members to shared #1468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d2bef5a
initial commit of the new particle reorg branch
Dec 8, 2017
e43d4e7
adding particle helpers module to the makefile
Dec 8, 2017
19e5bc3
1) deleting lagrangian particles version of the wachspress initialzat…
Dec 11, 2017
d320b8e
additional changes to particle pull request to facilitate removal of …
Dec 13, 2017
0413eb1
removing old version of the particle_horiztonal_movement routine
Dec 14, 2017
6be3c95
cleaning up the spherical triangle area routine
Dec 18, 2017
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
45 changes: 45 additions & 0 deletions src/core_ocean/Registry.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1195,6 +1195,7 @@
<package name="initMode" description="This package controls variables that are intended to be used within the init run mode of the ocean model."/>
<package name="cullCells" description="This package controls variables that provide information on what cells should be culled."/>
<package name="tracerBudget" description="This package controls variables that record the tracer budget."/>
<package name="meshInterpolation" description="This package includes variables required for the interpolation of lagrangian particles."/>
</packages>

<streams>
Expand Down Expand Up @@ -2058,6 +2059,14 @@
description="Array to hold integers that represent logicals determining if a cell should be culled or not by the MpasCellCuller tool."
packages="cullCells"
/>
<var name="wachspressAreaB" type="real" dimensions="maxEdges nCells" units="m^2"
description="cached polygon subarea B_i used in Wachspess calculation"
packages="meshInterpolation"
/>
<var name="boundaryVertexGlobal" type="integer" dimensions="nVertLevels nVertices" units="unitless"
description="Mask for determining boundary vertices, but global. A boundary vertex has at least one inactive cell neighboring it."
packages="meshInterpolation"
/>
</var_struct>
<var_struct name="verticalMesh" time_levs="1">
<var name="restingThickness" type="real" dimensions="nVertLevels nCells" units="m"
Expand Down Expand Up @@ -3281,6 +3290,42 @@
type="integer" dimensions="nCells" units="unitless"
description="a copy of the smoothing mask used to iteratively expand the field into a buffer region of open ocean around land ice."
/>
<var name="ucReconstructX" type="real" dimensions="nVertLevels nCells" units="m s^{-1}"
description="reconstructed cell center velocity- x component"
/>
<var name="ucReconstructY" type="real" dimensions="nVertLevels nCells" units="m s^{-1}"
description="reconstructed cell center velocity- y component"
/>
<var name="ucReconstructZ" type="real" dimensions="nVertLevels nCells" units="m s^{-1}"
description="reconstructed cell center velocity- z component"
/>
<var name="ucReconstructMeridional" type="real" dimensions="nVertLevels nCells" units="m s^{-1}"
description="reconstructed cell center velocity- meridional component"
/>
<var name="ucReconstructZonal" type="real" dimensions="nVertLevels nCells" units="m s^{-1}"
description="reconstructed cell center velocity- zonal component"
/>
<var name="ucX" type="real" dimensions="nVertLevels nCells" units="m s^{-1}"
description="cell velocity- x component"
/>
<var name="ucY" type="real" dimensions="nVertLevels nCells" units="m s^{-1}"
description="cell velocity- y component"
/>
<var name="ucZ" type="real" dimensions="nVertLevels nCells" units="m s^{-1}"
description="cell velocity- z component"
/>
<var name="uvX" type="real" dimensions="nVertLevels nVertices" units="m s^{-1}"
description="vertex velocity- x component"
/>
<var name="uvY" type="real" dimensions="nVertLevels nVertices" units="m s^{-1}"
description="vertex velocity- y component"
/>
<var name="uvZ" type="real" dimensions="nVertLevels nVertices" units="m s^{-1}"
description="vertex velocity- z component"
/>
<var name="ucTemp" type="real" dimensions="nVertLevels nCells" units="m s^{-1}"
description="cell velocity"
/>
</var_struct>
<var_struct name="pointLocations" time_levs="1">
<var name="pointCellGlobalID" type="integer" dimensions="nPoints" units="unitless"
Expand Down
49 changes: 0 additions & 49 deletions src/core_ocean/analysis_members/Registry_lagrangian_particle_tracking.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,9 +248,6 @@
<var name="buoyancySurfaceValues" type="real" dimensions="nBuoyancySurfaces" units="kg m^{-3}"
description="definition of buoyancy surfaces in terms of potential density"
/>
<var name="wachspressAreaB" type="real" dimensions="nCells maxEdges" units="m^2"
description="cached polygon subarea B_i used in Wachspess calculation"
/>
</var_struct>
<var_struct name="lagrPartTrackHalo" time_levs="1" packages="lagrPartTrackAMPKG">
<var name="ioBlock" type="integer" dimensions="nParticles" units="unitless"
Expand Down Expand Up @@ -350,49 +347,3 @@
description="v velocity of particle - meridional direction"
/>
</var_struct>
<var_struct name="lagrPartTrackNonHalo" time_levs="1" packages="lagrPartTrackAMPKG">
</var_struct>
<var_struct name="lagrPartTrackScratch" time_levs="1" packages="lagrPartTrackAMPKG">
<var name="ucReconstructX" type="real" dimensions="nVertLevels nCells" units="m s^{-1}"
description="reconstructed cell center velocity- x component"
/>
<var name="ucReconstructY" type="real" dimensions="nVertLevels nCells" units="m s^{-1}"
description="reconstructed cell center velocity- y component"
/>
<var name="ucReconstructZ" type="real" dimensions="nVertLevels nCells" units="m s^{-1}"
description="reconstructed cell center velocity- z component"
/>
Copy link
Copy Markdown
Contributor

@pwolfram pwolfram Dec 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@davelee2804, I think these have to be left here, correct?

Copy link
Copy Markdown
Contributor

@pwolfram pwolfram Dec 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need them to advect particles.

<var name="ucTemp" type="real" dimensions="nVertLevels nCells" units="m s^{-1}"
description="cell velocity"
/>
<var name="ucX" type="real" dimensions="nVertLevels nCells" units="m s^{-1}"
description="cell velocity- x component"
/>
<var name="ucY" type="real" dimensions="nVertLevels nCells" units="m s^{-1}"
description="cell velocity- y component"
/>
<var name="ucZ" type="real" dimensions="nVertLevels nCells" units="m s^{-1}"
description="cell velocity- z component"
/>
Copy link
Copy Markdown
Contributor

@pwolfram pwolfram Dec 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here, please leave.

<var name="uvX" type="real" dimensions="nVertLevels nVertices" units="m s^{-1}"
description="vertex velocity- x component"
/>
<var name="uvY" type="real" dimensions="nVertLevels nVertices" units="m s^{-1}"
description="vertex velocity- y component"
/>
<var name="uvZ" type="real" dimensions="nVertLevels nVertices" units="m s^{-1}"
description="vertex velocity- z component"
/>
<var name="ucReconstructMeridional" type="real" dimensions="nVertLevels nCells" units="m s^{-1}"
description="reconstructed cell center velocity- meridional component"
/>
<var name="ucReconstructZonal" type="real" dimensions="nVertLevels nCells" units="m s^{-1}"
description="reconstructed cell center velocity- zonal component"
/>
<var name="boundaryVertexGlobal" type="integer" dimensions="nVertLevels nVertices" units="unitless"
description="Mask for determining boundary vertices, but global. A boundary vertex has at least one inactive cell neighboring it."
/>
Copy link
Copy Markdown
Contributor

@pwolfram pwolfram Dec 13, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here, please leave.

<var name="boundaryCellGlobal" type="integer" dimensions="nVertLevels nCells" units="unitless"
description="Mask for determining boundary cells, but global. A boundary cell has at least one inactive cell neighboring it."
/>
</var_struct>
Loading