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

dev/master from 20191107 #4

Merged
merged 72 commits into from
Nov 13, 2019
Merged

dev/master from 20191107 #4

merged 72 commits into from
Nov 13, 2019

Conversation

JessicaMeixner-NOAA
Copy link
Collaborator

No description provided.

gustavo-marques and others added 30 commits August 15, 2019 14:46
@gustavo-marques
Add time0 and timenow in MCT
52b018b
@gustavo-marques
Add time0 and timenow in NUOPC
bd57605
@gustavo-marques
Deletes unecessary if statement
4191689
@gustavo-marques
Deletes blank line contains spaces
52225e3
@gustavo-marques
Replaces timenow with time_start and corrects comments.
b61053b
@alperaltuntas
Merge pull request NOAA-EMC#116 from gustavo-marques/fix_ocean_stats
b595da4 
 Adds time0 and timenow in MCT and NUOPC
@gustavo-marques
Obsolete parameter ADD_KV_SLOW
6e145df
@gustavo-marques
Removes visc%Kv_slow from restart files
9f2f709
@alperaltuntas
Merge pull request NOAA-EMC#117 from gustavo-marques/remove_kv_slow
5ff5a93 
 Obsolete ADD_KV_SLOW and remove visc%Kv_slow from restart files
@gustavo-marques
Fix first four loop indices suggested by Bob
93727f8 
NOTE: we need to add a warning that MEKE_EQUILIBRIUM only works
if MEKE_KHCOEFF > 0.
@gustavo-marques
Deletes max_diss_rate_bt since it is never used
e778191
@gustavo-marques
Fixes the remaining loop indices related to GME
3b7cb69
@gustavo-marques
Removes unneeded calls to pass_var and add calls to pass_vector
3257801
@gustavo-marques
Groups terms for rotational invariance and deletes beta_h and beta_q …
b339108 
…(unused)
@gustavo-marques
Adds correct calculation of GME at q points
0aeec9d
@gustavo-marques
Created new variables dvdx3/dudy3 for shearing strain on the Laplacian
fa773cd
@gustavo-marques
Deleting comments
2ac12ce
@gustavo-marques
Adds consistency check between mesh and mom6 grid
d29a435 
Check for consistency of lat, lon and mask between mesh and mom6 grid
@gustavo-marques
Replaces CICE to MOM in error messages
fb1133e
@alperaltuntas
Merge pull request NOAA-EMC#118 from gustavo-marques/consistency_chec…
d6277ca 
…k_nuopc

Adds consistency check between mesh and mom6 grid
@alperaltuntas
remove labeled format specifiers
7ad7296
@gustavo-marques
Adds new parameter, MEKE_EQUILIBRIUM_ALT
cc9e33d 
This will use an alternative formula for computing the equilibrium
(initial) value of MEKE.
@gustavo-marques
Final GME code fix
d05235f 
Changed the loop indices on boundary mask. Added three new runtime parameters
for GME (GME_H0, GME_EFFICIENCY, GME_LIMITER)
@alperaltuntas
replace hard-coded mesh diff. limit with a param: eps_omesh
18c6f1e
@alperaltuntas
add units to EPS_OMESH
66f808b
@alperaltuntas
call get_eps_omesh and remove hardcoded limit
c698b1a
@alperaltuntas
call MOM_error if mesh is inconsistent
d9a00d7
@alperaltuntas
compare mod 360 of diff and eps
e02b358
@alperaltuntas
Add EPS_OMESH value in error message
7f7e8c0
@gustavo-marques
Merge pull request NOAA-EMC#119 from NCAR/improve_consistency_check
d329136 
Improve mesh consistency check
alperaltuntas and others added 17 commits September 17, 2019 15:55
@alperaltuntas
set EXTRACT_ALL to generate call graphs
521c732
@alperaltuntas
Merge pull request NOAA-EMC#124 from alperaltuntas/create_ncar_fork_o…
2bd130f 
…f_doxygen

further doxygen changes
@rsdunlapiv
Fix the NUOPC cap doxygen to use HTML style formatting for the import…
7dc0fd0 
…/export field tables
@rsdunlapiv
Move doxygen to end of module to be consistent with MOM6 conventions
d1b0322
@alperaltuntas
Merge pull request NOAA-EMC#125 from NCAR/rsdunlapiv/cap_doc_fix
d8a3886 
Fix the NUOPC cap doxygen to use HTML style formatting
@alperaltuntas
Merge branch 'dev/ncar' into create_ncar_fork_of_doxygen
0369959
@alperaltuntas
Merge branch 'dev/ncar' of https://github.com/NCAR/MOM6 into dev/ncar
3260a30
@alperaltuntas
Merge branch 'dev/ncar' into create_ncar_fork_of_doxygen
51a179a
@alperaltuntas
fix subroutine table
900ad92
@alperaltuntas
fix import/export field tables
de0777d
@alperaltuntas
correct runoff units
8648351
@alperaltuntas
Merge pull request NOAA-EMC#126 from alperaltuntas/create_ncar_fork_o…
3b957a7 
…f_doxygen

further changes for doxygen ncar fork
@gustavo-marques
Merge branch 'dev/master' into dev-master-candidate-ncar-2019-10-02
be86d57
@gustavo-marques
Restored comments documenting the dimensional rescaling of variables
bccdf19
@marshallward
Merge pull request mom-ocean#1013 from gustavo-marques/dev-master-can…
ec31391 
…didate-ncar-2019-10-02

Dev master candidate from NCAR 2019/10/02
@JessicaMeixner-NOAA
Merge remote-tracking branch 'GFDL/dev/master' into testnewdevmaster2…
100e92d 
…0191107

 Conflicts:
	config_src/nuopc_driver/mom_cap.F90
@JessicaMeixner-NOAA
updating mom_cap to add data override which was deleted in merge
07481e4
DeniseWorthen
DeniseWorthen approved these changes Nov 12, 2019
View reviewed changes
Copy link
Collaborator

@DeniseWorthen DeniseWorthen left a comment

Choose a reason for hiding this comment

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

Looks good to me and if we're b4b w/ previous I think they're fine.

@JessicaMeixner-NOAA
Copy link
Collaborator Author

@DeniseWorthen It was bit-for-bit with the previous version.

jiandewang
jiandewang reviewed Nov 13, 2019
View reviewed changes
Copy link
Collaborator

@jiandewang jiandewang left a comment

Choose a reason for hiding this comment

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

looks good

@JessicaMeixner-NOAA JessicaMeixner-NOAA self-assigned this Nov 13, 2019
@JessicaMeixner-NOAA JessicaMeixner-NOAA merged commit 9a6f7f6 into NOAA-EMC:dev/emc Nov 13, 2019
@SMoorthi-emc SMoorthi-emc mentioned this pull request Apr 13, 2020
Merged
jiandewang referenced this pull request in jiandewang/MOM6 Jan 22, 2021
@DeniseWorthen
Merge pull request #4 from NOAA-EMC/dev/emc
74f8d11 
merge dev/emc
jiandewang referenced this pull request in jiandewang/MOM6 Feb 19, 2021
@neerajabhamidipati
Merge pull request #4 from ocean-eddy-cpt/update-mom6-nov-2020
2507f7a 
Update CPT fork of MOM6 to latest (12/10/2020) from NOAA-GFDL
jiandewang referenced this pull request in jiandewang/MOM6 Jun 17, 2021
@Hallberg-NOAA
Merge pull request #4 from gustavo-marques/less_checksums_mct_nuopc
2579d07 
Only write checksums from root PE MCT/NUOPC caps
jiandewang pushed a commit that referenced this pull request Feb 24, 2022
@Hallberg-NOAA
Merge pull request #4 from herrwang0/hor_visc_typos
7b96ac1 
Correct a couple of typos in hor_visc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DeniseWorthen DeniseWorthen DeniseWorthen approved these changes

@jiandewang jiandewang jiandewang approved these changes

Assignees

@JessicaMeixner-NOAA JessicaMeixner-NOAA

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@JessicaMeixner-NOAA @jiandewang @DeniseWorthen @gustavo-marques @alperaltuntas @rsdunlapiv @marshallward