Commit 8f97b3d
Corrections to cell-averaged density computation (mom-ocean#213)
* initial hooks for stochastic EOS modifications
* remove debug statements
* add documentation
* Change ampltiude from 0.39 to sqrt(.39)
* remove global_indexing logic from stoch_eos_init
* switch to using MOM_random and add restart capability
* update random sequence to update each each time-step
* remove tseed0 from MOM_random (leftover from debugging)
* Added necessary submodules and S^2, T^2 diagnostics to MOM_diagnostics
* Added diagnostics for outputting variables related to the stochastic parameterization.
* Diagnostics in MOM_PressureForce_FV updated for stochastic (rather than deterministic) Stanley SGS T variance parameterization.
* Added parentheses for reproducibility.
* Changed diagnostics to account for possible absence of stoch_eos_pattern in MOM_PressureForce_FV,
when deterministic parameterization is on.
* remove mom6_da_hooks and geoKdTree from pkg
* add stochastic compoment to MOM_thickness_diffuse
* fix array size declaration and post_data
* Corrected indexing of loops in MOM_calc_varT
* Changed how parameterization of SGS T variance (deterministic and stochastic) is switched on in PGF and thickness diffusion codes
* Corrected a few typos
* Cleaned up indices, redundant diagnostic, printing
* Fixed diagnostic IDs
* Fixed diagnostics typo
* Corrected indices in calculation of tv%varT
* Minor index fix
* Corrected bug in pressure in Stanley diagnostics
* Fixed whitespace error
* Stoch eos clock (#5)
*Added a clock for the Stanley parameterization
Co-authored-by: jkenigson <jkenigso@gmail.com>
* add halo update to random pattern
* Update MOM_stoch_eos.F90
Fix bug for looping over compute domain (is -> isc etc.)
* Avoid unnessary computations on halo (MOM_stoch_eos) and code clean-up (MOM_thickness_diffuse)
* Removed halo updates before determ param calc
* Update MOM_stoch_eos.F90
Removed unnecessary code
* Bug - indices are transposed
* Changed Stanley stochastic coefficient from exp(X) to exp(aX) (#9)
* Changed Stanley stochastic coefficient from exp(X) to exp(aX)
* Extra spaces removed
* Stoch eos init fix (#10)
* Don't bother calculating tv%varT if stanley_coeff<0
* Missing then added
* Merge Ian Grooms Tvar Discretization (#11)
* Update MOM_stoch_eos.F90
In progress updating stencil for$ | dx \times \nabla T|^2$ calculation
* New discretization of |dx\circ\nablaT|^2
Co-authored-by: Ian Grooms <ian.grooms@colorado.edu>
* Multiplied tvar%SGS by grid cell thickness ratio
* Added limiter for tv%varT
* Stoch eos ncar linear disc (#12)
* Update MOM_stoch_eos.F90
In progress updating stencil for$ | dx \times \nabla T|^2$ calculation
* New discretization of |dx\circ\nablaT|^2
* AR1 timescale land mask
Adds land mask to the computation of the AR1 decorrelation time
* Update dt in call to MOM_stoch_eos_run
The call to `MOM_stoch_eos_run` (which time steps the noise) is from within `step_MOM_dynamics`. `step_MOM_dynamics` advances on time step `dt` (per line 957), but the noise is updated using `dt_thermo`. It seems more appropriate to update the noise using `dt`, since it gets called from within `step_MOM_dynamics`.
* Fixed the units for r_sm_H
* Remove vestigial declarations
The variables `hl`, `Tl`, `mn_T`, `mn_T2`, and `r_sm_H` are no longer used, so I removed their declarations and an OMP private clause
Co-authored-by: Ian Grooms <ian.grooms@colorado.edu>
* Update MOM_thickness_diffuse.F90
Changed index for soft convention
* Update CVMix-src
* Ensure use_varT, etc., initialized
* Don't register stanley diagnostics if scheme is off
* Stanley density second derivs at h pts (#15)
* Change discretization of Stanley correction (drho_dT_dT at h points)
* Limit Stanley noise, shrink limiting value
* Revert t variance discretization
* Reverted variable declarations
* Stanley scheme in mixed_layer_restrat, vert_fill in stoch_eos, code cleanup (#19)
* Test Stanley EOS param in mixed_layer_restrat
* Fix size of TS cov, S var in Stanley calculate_density calls
* Test move stanley scheme initialization
* Added missing openMP directives
* Revert Stanley tvar discretization (#18)
* Perform vertical filling in calculation of T variance
* Variable declaration syntax error, remove scaling from get_param
* Fix call to vert_fill_TS
* Code cleanup, whitespace cleanup
Co-authored-by: Jessica Kenigson <jessicak@cheyenne1.cheyenne.ucar.edu>
* Use Stanley (2020) variance; scheme off at coast
* Comment clean-up
* Remove factor of 0.5 in Tvar
* Don't calculate Stanley diagnostics on halo
* Change start indices in stanley_density_1d
* Stanley param in MOM_isopycnal_slopes (#22)
Stanley param in MOM_isopycnal_slopes and thickness diffuse index fix
* Set eady flag to true if use_stored_slopes is true
* Cleanup, docs, whitespace
* Docs and whitespace
* Docs and whitespace
* Docs and whitespace
* Whitespace cleanup
* Whitespace cleanup
* Clean up whitespace
* Docs cleanup
* use_stanley
* Update MOM_lateral_mixing_coeffs.F90
* Adds link to another TEOS10 module
* Set Stanley off for testing
* Line continuation
Co-authored-by: Phil Pegion <38869668+pjpegion@users.noreply.github.com>
Co-authored-by: Philip Pegion <Philip.Pegion@noaa.gov>
Co-authored-by: Jessica Kenigson <jessicak@cheyenne6.cheyenne.ucar.edu>
Co-authored-by: Jessica Kenigson <jessicak@cheyenne3.cheyenne.ucar.edu>
Co-authored-by: jkenigson <jkenigso@gmail.com>
Co-authored-by: jskenigson <jessica.kenigson@colorado.edu>
Co-authored-by: Jessica Kenigson <jessicak@cheyenne1.cheyenne.ucar.edu>
Co-authored-by: Jessica Kenigson <jessicak@cheyenne5.cheyenne.ucar.edu>
Co-authored-by: Philip Pegion <ppegion@Philips-MacBook-Pro.local>
Co-authored-by: Jessica Kenigson <jessicak@cheyenne4.cheyenne.ucar.edu>1 parent 2cd228f commit 8f97b3d
13 files changed
Lines changed: 515 additions & 182 deletions
File tree
- .testing/tc2
- src
- core
- diagnostics
- equation_of_state
- TEOS10
- framework
- parameterizations/lateral
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
297 | 297 | | |
298 | 298 | | |
299 | 299 | | |
300 | | - | |
| 300 | + | |
301 | 301 | | |
302 | 302 | | |
303 | 303 | | |
| |||
430 | 430 | | |
431 | 431 | | |
432 | 432 | | |
433 | | - | |
| 433 | + | |
434 | 434 | | |
435 | 435 | | |
436 | 436 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
108 | 108 | | |
109 | 109 | | |
110 | 110 | | |
| 111 | + | |
111 | 112 | | |
112 | 113 | | |
113 | 114 | | |
| |||
242 | 243 | | |
243 | 244 | | |
244 | 245 | | |
| 246 | + | |
245 | 247 | | |
246 | 248 | | |
247 | 249 | | |
| |||
444 | 446 | | |
445 | 447 | | |
446 | 448 | | |
| 449 | + | |
| 450 | + | |
447 | 451 | | |
448 | 452 | | |
449 | 453 | | |
| |||
1063 | 1067 | | |
1064 | 1068 | | |
1065 | 1069 | | |
| 1070 | + | |
| 1071 | + | |
| 1072 | + | |
| 1073 | + | |
| 1074 | + | |
| 1075 | + | |
| 1076 | + | |
| 1077 | + | |
| 1078 | + | |
1066 | 1079 | | |
1067 | 1080 | | |
1068 | 1081 | | |
| |||
1229 | 1242 | | |
1230 | 1243 | | |
1231 | 1244 | | |
| 1245 | + | |
| 1246 | + | |
| 1247 | + | |
1232 | 1248 | | |
1233 | 1249 | | |
1234 | 1250 | | |
| |||
2765 | 2781 | | |
2766 | 2782 | | |
2767 | 2783 | | |
| 2784 | + | |
| 2785 | + | |
2768 | 2786 | | |
2769 | 2787 | | |
2770 | 2788 | | |
| |||
2854 | 2872 | | |
2855 | 2873 | | |
2856 | 2874 | | |
2857 | | - | |
2858 | 2875 | | |
2859 | 2876 | | |
2860 | 2877 | | |
| |||
3065 | 3082 | | |
3066 | 3083 | | |
3067 | 3084 | | |
| 3085 | + | |
3068 | 3086 | | |
3069 | 3087 | | |
3070 | 3088 | | |
| |||
3097 | 3115 | | |
3098 | 3116 | | |
3099 | 3117 | | |
| 3118 | + | |
| 3119 | + | |
3100 | 3120 | | |
3101 | 3121 | | |
3102 | 3122 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
61 | | - | |
62 | | - | |
63 | | - | |
| 61 | + | |
| 62 | + | |
64 | 63 | | |
65 | | - | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
66 | 67 | | |
67 | 68 | | |
68 | 69 | | |
| |||
167 | 168 | | |
168 | 169 | | |
169 | 170 | | |
170 | | - | |
| 171 | + | |
171 | 172 | | |
172 | 173 | | |
173 | 174 | | |
| |||
473 | 474 | | |
474 | 475 | | |
475 | 476 | | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
476 | 484 | | |
477 | 485 | | |
478 | 486 | | |
| |||
487 | 495 | | |
488 | 496 | | |
489 | 497 | | |
490 | | - | |
491 | | - | |
492 | | - | |
493 | | - | |
494 | | - | |
495 | 498 | | |
496 | 499 | | |
497 | 500 | | |
| |||
511 | 514 | | |
512 | 515 | | |
513 | 516 | | |
514 | | - | |
515 | | - | |
516 | | - | |
517 | | - | |
518 | | - | |
519 | | - | |
520 | | - | |
521 | | - | |
522 | | - | |
523 | | - | |
524 | | - | |
525 | | - | |
526 | | - | |
527 | | - | |
528 | | - | |
529 | | - | |
530 | | - | |
531 | | - | |
532 | | - | |
533 | | - | |
534 | | - | |
535 | | - | |
536 | | - | |
537 | | - | |
538 | | - | |
539 | | - | |
540 | | - | |
541 | | - | |
542 | | - | |
543 | | - | |
544 | | - | |
545 | | - | |
546 | | - | |
547 | | - | |
548 | | - | |
549 | | - | |
550 | | - | |
551 | | - | |
552 | | - | |
553 | | - | |
554 | | - | |
555 | | - | |
556 | | - | |
557 | 517 | | |
558 | 518 | | |
559 | 519 | | |
| |||
690 | 650 | | |
691 | 651 | | |
692 | 652 | | |
693 | | - | |
694 | 653 | | |
695 | 654 | | |
696 | 655 | | |
| |||
701 | 660 | | |
702 | 661 | | |
703 | 662 | | |
704 | | - | |
| 663 | + | |
705 | 664 | | |
706 | 665 | | |
707 | 666 | | |
708 | 667 | | |
709 | 668 | | |
710 | | - | |
| 669 | + | |
711 | 670 | | |
712 | 671 | | |
713 | 672 | | |
| |||
797 | 756 | | |
798 | 757 | | |
799 | 758 | | |
| 759 | + | |
| 760 | + | |
| 761 | + | |
| 762 | + | |
| 763 | + | |
| 764 | + | |
| 765 | + | |
| 766 | + | |
| 767 | + | |
| 768 | + | |
| 769 | + | |
| 770 | + | |
| 771 | + | |
| 772 | + | |
| 773 | + | |
| 774 | + | |
800 | 775 | | |
801 | | - | |
| 776 | + | |
| 777 | + | |
| 778 | + | |
802 | 779 | | |
803 | 780 | | |
804 | 781 | | |
| |||
859 | 836 | | |
860 | 837 | | |
861 | 838 | | |
862 | | - | |
863 | | - | |
864 | | - | |
865 | | - | |
866 | | - | |
867 | | - | |
868 | | - | |
869 | | - | |
| 839 | + | |
| 840 | + | |
| 841 | + | |
| 842 | + | |
| 843 | + | |
| 844 | + | |
| 845 | + | |
| 846 | + | |
| 847 | + | |
| 848 | + | |
870 | 849 | | |
871 | 850 | | |
872 | 851 | | |
| |||
0 commit comments