Merge e3sm into develop
#3
Conversation
- Check if log file unit is open before opening log.ww3 - Allow NDSO to be set explicitly
* origin/e3sm: Fix issue undefined variable issue in w3initmd.ftn Restrict UOST output to NAPOUT Add grid cell area calculation to wmscrpmd.ftn Modifications for log file consistency in E3SM Fix issue with optional arugment in W3IORS call Fix station location bug for RTD unstructured grids Add switch_E3SM Add unit number input to W3GRID Extend length of mesh filename variable Fix repeat allocation for unstructred RTD in ww3_ounf.ftn Fix RTD switch in w3gridmd.ftn Fix RTD bug in w3iopomd.ftn for unstrcutred mesh Fix RTD switch bug in ww3_ounf.ftn
|
The merge was done running: # assuming e3sm fork is origin
git checkout origin/develop
git merge origin/e3smAfter having run the commands above: Which is worth pointing out because the changes to the |
| XUGRDIN(IX) = XGRD(1,IX) | ||
| YUGRDIN(IX) = YGRD(1,IX) |
There was a problem hiding this comment.
In the e3sm branch, the right hand side of this assignment XYB array (not XGRD/YGRD), but the XYB array no longer exists in develop.
Lines 3562 to 3563 in 83ece2b
So I did some searching for other lines that used XYB on the e3sm branch and then looked at what they are using on develop, which is how I ended up with what's above. But, I'm not really sure if this is correct. It complies at least...
| @@ -441,7 +441,7 @@ SUBROUTINE READMSH_IOBP(NDS,FNAME) | |||
| !/ Parameter list | |||
| !/ | |||
| INTEGER, INTENT(IN) :: NDS | |||
| CHARACTER(60), INTENT(IN) :: FNAME | |||
| CHARACTER(160), INTENT(IN) :: FNAME | |||
There was a problem hiding this comment.
Not sure if the FNAME should also be extended in this subroutine, or kept at 60.
| @@ -2812,7 +2812,7 @@ SUBROUTINE SET_UG_IOBP() | |||
| REAL(KIND=8), PARAMETER :: THR = TINY(1.) | |||
| INTEGER :: I1, I2, I3 | |||
| INTEGER :: ITMP(NX), NEXTVERT(NX), PREVVERT(NX) | |||
| CHARACTER(60) :: FNAME | |||
| CHARACTER(160) :: FNAME | |||
There was a problem hiding this comment.
Same as above.
Not sure if the
FNAMEshould also be extended in this subroutine, or kept at60.
Pull Request Summary
This PR merges the development that @sbrus89 did on the
e3smbranch into E3SM's mirror ofdevelop.While E3SM's mirror of
developis behind NOAA-EMC version of develop, E3SM'sdevelopbranch has switched to CPP preprocessor directives and source code with.F90filenames. The development on thee3sm, which enables WW3 coupling in E3SM, was done before the switch to.F90occurred, so all source code was.ftnfiles. This merge is necessary to use acmakebased build system, which relies on.F90files and CPP directives.