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.

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

Fix some formatting in MPAS-Ocean Registry for generating docs #6293

Merged
merged 3 commits into from
Mar 28, 2024

Conversation

xylar
Copy link
Contributor

@xylar xylar commented Mar 13, 2024

To generate Latex documentation from the Registry, we need to escape Latex in the namelist and variable descriptions.

@xylar xylar added mpas-ocean BFB PR leaves answers BFB MPAS-Ocean standalone Issues and features for standalone MPAS-Ocean code that dont impact E3SM. labels Mar 13, 2024
@xylar
Copy link
Contributor Author

xylar commented Mar 13, 2024

Discussion on this PR can be seen at: E3SM-Ocean-Discussion#81

Copy link
Contributor

@mark-petersen mark-petersen left a comment

Choose a reason for hiding this comment

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

Yes, this is all correct. Thanks!

@@ -1196,7 +1196,7 @@ Default: Defined in namelist_defaults.xml

<entry id="config_sw_absorption_type" type="char*1024"
category="shortwaveRadiation" group="shortwaveRadiation">
Name of shortwave absorption type used in simulation.
Name of shortwave absorption type used in simulation.
Copy link
Contributor

Choose a reason for hiding this comment

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

This may have to be fixed in Registry instead of by hand in this generated file

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I fixed this in the registry as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I use an editor that automatically trims trailing whitespace (which I wish more folks would do). It seems easier to fix this than to revert it.

Copy link
Contributor

Choose a reason for hiding this comment

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

No need to revert it if you fixed it in Registry as well. Thanks for taking that on

@jonbob
Copy link
Contributor

jonbob commented Mar 21, 2024

@xylar -- this may have to be rebased after the merge of #6224?

To generate Latex documentation from the Registry, we need to
escape Latex in the namelist and variable descriptions.
@xylar xylar force-pushed the ocn/fix-registry-for-docs branch from 69be54d to 271b548 Compare March 22, 2024 07:49
jonbob added a commit that referenced this pull request Mar 27, 2024
Fix some formatting in MPAS-Ocean Registry for generating docs

To generate Latex documentation from the Registry, we need to escape
Latex in the namelist and variable descriptions.

[BFB]
@jonbob
Copy link
Contributor

jonbob commented Mar 27, 2024

@xylar -- thanks for having the bld files completely consistent with Registry.

Passes sanity testing with:

  • ERS_Ld5.T62_oQU120.CMPASO-NYF.chrysalis_intel
  • ERP_Ld3.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.chrysalis_intel.allactive-pioroot1

merged to next

@jonbob jonbob merged commit cd40745 into E3SM-Project:master Mar 28, 2024
11 checks passed
@jonbob
Copy link
Contributor

jonbob commented Mar 28, 2024

merged to master

@xylar xylar deleted the ocn/fix-registry-for-docs branch March 28, 2024 18:23
@xylar
Copy link
Contributor Author

xylar commented Mar 28, 2024

@jonbob, thanks so much!

xylar added a commit to xylar/compass that referenced this pull request May 8, 2024
This merge updates the E3SM-Project submodule from [93e511d](https://github.com/E3SM-Project/E3SM/tree/93e511d) to [31e0924](https://github.com/E3SM-Project/E3SM/tree/31e0924).

This update includes the following MPAS-Ocean and MPAS-Frameworks PRs (check mark indicates bit-for-bit with previous PR in the list):
- [ ]  (ocn) E3SM-Project/E3SM#6256
- [ ]  (ocn) E3SM-Project/E3SM#6224
- [ ]  (ocn) E3SM-Project/E3SM#6270
- [ ]  (ocn) E3SM-Project/E3SM#6293
- [ ]  (ocn) E3SM-Project/E3SM#6321
- [ ]  (ocn) E3SM-Project/E3SM#6262
- [ ]  (ocn) E3SM-Project/E3SM#6300
- [ ]  (ocn) E3SM-Project/E3SM#6334
- [ ]  (ocn) E3SM-Project/E3SM#6371
- [ ]  (ocn) E3SM-Project/E3SM#6288
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BFB PR leaves answers BFB MPAS-Ocean standalone Issues and features for standalone MPAS-Ocean code that dont impact E3SM. mpas-ocean
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants