Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NCAR to main (2025-02-10) #1653

Open
wants to merge 79 commits into
base: main
Choose a base branch
from
+6,288 −1,001
Open

NCAR to main (2025-02-10) #1653

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
db64408
Enable relative path specification for IC files
alperaltuntas Apr 1, 2024
f4121ca
Write unmasked ocean geometry files
alperaltuntas Apr 18, 2024
a30e7c8
Disable codecov upload requirement
marshallward Apr 12, 2024
d16c330
Introduce GEOM_FILE runtime parameter to set ocean_geometry file name.
alperaltuntas May 3, 2024
4584e5e
Add option to avoid negative MEKE
gustavo-marques May 9, 2024
a7725dc
Improve description
gustavo-marques May 9, 2024
0d55841
Add MEKE_positive to the control structure
gustavo-marques May 9, 2024
95259e4
Revert a comment that was changed unintentionally.
gustavo-marques May 9, 2024
2b1201a
KE-conserving correction to velocity remap (#277)
iangrooms May 24, 2024
6ad1530
Stochastic GM+E (#280)
iangrooms Jul 2, 2024
51a98c7
+Reproducing KPP_smooth_BLD when KPP%N_SMOOTH > 1
Hallberg-NOAA Jul 10, 2024
8a03b63
append ensemble num to geom filename in ensemble runs
alperaltuntas Jul 7, 2024
99edf23
*+Make Leith viscosity runs layout-invariant
Hallberg-NOAA Jul 13, 2024
9ff6ca4
Scale checksums in hor_bnd_diffusion
Hallberg-NOAA Jul 14, 2024
df7b580
Merge branch 'main' into merge_main_073024
gustavo-marques Jul 30, 2024
e413c29
Adding Ohlmann solar penetration scheme to MOM_opacity (#289)
fobryan3 Jul 31, 2024
8b9ba97
Add MARBL to MOM6 (#157)
mnlevy1981 Aug 2, 2024
69b0454
Merge branch 'dev/ncar' into merge_main_073024
gustavo-marques Aug 5, 2024
7afbb6d
Add missing missing_scale argument to read_Z_edges calls
gustavo-marques Aug 5, 2024
225c0d8
remove incorrect comma in write statements (#293)
jedwards4b Aug 7, 2024
e96a46e
Merge pull request #291 from gustavo-marques/merge_main_073024
alperaltuntas Aug 9, 2024
5904666
Options to enforce KHTR_MIN and KHTH_MIN in the whole water column an…
gustavo-marques Aug 9, 2024
4acea91
MARBL: convert salt_flux to tracer flux and add to STF
klindsay28 Aug 28, 2024
621107b
Modify NUOPC cap to accept separate glc runoff fluxes (#288)
alperaltuntas Aug 30, 2024
f8f76f2
remove doxygen formatting on local variables
klindsay28 Aug 30, 2024
b5641af
Merge pull request #298 from klindsay28/marbl_stf_salt_fluxes
mnlevy1981 Sep 3, 2024
a077a61
Use longString in MAX_LAYER_THICKNESS (#299)
gustavo-marques Sep 6, 2024
15deea4
*Updates in FPMix and Stokes Most (#283)
gustavo-marques Sep 9, 2024
37411fb
Check if fluxes%salt_flux is associated (#301)
mnlevy1981 Sep 9, 2024
a3e2f14
fix memory leak in NUOPC State_getImport method (#303)
alperaltuntas Sep 24, 2024
5726d94
Don't compute log10(chl) for small chl
mnlevy1981 Sep 27, 2024
00beb26
add timestamp to rpointer files (#304)
jedwards4b Sep 29, 2024
8fb8aaf
Avoid chl=0 in lookup_ohlmann_opacity()
mnlevy1981 Oct 1, 2024
ad7cf38
Merge branch 'avoid_zero_chl' into dev/ncar
mnlevy1981 Oct 3, 2024
6184273
Stokes MOST modifications to unresolved shear (#306)
gustavo-marques Oct 17, 2024
d38372a
Update CVMix external
mnlevy1981 Oct 17, 2024
4f1da6b
Merge pull request #311 from mnlevy1981/update_cvmix
mnlevy1981 Oct 17, 2024
5a29730
Use new MARBL interface to initialize Chl
mnlevy1981 Oct 16, 2024
d9aa6b4
Add short_name to marbl_single_output_type
mnlevy1981 Oct 17, 2024
2b07520
Fix comment that exceeded line-length
mnlevy1981 Oct 17, 2024
a8cb1d8
Velocity remap dimensional consistency (#308)
iangrooms Oct 18, 2024
bff4d2a
Clean-up following review
mnlevy1981 Oct 22, 2024
67e7e24
Add KPP OBLdepth to restart file
mnlevy1981 Oct 28, 2024
5cd90c6
Two changes to fpmix indexing
mnlevy1981 Oct 28, 2024
b3f55b2
Update to run with CESM gnu debug
mnlevy1981 Oct 29, 2024
2cf0fac
Merge branch 'fpmix_restart' into dev/ncar
mnlevy1981 Oct 30, 2024
c6d6dcc
Merge branch 'fpmix_debug' into dev/ncar
mnlevy1981 Oct 30, 2024
a73cd49
Merge branch 'initialize_chl' into dev/ncar
mnlevy1981 Oct 30, 2024
c9dab57
Fix incorrect limiter in FULL_DEPTH_KHTR_MIN implementation (#318)
gustavo-marques Oct 31, 2024
b880ce8
Two small fixes for FPMix (#321)
mnlevy1981 Nov 1, 2024
a775c4d
merge latest main and resolve conflicts
alperaltuntas Nov 7, 2024
a533e20
Merge pull request #322 from alperaltuntas/merge_main
alperaltuntas Nov 7, 2024
acadc6e
Replace atan with atan2 in NUOPC cap to addresss missing nvhpc support.
jedwards4b Nov 22, 2024
dc05794
merge pr1647 with dev/ncar and resolve conflicts
alperaltuntas Dec 11, 2024
c17243b
turn on MEKE thickness diffusivity flags only when USE_MEKE is on
alperaltuntas Dec 13, 2024
0d828a2
Merge branch 'pr1647e' into merge_pr1647
alperaltuntas Jan 6, 2025
289a54b
Use latest commit from CVMix
mnlevy1981 Jan 6, 2025
bd33548
make MLD_003 computation available to mixedlayer_restrat_Bodner (#327)
alperaltuntas Jan 7, 2025
544377e
Merge pull request #330 from mnlevy1981/update_cvmix
mnlevy1981 Jan 7, 2025
217816c
Add option to read MLE Frontal-Length Scale via file
gustavo-marques Jan 7, 2025
9a191ae
Fixed typos
gustavo-marques Jan 8, 2025
71b6ba3
Initialize mle_fl_2d
gustavo-marques Jan 8, 2025
ebbfa16
Avoid division by zero in I_LFront calculation
gustavo-marques Jan 8, 2025
788ff42
Update to latest CVMix
mnlevy1981 Jan 8, 2025
ea1b4f0
Merge pull request #332 from mnlevy1981/update_cvmix
mnlevy1981 Jan 8, 2025
1fc274d
merge latest dev/ncar and resolve new conflicts in MOM_mixed_layer_re…
alperaltuntas Jan 10, 2025
755bd87
Merge branch 'dev_ncar_main' into mle_lf_via_file
gustavo-marques Jan 10, 2025
a92eb6e
Merge remote-tracking branch 'upstream/main' into merge_pr1647
alperaltuntas Jan 13, 2025
b251935
fix OMP directive bug introduced during conflict reslove
alperaltuntas Jan 14, 2025
8b6767f
Merge pull request #333 from NCAR/merge_pr1647
alperaltuntas Jan 14, 2025
fc0d031
Fix dimensional scaling and use Adcroft reciprocal
gustavo-marques Jan 15, 2025
138a66e
Leith+E bugfix (#334)
iangrooms Jan 24, 2025
ea85449
Update CVMix to latest commit
mnlevy1981 Jan 24, 2025
59925b5
Merge pull request #331 from gustavo-marques/mle_lf_via_file
alperaltuntas Jan 25, 2025
8feb162
Merge pull request #335 from mnlevy1981/update_cvmix
mnlevy1981 Jan 25, 2025
1221ef3
Merge pull request #336 from mom-ocean/main
alperaltuntas Feb 6, 2025
9f3de48
OMP directive fixes for build and runtime failures in CESM C cases (#…
alperaltuntas Feb 10, 2025
d678d3a
Do not nullify non-present MOM_dom_unmasked pointer
alperaltuntas Feb 14, 2025
a867971
Remove broken symlink to MARBL (#338)
gustavo-marques Feb 14, 2025
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
4 changes: 1 addition & 3 deletions src/framework/MOM_domains.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ subroutine MOM_domains_init(MOM_dom, param_file, symmetric, static_memory, &
character(len=*), optional, intent(in) :: param_suffix !< A suffix to apply to
!! layout-specific parameters.
type(unit_scale_type), optional, pointer :: US !< A dimensional unit scaling type
type(MOM_domain_type), pointer, optional :: MOM_dom_unmasked !< Unmasked MOM domain instance.
type(MOM_domain_type), optional, pointer :: MOM_dom_unmasked !< Unmasked MOM domain instance.
!! Set to null if masking is not enabled.

! Local variables
Expand Down Expand Up @@ -448,8 +448,6 @@ subroutine MOM_domains_init(MOM_dom, param_file, symmetric, static_memory, &
call create_MOM_domain(MOM_dom_unmasked, n_global, n_halo, reentrant, tripolar_N, layout_unmasked, &
domain_name=domain_name, symmetric=symmetric, thin_halos=thin_halos, &
nonblocking=nonblocking)
else
MOM_dom_unmasked => null()
Copy link
Contributor

Choose a reason for hiding this comment

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

this else is tied to if (present(MOM_dom_unmasked) .and. mask_table_exists) then; do you need to nullify MOM_dom_unmasked if it is present but mask_table_exists is false? If so, you could change this to

- else
+ else if (present(MOM_dom_unmasked) then
    MOM_dom_unmasked => null()

Instead of removing this block altogether

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

No need to nullify MOM_dom_unmasked. It is already null, and remains so unless the first branch (present(MOM_dom_unmasked) .and. mask_table_exists) is executed.

endif

call create_MOM_domain(MOM_dom, n_global, n_halo, reentrant, tripolar_N, layout, &
Expand Down
1 change: 0 additions & 1 deletion src/parameterizations/MARBL
View file
Open in desktop

This file was deleted.