Otec 1d testing#1
Open
hdrake wants to merge 24 commits into
Open
Conversation
Right now it is just my diffusion1d example experiment but where I have included a W_OTEC input parameter to MOM_input
Owner
Author
|
To summarize the two possible approaches:
|
hdrake
commented
Aug 1, 2022
Comment on lines
+161
to
+162
| Z_INIT_ALE_REMAPPING = True ! [Boolean] default = False | ||
| ! If True, then remap straight to model coordinate from file. |
Owner
Author
There was a problem hiding this comment.
@fdf2002, it seems this input needs to be changed to correctly read in the input data when using the ALE mode (i.e. any coordinate besides Layer).
I think that without this, the model assumes the input data is in layer coordinates and so it does funky things.
- Increased number of layers to 240 just to make plots look nicer and highlight the sinks / sources - Updated all three key experiments: with_otec, without_otec, and with_otec_no-regrid - Added calculation of layer depths (by averaging upper- and lower-interface heights) - Plotted temperature and salinity against instantaneous layer depths (eh) instead of defined layer depths (zl) - Removed outputs before committing notebooks so that the files are not too large
Owner
Author
|
@fdf2002, check out commit bacac62 in which I update the notebooks to fix both of the key issues I pointed out last week:
|
Owner
Author
|
@fdf2002, for posterity sake, we should probably also start clearing all outputs before committing notebooks to Github, except maybe for major commits. There are two reasons for this: 1) it makes it easier to interpret the git To do this in the notebook, go to Edit -> Clear All Outputs. |
hdrake
pushed a commit
that referenced
this pull request
Mar 24, 2023
- NOAA-GFDL/MOM6@835b1661c (*)Use visc%Kv_shear in calculate_CVMix_conv call - NOAA-GFDL/MOM6@371c8bb26 +Eliminated 3 unused elements of the surface type - NOAA-GFDL/MOM6@79eb80794 In the case that nonzero_count <=1, a (dummy) value is set for non_unique_scales before returning - NOAA-GFDL/MOM6@8c605fef3 (*)Internal thickness variable unit correction - NOAA-GFDL/MOM6@4bcc8490b Makedep (#1) - NOAA-GFDL/MOM6@546312aed Adds "makedep" script to replace mkmf - NOAA-GFDL/MOM6@e5580e3b9 Re-factored GFDL gitlab pipeline - NOAA-GFDL/MOM6@3b80e443d Follow MOM6 code style guide - NOAA-GFDL/MOM6@0c1e89a2c Add missing units - NOAA-GFDL/MOM6@466ca80f7 Remove Travis CI config - NOAA-GFDL/MOM6@328c44000 +Clean up dimensional rescaling in OBC code - NOAA-GFDL/MOM6@aa86abaa0 Put CVMix convective viscosity into shear term - NOAA-GFDL/MOM6@8f97b3d2f Corrections to cell-averaged density computation (NOAA-GFDL#213) - NOAA-GFDL/MOM6@2cd228fbe Adds conditional for setting fluxes%heat_content_* - NOAA-GFDL/MOM6@fc3ab450b Avoid rotating arrays that are not associated - NOAA-GFDL/MOM6@f81414708 Add missing logical to control allocation of fluxes - NOAA-GFDL/MOM6@b9b67a838 Changes needed for when enthalpy is via coupler - NOAA-GFDL/MOM6@fc05abe21 Modifications needed for when enthalpy is via CPL - NOAA-GFDL/MOM6@7924fbaee Modify log/description of ENTHALPY_FROM_COUPLER - NOAA-GFDL/MOM6@b7665f481 Heat conservation when enthalpy is via coupler - NOAA-GFDL/MOM6@72daf7b0c Add option to receive enthalpy fluxes via coupler - NOAA-GFDL/MOM6@6963b222d Add KPP nonlocal term to passive tracers (NOAA-GFDL#202) - NOAA-GFDL/MOM6@098f5c9d9 fix u10_sqr dimensional scaling - NOAA-GFDL/MOM6@b39648adc merge with latest main (2020feb17) and resolve conflicts - NOAA-GFDL/MOM6@035ae5c85 Misc dimensional consistency fixes in regridding, remapping, and MEKE routines - NOAA-GFDL/MOM6@c18185422 fix line lenght error in MOM_wave_interface - NOAA-GFDL/MOM6@a00b7799f Merge remote-tracking branch 'NCAR/surfbands_refactor' into BGR_Stokes_DDT_Fixes - NOAA-GFDL/MOM6@dc59b117b Fixing restart issue with Stokes time tendency term. - NOAA-GFDL/MOM6@f89fd1351 Fixing diagnostic mode for vortex force correction term. - NOAA-GFDL/MOM6@58874a5f3 Updates to Stokes drift terms, primarily the pressure gradient routine. - NOAA-GFDL/MOM6@4f592f298 More changes for surfbands wave coupling: - for ustkb and vstkb, call pass_var, instead of pass_vector because they are on h grd. -remove unused ustk0 and vstk0 arrays. - correct the order of wave-related get param & allocate_forcing calls in nuopc cap. - add lamult flag to allocate_forcing_by_group because lamult should only be allocated if wave_method=="EFACTOR". - NOAA-GFDL/MOM6@28268d3e6 fixes in MOM_wave_interface array indices - NOAA-GFDL/MOM6@dc93bdeef Fixes for Stokes time tendency terms - NOAA-GFDL/MOM6@b619d38eb remove duplicate assignments of dvdx and dudy. These duplicate assignments incorrectly override dvdx and dudy when surfbands wave coupling is on. - NOAA-GFDL/MOM6@cb671d2c0 merge with latest dev/ncar and resolve conflicts - NOAA-GFDL/MOM6@d4c36a60a Fix openmp test by adding Stokes_VT to shr clause in MOM_CoriolisAdv. Also remove the Passive_Stokes_VF block since it's never set to true. - NOAA-GFDL/MOM6@e2ab77e99 initialize wave option flags to false - NOAA-GFDL/MOM6@c880a156a For the drivers calling MOM_wave_interface_init, add the optional waves_csp arg to initialize_MOM calls so as to ensure that the waves_csp is allocated. This commit also has several misc doxygen fixes. - NOAA-GFDL/MOM6@e7f628e17 refactoring and changes to write stokes drift profile to restart file when surfbands wave coupling mode is on. - NOAA-GFDL/MOM6@15c3d53de changes in the nuopc cap to support arbitrary stokes bands With these changes, arbitrary number of of partitioned stokes drift components may be imported from ww3 when coupled within cesm. After the planned unification of ww3 nuopc caps of CESM and EMC, the old (fixed) approach may be removed. - NOAA-GFDL/MOM6@eacd9d016 fix doxygen errors in surfbands_refactor branch - NOAA-GFDL/MOM6@a0d1d9982 Do not call get_Langmuir_Number if lamult is already provided via ww3 - NOAA-GFDL/MOM6@b1c341248 enclose stokes vorticity diag computations with Stokes_VF conditional - NOAA-GFDL/MOM6@824039dac enclose stokes vorticity diag computations with Stokes_VF conditional - NOAA-GFDL/MOM6@59a31f62c remove unnecessary ampersands from variable declarations - NOAA-GFDL/MOM6@dcf30ac50 merge pr1507 with dev/ncar and resolve conflicts in MOM_tidal_mixing - NOAA-GFDL/MOM6@6e94b699b disable the register of tidal mixing coeff diags when they are unavailable - NOAA-GFDL/MOM6@e3d190db3 In NUOPC cap, add ability to import fields with ungridded dimensions - NOAA-GFDL/MOM6@380a04090 Merge remote-tracking branch 'breichl/Stokes_Forces' into pstokes_wave_cpl_mehtod - NOAA-GFDL/MOM6@c5f1d442e Updating name of Stokes PGF routine to be more descriptive. - NOAA-GFDL/MOM6@a6de11c92 Remote application of Stokes tendency on thermodynamic step - NOAA-GFDL/MOM6@9fbdf11ec Finish incomplete merge in MOM_wave_interface. - NOAA-GFDL/MOM6@77084ecc9 Adding Stokes forces implementation and diags. New parameters - STOCH_EOS - STANLEY_COEFF - STANLEY_A - USE_STANLEY_GM - USE_STANLEY_PGF - USE_STANLEY_ML - USE_STANLEY_ISO Removed parameters: - STANLEY_PRM_DET_COEFF
hdrake
pushed a commit
that referenced
this pull request
Mar 24, 2023
- NOAA-GFDL/MOM6@c61978184 (*)Fix set_up_ALE_sponge_field call T & S scaling - NOAA-GFDL/MOM6@8ddd0c1a2 (*)Corrected OBC allocated tests in advect_y - NOAA-GFDL/MOM6@c8a62692c Added tracer debugging checksum calls - NOAA-GFDL/MOM6@58db99ba2 +Overload MOM_tracer_chksum to use tracer registry - NOAA-GFDL/MOM6@2217e6319 +Restored public interface to post_data_1d_k - NOAA-GFDL/MOM6@64fe4fc67 Fix to dumbbell initialization in layer mode (NOAA-GFDL#160) - NOAA-GFDL/MOM6@05e705da9 +*Use runtime parameters in DOME initialization - NOAA-GFDL/MOM6@c2e8465cf *Fix DOME2d_initialize_temperature_salinity bug - NOAA-GFDL/MOM6@4f039a880 +Fix diagnostic conversions in code from dev/ncar - NOAA-GFDL/MOM6@48875ea0d Fix to reading of partial OBCs from file. - NOAA-GFDL/MOM6@43771d85c (*)Correct salinity rescaling in OBCs from files - NOAA-GFDL/MOM6@58d704bc1 fix call to tridiagonal solver - NOAA-GFDL/MOM6@c9dd80404 MacOS support - NOAA-GFDL/MOM6@1f64bf1ab +Tiny fix to SIMPLE Northern OBC - NOAA-GFDL/MOM6@9ecf1a6c7 makedep: Allow two versions of same file - NOAA-GFDL/MOM6@258111803 makedep: replaced includes_in_path() with list comprehension - NOAA-GFDL/MOM6@5121534cf makedep: fix for F90 includes - NOAA-GFDL/MOM6@cde444a85 Re-developed makedep in python - NOAA-GFDL/MOM6@1c0e1f873 +Add set_initialized - NOAA-GFDL/MOM6@12f2e55f5 gitlab-ci: add concurrent jobs in run stage - NOAA-GFDL/MOM6@1e9febecf Fix PGI warnings about intent for restart_CS - NOAA-GFDL/MOM6@835b1661c (*)Use visc%Kv_shear in calculate_CVMix_conv call - NOAA-GFDL/MOM6@371c8bb26 +Eliminated 3 unused elements of the surface type - NOAA-GFDL/MOM6@48adab788 +Add option to apply bottom drag as a body force - NOAA-GFDL/MOM6@a824f802f +Convert 16 vertvisc_type pointers to allocatables - NOAA-GFDL/MOM6@0a8210adc +Add DEBUG_FULL_COLUMN for debugging accelerations - NOAA-GFDL/MOM6@79eb80794 In the case that nonzero_count <=1, a (dummy) value is set for non_unique_scales before returning - NOAA-GFDL/MOM6@8c605fef3 (*)Internal thickness variable unit correction - NOAA-GFDL/MOM6@4bcc8490b Makedep (#1) - NOAA-GFDL/MOM6@546312aed Adds "makedep" script to replace mkmf - NOAA-GFDL/MOM6@e5580e3b9 Re-factored GFDL gitlab pipeline - NOAA-GFDL/MOM6@466ca80f7 Remove Travis CI config - NOAA-GFDL/MOM6@328c44000 +Clean up dimensional rescaling in OBC code - NOAA-GFDL/MOM6@aa86abaa0 Put CVMix convective viscosity into shear term - NOAA-GFDL/MOM6@4288d418c Move underflow code into separate loops - NOAA-GFDL/MOM6@c35da375a +Add user-controlled underflow of tracers - NOAA-GFDL/MOM6@ec8892383 Rescale ice shelf temperatures - NOAA-GFDL/MOM6@95119a251 (*)Fix ice shelf dimensional rescaling bugs - NOAA-GFDL/MOM6@4a6a175ca Bugfix: find_index in FMS2 infra - NOAA-GFDL/MOM6@1ad842cdb Replace findloc() with user-defined find_index - NOAA-GFDL/MOM6@37782ebbc Fixes badge for doc build status - NOAA-GFDL/MOM6@203a19f48 Fix a rescaling bug with MEKE_EQUILIBRIUM_ALT - NOAA-GFDL/MOM6@27bb8b833 (*)Corrected OBC restart scaling bugs - NOAA-GFDL/MOM6@9a604d467 (*)Fix occasional bug with PFv_visc_rem diagnostic - NOAA-GFDL/MOM6@8b513055b Simplify set_grid_metrics_from_mosaic - NOAA-GFDL/MOM6@2b5b4388a +Add optional scale argument to time_interp_external - NOAA-GFDL/MOM6@0b056864e Fix bugs in output files with rescaled heights - NOAA-GFDL/MOM6@cf448a1ec MOM_file_parser unit test implementation - NOAA-GFDL/MOM6@1c6696427 Rescaled dumbbell_initialize_thickness salinities - NOAA-GFDL/MOM6@079fd3e44 +Add cons_temp_to_pot_temp & abs_saln_to_prac_saln - NOAA-GFDL/MOM6@d4ccf5663 Fix data read for on-grid interpolation - NOAA-GFDL/MOM6@b3c41b105 +Rescale vars in MOM_temp_salt_initialize_from_Z - NOAA-GFDL/MOM6@31d411776 Correct a few more temperature and salin units - NOAA-GFDL/MOM6@6d78d2b0a +Add rescaling for temperature and salinity (2) - NOAA-GFDL/MOM6@5a89a9d0c +Add rescaling for temperature and salinity (1) - NOAA-GFDL/MOM6@44a786178 +Add scale argument to set_up_ALE_sponge - NOAA-GFDL/MOM6@47f13924c Modify more units in temperature and saln comments - NOAA-GFDL/MOM6@14a222ea3 Use simpler calculate_TFreeze interfaces - NOAA-GFDL/MOM6@b8e599034 +Temperature and salinity rescaling in MOM_EOS.F90 - NOAA-GFDL/MOM6@5d88f2e47 Modify units in temperature and salinity comments - NOAA-GFDL/MOM6@f52c40aec Fix a bug in the rescaling of drho_dT_dP - NOAA-GFDL/MOM6@0903609a6 +Make equation of state interfaces more consistent - NOAA-GFDL/MOM6@f51355476 Clarify argument units for int_density_dz_wright - NOAA-GFDL/MOM6@75ebb4090 +Refactored MOM_density_integrals - NOAA-GFDL/MOM6@3a9d51163 Revise how the drho_dT diagnostic is calculated - NOAA-GFDL/MOM6@07df0bfd7 Clarify units for equation of state arguments - NOAA-GFDL/MOM6@9c2e57310 Document variables in diagnoseMLDbyEnergy - NOAA-GFDL/MOM6@548be25b5 Remove unused module use for calculate_density - NOAA-GFDL/SIS2@6e0eda1 +(*)Write unscaled SIS2 restart files - NOAA-GFDL/SIS2@547cda8 Standardize syntax in mask2d logical tests (NOAA-GFDL#172) - NOAA-GFDL/SIS2@f77d1f1 Fix indents per review - NOAA-GFDL/SIS2@8b5ad57 Bug Fix for specified ice - NOAA-GFDL/SIS2@acf0d89 Pass flux,fluv to compute_ocean_albedo for white cap parametrization - NOAA-GFDL/SIS2@0a0dce6 Fix specified_ice restart issue. - NOAA-GFDL/SIS2@5bf4d4a Pass flux_u,flux_v to compute_ocean_albedo for white caps parametrization
|
Check out this pull request on See visual diffs & provide feedback on Jupyter Notebooks. Powered by ReviewNB |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Hey @fdf2002, I started this pull request which right now just has a basic skeleton for an OTEC parameterization. Let's walk through it later today!
I realized starting from scratch would just be too overwhelming so hopefully this is more tractable starting point!