Skip to content

check and bound g_tracer value issue #225 #255

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.

Sign up for GitHub

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

Merged
adcroft merged 1 commit into from
Feb 4, 2016
Merged

check and bound g_tracer value issue #225 #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/parameterizations/vertical/MOM_opacity.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ subroutine opacity_from_chl(optics, fluxes, G, CS, chl_in)
if ((G%mask2dT(i,j) > 0.5) .and. (chl_in(i,j,k) < 0.0)) then
write(mesg,'(" Negative chl_in of ",(1pe12.4)," found at i,j,k = ", &
& 3(1x,i3), " lon/lat = ",(1pe12.4)," E ", (1pe12.4), " N.")') &
chl_data(i,j), i, j, k, G%geoLonT(i,j), G%geoLatT(i,j)
chl_in(i,j,k), i, j, k, G%geoLonT(i,j), G%geoLatT(i,j)
call MOM_error(FATAL,"MOM_opacity opacity_from_chl: "//trim(mesg))
endif
enddo; enddo; enddo
Expand Down
9 changes: 9 additions & 0 deletions src/tracer/MOM_generic_tracer.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,15 @@ subroutine initialize_MOM_generic_tracer(restart, day, G, h, param_file, OBC, CS
src_var_record = g_tracer%src_var_record, &
src_var_gridspec = g_tracer%src_var_gridspec )

!Check/apply the bounds for each g_tracer
do k=1,nk ; do j=jsc,jec ; do i=isc,iec
if(tr_ptr(i,j,k) .ne. CS%tracer_land_val) then
if(tr_ptr(i,j,k) .lt. g_tracer%src_var_valid_min) tr_ptr(i,j,k) = g_tracer%src_var_valid_min
!Jasmin does not want to apply the maximum for now
!if(tr_ptr(i,j,k) .gt. g_tracer%src_var_valid_max) tr_ptr(i,j,k) = g_tracer%src_var_valid_max
endif
enddo; enddo ; enddo

else !Do it old way if the tracer is not registered to start from a specific source file.
!This path should be deprecated if all generic tracers are required to start from specified sources.
if (len_trim(CS%IC_file) > 0) then
Expand Down