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

RTD support for ww3_boun[dc] #10

Merged
merged 5 commits into from
Jul 28, 2020
Merged

RTD support for ww3_boun[dc] #10

merged 5 commits into from
Jul 28, 2020

Conversation

ukmo-ccbunney
Copy link
Member

@ukmo-ccbunney ukmo-ccbunney commented Jul 22, 2020

Ref issue: NOAA-EMC#231

Adds rotated pole support for the ww3_bound and ww3_bounc programs.
Input spectra are always assumed to be formulated on a standard pole.

All regression tests that utilise the ww3_bounc program have been run and show no differences:

Note: commit cc0a204 provides support for an upcoming PR [#7] that allows the user to specify the pole location of the target grid(s) used for specifying output boundary points. In this PR, the RTD may be enabled even if the source grid is formulated on a standard pole.

@ukmo-ccbunney ukmo-ccbunney added enhancement New feature or request bug Something isn't working and removed enhancement New feature or request labels Jul 22, 2020
Copy link

@ukmo-ansaulter ukmo-ansaulter left a comment

Choose a reason for hiding this comment

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

Hi @ukmo-ccbunney

I've added a few comments - mostly queries.

Andy

model grid is not formulated on a rotated pole.
@ukmo-ansaulter ukmo-ansaulter self-requested a review July 23, 2020 11:20
Copy link

@ukmo-ansaulter ukmo-ansaulter left a comment

Choose a reason for hiding this comment

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

Happy with all the code and revisions now.

Copy link
Collaborator

@CarstenHansen CarstenHansen left a comment

Choose a reason for hiding this comment

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

I have controlled that the changes are consistent with the instructions in the User manual, Appendix B section B.2: "Using ww3 bound and/or unstructured grids".

It appears all clear and consistent, although I have no personal experience using ww3_bound or ww3_bound. The user might think of requesting input spectra formulated on the rotated grid, and a formulation in the user manual might help to avoid that.

Comment on lines +72 to +74
! - Input spectra are assumed to be formulated on a standard
! pole. However, the model grid can be on a rotated pole.
!
Copy link
Collaborator

Choose a reason for hiding this comment

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

This is an important note. A user might do mistakes if not aware of this. May be mentioned in the Manual Sect. 3.4.9 Rotated grids in a separate, short paragraph like: "If the user wants to apply boundary condition from spectral files using one of the programs ww3_bounc or ww3_bound as described in Appendix B.2, the input spectra are assumed to be formulated on a standard pole."

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for the review @CarstenHansen . I will make a small addition the to manual to ensure the user is aware that input spectra should be on a standard pole.

Copy link
Member Author

Choose a reason for hiding this comment

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

I have also added some comments in the relevant .inp and .nml files.

Copy link
Member Author

Choose a reason for hiding this comment

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

If you are happy with the manual/documentation changes, @CarstenHansen , then I will merge and close this PR. Thanks.

ww3_bounc only accept input spectra formulated on a standard pole grid.
Copy link
Collaborator

@CarstenHansen CarstenHansen left a comment

Choose a reason for hiding this comment

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

Good to include the note in the .nml and .inp templates.

Comment on lines 67 to 68

Note
Copy link
Collaborator

Choose a reason for hiding this comment

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

Extra lines left here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Oops. Yes - good spot! Fixed in latest commit.

Comment on lines +43 to +48
reference frame.

If the user wishes to generate boundary conditions for a rotated pole grid using
the {\bf ww3\_bound} or {\bf ww3\_bounc} boundary processing programs, then it
should be noted that the input spectra for these programs are always expected
to be formulated on a \emph{standard pole}.
Copy link
Collaborator

Choose a reason for hiding this comment

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

A perfect formulation.

@ukmo-ccbunney ukmo-ccbunney merged commit 6c42d17 into staging Jul 28, 2020
This was referenced Jul 29, 2020
ukmo-ccbunney added a commit that referenced this pull request Aug 18, 2020
* Added boundary checks to the SMC grid input files for ww3_grid,
to ensure they comply with the limits of the nameslist.

* Fb 360 calendar (#8)

Changes to add support to 360-day and 365-day (no leap year) calendar - see ticket NOAA-EMC#209
  * Additional CALTYPE namelist parameter in MISC section
  * New ww3_tc1 regtest.

* RTD support for ww3_boun[dc] (#10)

* Updated ww3_bound and ww3_bounc to handle model grids formulated on a rotated pole.
* Manual and nml/inp files to updated clarify that ww3_bound/ww3_bounc only accept input spectra formulated on a standard pole grid.

* Fb coupling time (#9)

Updates to allow a coupling time step that is different from the model time step. 
* Includes new regtest (in ww3_tp2.14) for non-default oasis time step.
* ww3_tp2.14 regtest added to matrix.base.

* bug fix for ukmet development

Co-authored-by: lewis.sampson <lsampson@vld240.cmpd1.metoffice.gov.uk>
Co-authored-by: Juan Manuel Castillo Sanchez <48921434+ukmo-juan-castillo@users.noreply.github.com>
Co-authored-by: Chris Bunney <48915820+ukmo-ccbunney@users.noreply.github.com>
@ukmo-ccbunney ukmo-ccbunney deleted the bf_boundrtd branch September 28, 2020 09:07
ukmo-ccbunney added a commit that referenced this pull request Oct 21, 2020
* Added boundary checks to the SMC grid input files for ww3_grid,
to ensure they comply with the limits of the nameslist.

* Fb 360 calendar (#8)

Changes to add support to 360-day and 365-day (no leap year) calendar - see ticket NOAA-EMC#209
  * Additional CALTYPE namelist parameter in MISC section
  * New ww3_tc1 regtest.

* RTD support for ww3_boun[dc] (#10)

* Updated ww3_bound and ww3_bounc to handle model grids formulated on a rotated pole.
* Manual and nml/inp files to updated clarify that ww3_bound/ww3_bounc only accept input spectra formulated on a standard pole grid.

* Fb coupling time (#9)

Updates to allow a coupling time step that is different from the model time step. 
* Includes new regtest (in ww3_tp2.14) for non-default oasis time step.
* ww3_tp2.14 regtest added to matrix.base.

* bug fix for ukmet development

* see issue NOAA-EMC#245

this is a bug introduced with the last PR from UKMO
#8: 360 day climate calendar

in ww3_trnc.ftn
END CASE
should be replaced by
END SELECT

Co-authored-by: lewis.sampson <lsampson@vld240.cmpd1.metoffice.gov.uk>
Co-authored-by: Juan Manuel Castillo Sanchez <48921434+ukmo-juan-castillo@users.noreply.github.com>
Co-authored-by: Chris Bunney <48915820+ukmo-ccbunney@users.noreply.github.com>
ukmo-ccbunney added a commit that referenced this pull request Jan 15, 2021
* Added boundary checks to the SMC grid input files for ww3_grid,
to ensure they comply with the limits of the nameslist.

* Fb 360 calendar (#8)

Changes to add support to 360-day and 365-day (no leap year) calendar - see ticket NOAA-EMC#209
  * Additional CALTYPE namelist parameter in MISC section
  * New ww3_tc1 regtest.

* RTD support for ww3_boun[dc] (#10)

* Updated ww3_bound and ww3_bounc to handle model grids formulated on a rotated pole.
* Manual and nml/inp files to updated clarify that ww3_bound/ww3_bounc only accept input spectra formulated on a standard pole grid.

* Fb coupling time (#9)

Updates to allow a coupling time step that is different from the model time step. 
* Includes new regtest (in ww3_tp2.14) for non-default oasis time step.
* ww3_tp2.14 regtest added to matrix.base.

* bug fix for ukmet development

* Updating develop with a change to allow code build using non-standard NetCDF libraries using alphabetical characters in their version name.

Co-authored-by: lewis.sampson <lsampson@vld240.cmpd1.metoffice.gov.uk>
Co-authored-by: Juan Manuel Castillo Sanchez <48921434+ukmo-juan-castillo@users.noreply.github.com>
Co-authored-by: Chris Bunney <48915820+ukmo-ccbunney@users.noreply.github.com>
Co-authored-by: Ali Abdolali <aliabdolali@Alis-MBP.fios-router.home>
ukmo-ccbunney added a commit that referenced this pull request Apr 1, 2021
* Added boundary checks to the SMC grid input files for ww3_grid,
to ensure they comply with the limits of the nameslist.

* Fb 360 calendar (#8)

Changes to add support to 360-day and 365-day (no leap year) calendar - see ticket NOAA-EMC#209
  * Additional CALTYPE namelist parameter in MISC section
  * New ww3_tc1 regtest.

* RTD support for ww3_boun[dc] (#10)

* Updated ww3_bound and ww3_bounc to handle model grids formulated on a rotated pole.
* Manual and nml/inp files to updated clarify that ww3_bound/ww3_bounc only accept input spectra formulated on a standard pole grid.

* Fb coupling time (#9)

Updates to allow a coupling time step that is different from the model time step. 
* Includes new regtest (in ww3_tp2.14) for non-default oasis time step.
* ww3_tp2.14 regtest added to matrix.base.

* bug fix for ukmet development

* Periodicity fix for global unstructured grids

 - Corrects calculation of element areas and edge lengths across the
   dateline in w3triamd.ftn

 - Fixes calculation to determine whether a point is inside an element
   that spans the dateline in w3triamd.ftn

 - Corrects calculation of element centers and corners across dateline
   in wmscrpmd.ftn

 - Write out SCRIP file in netCDF format at the end of ww3_grid
   (for creating offline remaping files). This required adding netCDF support
   to ww3_grid

 - Also includes minor fix for the /O7a switch in w3iopomd.ftn

* modify the model/ftn/w3triamd.ftn and model/ftn/wmscrpmd.ftn and change from global grids from min(longitude)=-180, max(longitude)=180 to \delta(longitude)=360 degrees and added the regression test ww3_tp2.21

* bug fix for ww3_grid make without SCRIP switch

* Fix for corner node periodicity in wmscrpmd.ftn

* PDLIB/yowpdlibmain.ftn: fix to handle global meshes

* bug fix for SCRIPNC switch

* update info for ww3_tp2.21 for domain decomposition and PDLIB option

* fix for mww3_04 link with SCRIP and SCRIPNC switch

* add inputs to tar file, update model/bin/ww3_from_ftp.sh and remove inputs from ww3_tp2.21

* reduce the duration of ww3_tp2.21 for the sake of regtest time

* small editorial fixes

* fixes for SCRIPNC switch

* change date for ww3_ounf and ww3_ounp for ww3_tp2.21

* edit w3_make

Co-authored-by: lewis.sampson <lsampson@vld240.cmpd1.metoffice.gov.uk>
Co-authored-by: Juan Manuel Castillo Sanchez <48921434+ukmo-juan-castillo@users.noreply.github.com>
Co-authored-by: Chris Bunney <48915820+ukmo-ccbunney@users.noreply.github.com>
Co-authored-by: Ali Abdolali <aliabdolali@Alis-MBP.fios-router.home>
Co-authored-by: Steven Brus <sbrus@lanl.gov>
Co-authored-by: Steven Brus <steven.r.brus@gmail.com>
Co-authored-by: Lorenzo Mentaschi <lorenzo.mentaschi@unige.it>
ukmo-ccbunney added a commit that referenced this pull request Apr 1, 2021
* Added boundary checks to the SMC grid input files for ww3_grid,
to ensure they comply with the limits of the nameslist.

* Fb 360 calendar (#8)

Changes to add support to 360-day and 365-day (no leap year) calendar - see ticket NOAA-EMC#209
  * Additional CALTYPE namelist parameter in MISC section
  * New ww3_tc1 regtest.

* RTD support for ww3_boun[dc] (#10)

* Updated ww3_bound and ww3_bounc to handle model grids formulated on a rotated pole.
* Manual and nml/inp files to updated clarify that ww3_bound/ww3_bounc only accept input spectra formulated on a standard pole grid.

* Fb coupling time (#9)

Updates to allow a coupling time step that is different from the model time step. 
* Includes new regtest (in ww3_tp2.14) for non-default oasis time step.
* ww3_tp2.14 regtest added to matrix.base.

* bug fix for ukmet development

* add the matrix subsetter

* clean-up

* clean up

* add another script which separate serial and parallel jobs and divide them

* modify the script to remove ../model? after test completion.

* bug fixes and adding ww3_tp2.17 to list_heavy

* add if statement to remove matrix? and model?

* Update matrix_divider_p.sh

* Merge remote-tracking branch 'upstream/develop' into fb_matrix_divider

* Merge remote-tracking branch 'upstream/develop' into fb_matrix_divider

* put if check for ../model? inside matrix? loop

* fix the bug for sed for model?

* final fix for extra model? removal

* add 2.21 to the list_heavy

Co-authored-by: lewis.sampson <lsampson@vld240.cmpd1.metoffice.gov.uk>
Co-authored-by: Juan Manuel Castillo Sanchez <48921434+ukmo-juan-castillo@users.noreply.github.com>
Co-authored-by: Chris Bunney <48915820+ukmo-ccbunney@users.noreply.github.com>
Co-authored-by: Ali Abdolali <aliabdolali@Alis-MBP.fios-router.home>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants