Skip to content

Commit

Permalink
Merge branch 'NOAA-EMC:develop' into csps-rocky8
Browse files Browse the repository at this point in the history
  • Loading branch information
weihuang-jedi authored Oct 18, 2024
2 parents 09203d8 + 0083831 commit 8f3a3b9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions parm/ocnicepost/ocean.csv
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
'taux', 2 ,'Cu' , 'conserve' , 'tauy' , 'Cv'
'tauy', 2 ,'Cv' , 'conserve' , 'taux' , 'Cu'
'temp', 3 ,'Ct' , 'bilinear' , '', ''
'tob', 2 ,'Ct' , 'bilinear' , '', ''
'so', 3 ,'Ct' , 'bilinear' , '', ''
'uo', 3 ,'Cu' , 'bilinear' , 'vo' , 'Cv'
'vo', 3 ,'Cv' , 'bilinear' , 'uo' , 'Cu'
2 changes: 1 addition & 1 deletion src/ocnicepost.fd/masking_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ subroutine remap_masks(vfill)
! local variables
integer :: rc, ncid, varid, n
character(len=240) :: wgtsfile
real :: minlat = -79.75
real :: minlat = -78.63

real, allocatable, dimension(:) :: out1d

Expand Down

0 comments on commit 8f3a3b9

Please sign in to comment.