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

Jump to bottom

Added diagnostic for sub-mixed layer stratification. #21

Merged
merged 3 commits into from
May 22, 2014
Merged

Added diagnostic for sub-mixed layer stratification. #21

merged 3 commits into from
May 22, 2014

Conversation

MJHarrison-GFDL
Copy link
Contributor

  • New diagnostic is "subML_N2"
  • only calculated if "MLD_0125" diagnostic is enabled
  • Based on stratification measured from ML base to
  • 50m below the mixed layer base.

@MJHarrison-GFDL
Added diagnostic for sub-mixed layer stratification.
825b608 
+ New diagnostic is "subML_N2"
+ only calculated if "MLD_0125" diagnostic is enabled
+ Based on stratification measured from ML base to
+ 50m below the mixed layer base.
adcroft
adcroft reviewed May 21, 2014
View reviewed changes
src/parameterizations/vertical/MOM_diabatic_driver.F90
idn2 = -1
if (PRESENT(id_N2subML)) then
idn2 = id_N2subML
subMLN2(:,:)=0.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Redundant with line 1922?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. 1922 can go.

On Wed, May 21, 2014 at 11:30 AM, Alistair Adcroft (GFDL) <
[email protected]> wrote:

In src/parameterizations/vertical/MOM_diabatic_driver.F90:

integer :: i, j, is, ie, js, je, k, nz

  • real :: aFac, ddRho
  • real :: aFac, ddRho,dzML,dzMLm1,ddZ
  • integer :: idn2
  • idn2 = -1
  • if (PRESENT(id_N2subML)) then
  • idn2 = id_N2subML
  • subMLN2(:,:)=0.

Redundant with line 1922?

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/21/files#r12902374
.

@adcroft
Fixed MLD diagnostic and refactored subML_N2
0981861 
- Adding subML_N2 diagnostic inadvertently brok the MLD diagnostic.
- Refactored subML_N2 diagnostic.
- Added pressure dependence in N2 calculation (using pressure below ML).
- No answer changes.
@adcroft
Added subML_N2 to two example diag_tables
3d8913b 
- Always good to exercise new code!
@adcroft
Copy link
Collaborator

adcroft commented May 22, 2014

Matt, I've updated the implementation of the subML_N2 diagnostic on this branch/pull request. Can you double check it for me? Thx.

@adcroft adcroft merged commit 3d8913b into dev/master May 22, 2014
@adcroft adcroft deleted the user/mjh/MLD_diagnostic branch October 10, 2015 17:15
gustavo-marques added a commit to gustavo-marques/MOM6 that referenced this pull request Aug 11, 2017
@gustavo-marques
Merge pull request mom-ocean#21 from alperaltuntas/dev/ncar
369d5d6 
Fixed clock and timing
nikizadehgfdl pushed a commit to nikizadehgfdl/MOM6 that referenced this pull request Oct 9, 2017
@adcroft
MOM6: Merge pull request mom-ocean#578 from NCAR/dev/ncar
8b801de 
- NOAA-GFDL/MOM6@ae22a0f Merge pull request mom-ocean#578 from NCAR/dev/ncar
- NOAA-GFDL/MOM6@f4f882f Merge pull request mom-ocean#23 from gustavo-marques/combine_mct_modules
- NOAA-GFDL/MOM6@a85b728 Merge MCT modules
- NOAA-GFDL/MOM6@ba5b5ba Merge pull request mom-ocean#22 from gustavo-marques/check_fluxes
- NOAA-GFDL/MOM6@f5a8483 Adds option to write restart files
- NOAA-GFDL/MOM6@8745b4b Fills additional IOB fluxes
- NOAA-GFDL/MOM6@f6b22ff Merge branch 'dev/ncar' into check_fluxes
- NOAA-GFDL/MOM6@369d5d6 Merge pull request mom-ocean#21 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@2582e0a Adds run paramaters to control SW decomposition
- NOAA-GFDL/MOM6@58f78b9 Fill IOB, some fluxes still need to be checked
- NOAA-GFDL/MOM6@06a30ab Fixed clock and timing
- NOAA-GFDL/MOM6@1bca79b Merge pull request mom-ocean#20 from gustavo-marques/fix_merge
- NOAA-GFDL/MOM6@fb89b08 Adds code that got lost during merge
- NOAA-GFDL/MOM6@7480492 Merge pull request mom-ocean#19 from gustavo-marques/new_merge
- NOAA-GFDL/MOM6@be1e6cf Merge branch 'dev/master' into dev/ncar
- NOAA-GFDL/MOM6@76565cb Merge pull request mom-ocean#17 from gustavo-marques/fix_ssh_slopes
- NOAA-GFDL/MOM6@c04f081 Fix ssh slope calculation
- NOAA-GFDL/MOM6@17d4586 Merge pull request mom-ocean#16 from adcroft/ncar-cherry-picked-fixes
- NOAA-GFDL/MOM6@be46fee (*)Fixes gprime(1) when no layer coordinates are set
- NOAA-GFDL/MOM6@fccb7ae Avoids a SEGV when OBC are not in use with bi-harmonic friction
- NOAA-GFDL/MOM6@f42c970 Merge pull request mom-ocean#15 from gustavo-marques/small_fixes
- NOAA-GFDL/MOM6@31787c2 Adds reference to set_time that was lost during a conflict handling
- NOAA-GFDL/MOM6@d77936e Fix intent(inout) in ice_ocean_boundary
- NOAA-GFDL/MOM6@b403edd Merge pull request mom-ocean#14 from gustavo-marques/docs
- NOAA-GFDL/MOM6@4d346ca Merge branch 'dev/ncar' into docs
- NOAA-GFDL/MOM6@f7c26a5 Clean the module and start doxygenizing it
- NOAA-GFDL/MOM6@cd58e2a Merge pull request mom-ocean#13 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@37a53bc reorganize file structure
- NOAA-GFDL/MOM6@e6c5ddd Merge pull request mom-ocean#12 from gustavo-marques/fill_ice_ocean_bnd
- NOAA-GFDL/MOM6@6b6289a Remove trailing whitespace
- NOAA-GFDL/MOM6@7ce40e5 Fix undefined reference to fill_ice_ocean_bnd
- NOAA-GFDL/MOM6@d517719 Merge branch 'dev/ncar' into fill_ice_ocean_bnd
- NOAA-GFDL/MOM6@b69ab33 Filling ice_ocean_bnd - Draft
- NOAA-GFDL/MOM6@a306c90 Merge pull request mom-ocean#11 from adcroft/use-ocn-public-for-surface
- NOAA-GFDL/MOM6@c83e238 Correct indexing when using ocean_public_type
- NOAA-GFDL/MOM6@1f39c84 Replaces use of "surface" with "ocean_public_type"
- NOAA-GFDL/MOM6@5cd8d7a Filling ice_ocean_bnd, still needs work
- NOAA-GFDL/MOM6@3ceef26 Merge pull request mom-ocean#10 from adcroft/sketch-out-mct-run
- NOAA-GFDL/MOM6@714e8d6 Adds placeholders for stepping foward MOM
- NOAA-GFDL/MOM6@7f2207c Merge pull request #7 from adcroft/fix-mct-whitespace
- NOAA-GFDL/MOM6@a1db77f Cleans up white space
- NOAA-GFDL/MOM6@5700d67 Merge pull request #6 from adcroft/add-use-only-for-imports
- NOAA-GFDL/MOM6@beac3ed Adds "only" for all use statements
- NOAA-GFDL/MOM6@231d19e Merge pull request #5 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@3a923a2 Got initialization working
- NOAA-GFDL/MOM6@8b38141 Wrapped global data
- NOAA-GFDL/MOM6@970f848 added debugging
- NOAA-GFDL/MOM6@2540ed8 Filled empty subroutines in ocn_comp_mct.F90
- NOAA-GFDL/MOM6@ed3ed30 Added ocn_import_export module
- NOAA-GFDL/MOM6@aba7dc2 Completed ocn_init_mct
- NOAA-GFDL/MOM6@5df3bc3 Added method to point ponters to members of ocean_state_type
- NOAA-GFDL/MOM6@57e6086 Added methods to return domain/grid shape
- NOAA-GFDL/MOM6@37e7356 Added ocn_import_export.F90
- NOAA-GFDL/MOM6@2b794da Merge pull request #4 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@fbd405b Added coupler indices module
- NOAA-GFDL/MOM6@fa86163 Merge pull request #3 from NCAR/dev/gfdl
- NOAA-GFDL/MOM6@e8f2999 Merge pull request #2 from gustavo-marques/temp_salt_z_init_file
- NOAA-GFDL/MOM6@86936ba Adds option to read initial temp and salt from separate files
- NOAA-GFDL/MOM6@54f7976 Most initialization working
- NOAA-GFDL/MOM6@426357c Time and calendar initialization in ocn_comp_mct.F90
- NOAA-GFDL/MOM6@346097d Moved blank ocn_comp_mct.F90
- NOAA-GFDL/MOM6@405fecb Merge pull request #1 from gustavo-marques/ice_shelf
- NOAA-GFDL/MOM6@711a613 Removes frazil's contribution to evaporation
nikizadehgfdl pushed a commit to nikizadehgfdl/MOM6 that referenced this pull request Oct 9, 2017
@adcroft
MOM6: Merge branch 'dev/master' into dev/gfdl
3f17d14 
- Updates MOM_parameter_doc files.

- NOAA-GFDL/MOM6@cde6d3f Merge branch 'dev/master' into dev/gfdl
- NOAA-GFDL/MOM6@ae22a0f Merge pull request mom-ocean#578 from NCAR/dev/ncar
- NOAA-GFDL/MOM6@f4f882f Merge pull request mom-ocean#23 from gustavo-marques/combine_mct_modules
- NOAA-GFDL/MOM6@a85b728 Merge MCT modules
- NOAA-GFDL/MOM6@ba5b5ba Merge pull request mom-ocean#22 from gustavo-marques/check_fluxes
- NOAA-GFDL/MOM6@f5a8483 Adds option to write restart files
- NOAA-GFDL/MOM6@8745b4b Fills additional IOB fluxes
- NOAA-GFDL/MOM6@f6b22ff Merge branch 'dev/ncar' into check_fluxes
- NOAA-GFDL/MOM6@369d5d6 Merge pull request mom-ocean#21 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@2582e0a Adds run paramaters to control SW decomposition
- NOAA-GFDL/MOM6@58f78b9 Fill IOB, some fluxes still need to be checked
- NOAA-GFDL/MOM6@06a30ab Fixed clock and timing
- NOAA-GFDL/MOM6@1bca79b Merge pull request mom-ocean#20 from gustavo-marques/fix_merge
- NOAA-GFDL/MOM6@fb89b08 Adds code that got lost during merge
- NOAA-GFDL/MOM6@7480492 Merge pull request mom-ocean#19 from gustavo-marques/new_merge
- NOAA-GFDL/MOM6@be1e6cf Merge branch 'dev/master' into dev/ncar
- NOAA-GFDL/MOM6@76565cb Merge pull request mom-ocean#17 from gustavo-marques/fix_ssh_slopes
- NOAA-GFDL/MOM6@c04f081 Fix ssh slope calculation
- NOAA-GFDL/MOM6@17d4586 Merge pull request mom-ocean#16 from adcroft/ncar-cherry-picked-fixes
- NOAA-GFDL/MOM6@be46fee (*)Fixes gprime(1) when no layer coordinates are set
- NOAA-GFDL/MOM6@fccb7ae Avoids a SEGV when OBC are not in use with bi-harmonic friction
- NOAA-GFDL/MOM6@f42c970 Merge pull request mom-ocean#15 from gustavo-marques/small_fixes
- NOAA-GFDL/MOM6@31787c2 Adds reference to set_time that was lost during a conflict handling
- NOAA-GFDL/MOM6@d77936e Fix intent(inout) in ice_ocean_boundary
- NOAA-GFDL/MOM6@b403edd Merge pull request mom-ocean#14 from gustavo-marques/docs
- NOAA-GFDL/MOM6@4d346ca Merge branch 'dev/ncar' into docs
- NOAA-GFDL/MOM6@f7c26a5 Clean the module and start doxygenizing it
- NOAA-GFDL/MOM6@cd58e2a Merge pull request mom-ocean#13 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@37a53bc reorganize file structure
- NOAA-GFDL/MOM6@e6c5ddd Merge pull request mom-ocean#12 from gustavo-marques/fill_ice_ocean_bnd
- NOAA-GFDL/MOM6@6b6289a Remove trailing whitespace
- NOAA-GFDL/MOM6@7ce40e5 Fix undefined reference to fill_ice_ocean_bnd
- NOAA-GFDL/MOM6@d517719 Merge branch 'dev/ncar' into fill_ice_ocean_bnd
- NOAA-GFDL/MOM6@b69ab33 Filling ice_ocean_bnd - Draft
- NOAA-GFDL/MOM6@a306c90 Merge pull request mom-ocean#11 from adcroft/use-ocn-public-for-surface
- NOAA-GFDL/MOM6@c83e238 Correct indexing when using ocean_public_type
- NOAA-GFDL/MOM6@1f39c84 Replaces use of "surface" with "ocean_public_type"
- NOAA-GFDL/MOM6@5cd8d7a Filling ice_ocean_bnd, still needs work
- NOAA-GFDL/MOM6@3ceef26 Merge pull request mom-ocean#10 from adcroft/sketch-out-mct-run
- NOAA-GFDL/MOM6@714e8d6 Adds placeholders for stepping foward MOM
- NOAA-GFDL/MOM6@7f2207c Merge pull request #7 from adcroft/fix-mct-whitespace
- NOAA-GFDL/MOM6@a1db77f Cleans up white space
- NOAA-GFDL/MOM6@5700d67 Merge pull request #6 from adcroft/add-use-only-for-imports
- NOAA-GFDL/MOM6@beac3ed Adds "only" for all use statements
- NOAA-GFDL/MOM6@231d19e Merge pull request #5 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@3a923a2 Got initialization working
- NOAA-GFDL/MOM6@8b38141 Wrapped global data
- NOAA-GFDL/MOM6@970f848 added debugging
- NOAA-GFDL/MOM6@2540ed8 Filled empty subroutines in ocn_comp_mct.F90
- NOAA-GFDL/MOM6@ed3ed30 Added ocn_import_export module
- NOAA-GFDL/MOM6@aba7dc2 Completed ocn_init_mct
- NOAA-GFDL/MOM6@5df3bc3 Added method to point ponters to members of ocean_state_type
- NOAA-GFDL/MOM6@57e6086 Added methods to return domain/grid shape
- NOAA-GFDL/MOM6@37e7356 Added ocn_import_export.F90
- NOAA-GFDL/MOM6@2b794da Merge pull request #4 from alperaltuntas/dev/ncar
- NOAA-GFDL/MOM6@fbd405b Added coupler indices module
- NOAA-GFDL/MOM6@fa86163 Merge pull request #3 from NCAR/dev/gfdl
- NOAA-GFDL/MOM6@e8f2999 Merge pull request #2 from gustavo-marques/temp_salt_z_init_file
- NOAA-GFDL/MOM6@86936ba Adds option to read initial temp and salt from separate files
- NOAA-GFDL/MOM6@54f7976 Most initialization working
- NOAA-GFDL/MOM6@426357c Time and calendar initialization in ocn_comp_mct.F90
- NOAA-GFDL/MOM6@346097d Moved blank ocn_comp_mct.F90
- NOAA-GFDL/MOM6@405fecb Merge pull request #1 from gustavo-marques/ice_shelf
- NOAA-GFDL/MOM6@711a613 Removes frazil's contribution to evaporation
SMoorthi-emc pushed a commit to SMoorthi-emc/MOM6 that referenced this pull request Apr 16, 2020
@DeniseWorthen
nuopc_driver updates (mom-ocean#22)
8d565cc 
* allows control of MOM6 restarts and MOM6 intermediate restarts using nems.configure settings restart_n and restart_option. Fixes duplicate restart issue when running with CMEPS (mom-ocean#16).
* when field dumping is turned on, all fields in import state and export state are written to single file with timestamped file name (mom-ocean#15)
* moves call to data_override field lrunoff out of the enclosing do loop (mom-ocean#21 )


Co-authored-by: Mariana Vertenstein <[email protected]>
Hallberg-NOAA added a commit to Hallberg-NOAA/MOM6 that referenced this pull request Dec 6, 2021
@Hallberg-NOAA
Merge pull request mom-ocean#21 from marshallward/new_codecov_uploader
7e1474e 
Testing: Codecov uploader update
NoraLoose pushed a commit to NoraLoose/MOM6 that referenced this pull request Mar 20, 2022
@gustavo-marques
Merge pull request mom-ocean#21 from gustavo-marques/merge_dev_gfdl_1…
471e252 
…4feb2022

Merge dev/gfdl as of 14 Feb 2022
gustavo-marques pushed a commit to gustavo-marques/MOM6 that referenced this pull request May 6, 2022
@jskenigson
Merge pull request mom-ocean#21 from jskenigson/stoch_eos_dev_rho_bug…
d0126a5 
…_fix

Change start indices in stanley_density_1d
MJHarrison-GFDL pushed a commit to MJHarrison-GFDL/MOM6 that referenced this pull request Aug 16, 2022
@underwoo
Write simple diagnostic manifest file
90abbb2 
diag_manifest.F90 added to write a simple diagnostic manifest file.

mom-ocean#21
MJHarrison-GFDL pushed a commit to MJHarrison-GFDL/MOM6 that referenced this pull request Aug 16, 2022
@underwoo
Write manifest in JSON format
d889098 
The manifest file is now written in JSON

mom-ocean#21
MJHarrison-GFDL pushed a commit to MJHarrison-GFDL/MOM6 that referenced this pull request Aug 16, 2022
@underwoo
prepend date and OMP updates for diag_manifest
61d2141 
Contains thread safe option to only run on master omp thread on master mpi rank

Add prepend date option for manifest file

Fixes mom-ocean#21
MJHarrison-GFDL pushed a commit to MJHarrison-GFDL/MOM6 that referenced this pull request Aug 16, 2022
@underwoo
Add doxygen documentation to diag_manifest.F90
e29b408 
Added the remaining doxygen documentation

Fixes mom-ocean#21.
MJHarrison-GFDL pushed a commit to MJHarrison-GFDL/MOM6 that referenced this pull request Aug 16, 2022
@underwoo
diag_manifest allow regional output manifest files
8e85c38 
diag_manifest only writes on the root PE.  This caused issues with
regional output, or any fields that would not be written on the root
PE (masking out processors may have also caused a problem).  This update
adds new mpp_gather routines to gather LOGICAL variables.  Also, checks
all PEs in PE list to know if the field was written out on any PEs.

Fixes mom-ocean#21
MJHarrison-GFDL pushed a commit to MJHarrison-GFDL/MOM6 that referenced this pull request Aug 16, 2022
@underwoo
diag_manifest deallocate arrays when done
9d045ae 
Added a routine to deallocate the field arrays once finished.

Fixes mom-ocean#21
MJHarrison-GFDL pushed a commit to MJHarrison-GFDL/MOM6 that referenced this pull request Aug 16, 2022
@underwoo
DM manifest files better performance
996c5b0 
This update only calls the mpp_gather when the file/field has regional data

Fixes mom-ocean#21
MJHarrison-GFDL pushed a commit to MJHarrison-GFDL/MOM6 that referenced this pull request Aug 16, 2022
@underwoo
Turn off writing manifest file by default
dd5e709 
Control the writing of the manifest files with the diag_manager_nml::write_manifest_file namelist variable

The value of this variable is `.FALSE.` by default.

Fixes mom-ocean#21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@MJHarrison-GFDL @adcroft