Update maint1.2: 3D varying GM#487

Merged

mark-petersen merged 20 commits into

MPAS-Dev:e3sm/maint-1.2from

mark-petersen:ocean/gm_update_maint1.2

Mar 24, 2020

Commits on Mar 24, 2020

Adds options for 3d varying GM bolus and 2d varying phase speed

vanroekel
authored and
mark-petersen
committed
Adds 2d variable GM and fixes phase speed bug

vanroekel
authored and
mark-petersen
committed
Removes 2D GM code and debug statements

vanroekel
authored and
mark-petersen
committed
Merge PR #288 'vanroekel:ocean/gmBolus3Dvarying' into gm_update_maint1.2
mark-petersen
committed
Fix threading issue

jonbob
authored and
mark-petersen
committed
Add more private variables to omp pragmas

jonbob
authored and
mark-petersen
committed
Break initialization into nEdges and nEdges+1 loops to avoid memory issues

jonbob
authored and
mark-petersen
committed
Change loop extents to match array sizes

jonbob
authored and
mark-petersen
committed
Merge PR #376 'jonbob:jonbob/ocn/fix-threading-issue' into gm_update_maint1.2
mark-petersen
committed
added zonal and meridional bolus velocities to monthly output; added bolus velocity * temperature to eddy stats

LeAnn Marie Conlon
authored and
mark-petersen
committed
removed extra file

LeAnn Marie Conlon
authored and
mark-petersen
committed
Merge PR #339 'lconlon:ocean/AddGMBolusEddyStats' into gm_update_maint1.2
mark-petersen
committed
Point Ocean-BGC to the maint-1.0 branch

xylar
authored and
mark-petersen
committed
Point CVMix to the E3SM-Project/CVMix-src/maint-1.0 branch

xylar
authored and
mark-petersen
committed
Merge PR #392 'xylar:e3sm/maint-1.0' into ocean/gm_update_maint1.2
mark-petersen
committed
Read in landIceMask from input

xylar
authored and
mark-petersen
committed
Merge part of PR #447 'xylar:ocean/land_ice_mask_from_geom_features' into ocean/gm_update_maint1.2
mark-petersen
committed
bug fixes for KPP nonlocal source term.

maltrud
authored and
mark-petersen
committed
Remove max of activeTracers
mark-petersen
committed
Merge PR #305 'maltrud:maltrud/ocean/nonlocalBugfixKPP' into ocean/gm_update_maint1.2
mark-petersen
committed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Update maint1.2: 3D varying GM#487

Update maint1.2: 3D varying GM#487
mark-petersen merged 20 commits into
MPAS-Dev:e3sm/maint-1.2from
mark-petersen:ocean/gm_update_maint1.2

Commits on Mar 24, 2020

Adds options for 3d varying GM bolus and 2d varying phase speed

Adds 2d variable GM and fixes phase speed bug

Removes 2D GM code and debug statements

Merge PR #288 'vanroekel:ocean/gmBolus3Dvarying' into gm_update_maint1.2

Fix threading issue

Add more private variables to omp pragmas

Break initialization into nEdges and nEdges+1 loops to avoid memory issues

Change loop extents to match array sizes

Merge PR #376 'jonbob:jonbob/ocn/fix-threading-issue' into gm_update_maint1.2

added zonal and meridional bolus velocities to monthly output; added bolus velocity * temperature to eddy stats

removed extra file

Merge PR #339 'lconlon:ocean/AddGMBolusEddyStats' into gm_update_maint1.2

Point Ocean-BGC to the maint-1.0 branch

Point CVMix to the E3SM-Project/CVMix-src/maint-1.0 branch

Merge PR #392 'xylar:e3sm/maint-1.0' into ocean/gm_update_maint1.2

Read in landIceMask from input

Merge part of PR #447 'xylar:ocean/land_ice_mask_from_geom_features' into ocean/gm_update_maint1.2

bug fixes for KPP nonlocal source term.

Remove max of activeTracers

Merge PR #305 'maltrud:maltrud/ocean/nonlocalBugfixKPP' into ocean/gm_update_maint1.2