-
Notifications
You must be signed in to change notification settings - Fork 565
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
Update WW3 cap for 2-way ocean-wave coupling #1348
Open
binli2337
wants to merge
9
commits into
NOAA-EMC:dev/ufs-weather-model
Choose a base branch
from
binli2337:feature/ocean_wave_update
base: dev/ufs-weather-model
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
bb13370
Add a fill value in wav_import_export.F90.
binli2337 63480fb
Update wav_import_export.F90.
binli2337 0802797
Convert a missing value to zero for the imported ocean-current fields
binli2337 ecff3ea
Update wav_import_export.F90.
binli2337 ff0c061
Merge branch 'dev/ufs-weather-model' into feature/ocean_wave_update
binli2337 1317bab
Update wav_import_export.F90.
binli2337 ed3625a
Update wav_import_export.F90.
binli2337 092ca86
Updated wav_import_export.F90.
binli2337 f836a26
Merge branch 'dev/ufs-weather-model' into feature/ocean_wave_update
binli2337 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 |
---|---|---|
|
@@ -287,6 +287,7 @@ subroutine import_fields( gcomp, time0, timen, rc ) | |
use wmupdtmd , only: wmupd2 | ||
use wmmdatmd , only: wmsetm | ||
use wmmdatmd , only: mdse, mdst, nrgrd, inpmap | ||
use wav_shr_mod , only : casename | ||
#ifdef W3_MPI | ||
use wmmdatmd , only: mpi_comm_grd | ||
#endif | ||
|
@@ -308,6 +309,8 @@ subroutine import_fields( gcomp, time0, timen, rc ) | |
character(len=10) :: vwnd | ||
integer :: imod, j, jmod | ||
integer :: mpi_comm_null = -1 | ||
integer :: isea | ||
real(r4), parameter :: fillv = 9.99e20 | ||
real(r4), allocatable :: wxdata(:) ! only needed if merge_import | ||
real(r4), allocatable :: wydata(:) ! only needed if merge_import | ||
character(len=*), parameter :: subname='(wav_import_export:import_fields)' | ||
|
@@ -371,6 +374,14 @@ subroutine import_fields( gcomp, time0, timen, rc ) | |
if (state_fldchk(importState, 'So_u')) then | ||
call SetGlobalInput(importState, 'So_u', vm, global_data, rc) | ||
if (ChkErr(rc,__LINE__,u_FILE_u)) return | ||
|
||
if(casename == "ufs.hafs") then | ||
do isea = 1,nsea | ||
if(abs(global_data(isea)-fillv).lt.0.01) then | ||
global_data(isea)=0.0 | ||
end if | ||
end do | ||
end if | ||
call FillGlobalInput(global_data, CX0) | ||
call FillGlobalInput(global_data, CXN) | ||
end if | ||
|
@@ -380,6 +391,13 @@ subroutine import_fields( gcomp, time0, timen, rc ) | |
if (state_fldchk(importState, 'So_v')) then | ||
call SetGlobalInput(importState, 'So_v', vm, global_data, rc) | ||
if (ChkErr(rc,__LINE__,u_FILE_u)) return | ||
if(casename == "ufs.hafs") then | ||
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. Does this need the same update that was done above? |
||
do isea = 1,nsea | ||
if(abs(global_data(isea)-fillv).lt.0.01) then | ||
global_data(isea)=0.0 | ||
end if | ||
end do | ||
end if | ||
call FillGlobalInput(global_data, CY0) | ||
call FillGlobalInput(global_data, CYN) | ||
end if | ||
|
Oops, something went wrong.
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.
I think you need trims on your
casename
comparisons?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.
@DeniseWorthen Updates have been made. Thanks!