forked from NOAA-EMC/WW3
-
Notifications
You must be signed in to change notification settings - Fork 2
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
Bf unconforming where in coupling routines #17
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -100,7 +100,7 @@ | |
! | ||
USE W3OACPMD, ONLY: ID_OASIS_TIME, IL_NB_SND, SND_FLD, CPL_OASIS_SND | ||
USE W3GDATMD, ONLY: NSEAL, NSEA | ||
USE W3ADATMD, ONLY: NSEALM, CX, CY, CHARN, HS, FP0, TWS | ||
USE W3ADATMD, ONLY: CX, CY, CHARN, HS, FP0, TWS | ||
USE W3ODATMD, ONLY: UNDEF, NAPROC, IAPROC | ||
! | ||
!/ ------------------------------------------------------------------- / | ||
|
@@ -109,7 +109,7 @@ | |
REAL(kind=8), DIMENSION(NSEAL,1) :: RLA_OASIS_SND | ||
INTEGER :: IB_DO | ||
LOGICAL :: LL_ACTION | ||
REAL(kind=8), DIMENSION(NSEALM) :: TMP | ||
REAL(kind=8), DIMENSION(NSEAL) :: TMP | ||
INTEGER :: JSEA, ISEA | ||
! | ||
!---------------------------------------------------------------------- | ||
|
@@ -120,7 +120,7 @@ | |
! Ocean sea surface current (m.s-1) (u-component) | ||
! --------------------------------------------------------------------- | ||
IF (SND_FLD(IB_DO)%CL_FIELD_NAME == 'WW3_WSSU') THEN | ||
TMP(1:NSEALM) = 0.0 | ||
TMP(1:NSEAL) = 0.0 | ||
DO JSEA=1, NSEAL | ||
ISEA=IAPROC+(JSEA-1)*NAPROC | ||
IF(CX(ISEA) /= UNDEF) TMP(JSEA)=CX(ISEA) | ||
|
@@ -132,7 +132,7 @@ | |
! Ocean sea surface current (m.s-1) (v-component) | ||
! --------------------------------------------------------------------- | ||
IF (SND_FLD(IB_DO)%CL_FIELD_NAME == 'WW3_WSSV') THEN | ||
TMP(1:NSEALM) = 0.0 | ||
TMP(1:NSEAL) = 0.0 | ||
DO JSEA=1, NSEAL | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. not even sure this section works well since TMP array is filled after the test on UNDEF |
||
ISEA=IAPROC+(JSEA-1)*NAPROC | ||
IF(CY(ISEA) /= UNDEF) TMP(JSEA)=CY(ISEA) | ||
|
@@ -145,44 +145,44 @@ | |
! Charnock Coefficient (-) | ||
! --------------------------------------------------------------------- | ||
IF (SND_FLD(IB_DO)%CL_FIELD_NAME == 'WW3_ACHA') THEN | ||
TMP(1:NSEALM) = 0.0 | ||
WHERE(CHARN /= UNDEF) TMP=CHARN | ||
TMP(1:NSEAL) = 0.0 | ||
WHERE(CHARN(1:NSEAL) /= UNDEF) TMP(1:NSEAL)=CHARN(1:NSEAL) | ||
RLA_OASIS_SND(:,1) = DBLE(TMP(1:NSEAL)) | ||
CALL CPL_OASIS_SND(IB_DO, ID_OASIS_TIME, RLA_OASIS_SND, LL_ACTION) | ||
ENDIF | ||
! | ||
! Significant wave height (m) | ||
! --------------------------------------------------------------------- | ||
IF (SND_FLD(IB_DO)%CL_FIELD_NAME == 'WW3__AHS') THEN | ||
TMP(1:NSEALM) = 0.0 | ||
WHERE(HS /= UNDEF) TMP=HS | ||
TMP(1:NSEAL) = 0.0 | ||
WHERE(HS(1:NSEAL) /= UNDEF) TMP(1:NSEAL)=HS(1:NSEAL) | ||
RLA_OASIS_SND(:,1) = DBLE(TMP(1:NSEAL)) | ||
CALL CPL_OASIS_SND(IB_DO, ID_OASIS_TIME, RLA_OASIS_SND, LL_ACTION) | ||
ENDIF | ||
! | ||
! Peak frequency (s-1) | ||
! --------------------------------------------------------------------- | ||
IF (SND_FLD(IB_DO)%CL_FIELD_NAME == 'WW3___FP') THEN | ||
TMP(1:NSEALM) = 0.0 | ||
WHERE(FP0 /= UNDEF) TMP=FP0 | ||
TMP(1:NSEAL) = 0.0 | ||
WHERE(FP0(1:NSEAL) /= UNDEF) TMP(1:NSEAL)=FP0(1:NSEAL) | ||
RLA_OASIS_SND(:,1) = DBLE(TMP(1:NSEAL)) | ||
CALL CPL_OASIS_SND(IB_DO, ID_OASIS_TIME, RLA_OASIS_SND, LL_ACTION) | ||
ENDIF | ||
! | ||
! Peak period (s) | ||
! --------------------------------------------------------------------- | ||
IF (SND_FLD(IB_DO)%CL_FIELD_NAME == 'WW3___TP') THEN | ||
TMP(1:NSEALM) = 0.0 | ||
WHERE(FP0 /= UNDEF) TMP=1./FP0 | ||
TMP(1:NSEAL) = 0.0 | ||
WHERE(FP0(1:NSEAL) /= UNDEF) TMP(1:NSEAL)=1./FP0(1:NSEAL) | ||
RLA_OASIS_SND(:,1) = DBLE(TMP(1:NSEAL)) | ||
CALL CPL_OASIS_SND(IB_DO, ID_OASIS_TIME, RLA_OASIS_SND, LL_ACTION) | ||
ENDIF | ||
! | ||
! Wind sea Mean period (s) | ||
! --------------------------------------------------------------------- | ||
IF (SND_FLD(IB_DO)%CL_FIELD_NAME == 'WW3__FWS') THEN | ||
TMP(1:NSEALM) = 0.0 | ||
WHERE(TWS /= UNDEF) TMP=TWS | ||
TMP(1:NSEAL) = 0.0 | ||
WHERE(TWS(1:NSEAL) /= UNDEF) TMP(1:NSEAL)=TWS(1:NSEAL) | ||
RLA_OASIS_SND(:,1) = DBLE(TMP(1:NSEAL)) | ||
CALL CPL_OASIS_SND(IB_DO, ID_OASIS_TIME, RLA_OASIS_SND, LL_ACTION) | ||
ENDIF | ||
|
This file contains 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
This file contains 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe you should also rewrite it as :
WHERE(CX(1:NSEAL) /= UNDEF) TMP(1:NSEAL)=CX(1:NSEAL)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I do not think a WHERE sentence will work in this case, as CX and CY are vectors of dimension 1:NSEA. The reason why the loop is done explicitly is to find the right index for this vector for a given processor:
ISEA=IAPROC+(JSEA-1)*NAPROC
Notice that the same approach is followed for the variable ICEF in w3igcmmd.f90, which also has dimensions 1:NSEA.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
right ! BTY the line 139 in w3agcmd.ftn since it force TMP to be filled by CY after the test on UNDEF
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agree, that line should be deleted.