Skip to content

Two small refineDiag fixes #346

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
marshallward merged 3 commits into from
Jan 7, 2022
Merged

Two small refineDiag fixes #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
620560f
Update for locating basin codes in MOM6_refineDiag.csh
Dec 16, 2021
de8f0aa
Fix for detecting symmetric mode output in refineDiag_ocean_month.py
Dec 16, 2021
8aa5cc3
Improved fix for detecting symmetric mode output in refineDiag_ocean_…
Jan 7, 2022
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
9 changes: 6 additions & 3 deletions tools/analysis/MOM6_refineDiag.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,9 @@ chmod +x $script_dir/*.py
set ocean_static_file = $yr1.ocean_static.nc
if ( -e $yr1.ocean_static_no_mask_table.nc ) set ocean_static_file = $yr1.ocean_static_no_mask_table.nc

set basin_codes_file = basin_codes.nc
if ( -e $yr1.basin_codes.nc ) set basin_codes_file = $yr1.basin_codes.nc

set basin_codes_d2_file = ocean_static_d2.nc

#echo '====annual mean Eddy Kinetic Energy======'
Expand All @@ -109,13 +112,13 @@ set basin_codes_d2_file = ocean_static_d2.nc

echo '==== Offline Diagnostics ===='
if ( -f $yr1.ocean_month.nc ) then
$script_dir/refineDiag_ocean_month.py -b basin_codes.nc -r $refineDiagDir $yr1.ocean_month.nc
$script_dir/refineDiag_ocean_month.py -b $basin_codes_file -r $refineDiagDir $yr1.ocean_month.nc
endif
if ( -f $yr1.ocean_month_z.nc ) then
$script_dir/refineDiag_ocean_month_z.py -b basin_codes.nc -r $refineDiagDir -s ./ $yr1.ocean_month_z.nc
$script_dir/refineDiag_ocean_month_z.py -b $basin_codes_file -r $refineDiagDir -s ./ $yr1.ocean_month_z.nc
endif
if ( -f $yr1.ocean_month_rho2.nc ) then
$script_dir/refineDiag_ocean_month_rho2.py -b basin_codes.nc -r $refineDiagDir $yr1.ocean_month_rho2.nc
$script_dir/refineDiag_ocean_month_rho2.py -b $basin_codes_file -r $refineDiagDir $yr1.ocean_month_rho2.nc
endif

echo '==== Offline Diagnostics downsampled ===='
Expand Down
5 changes: 4 additions & 1 deletion tools/analysis/refineDiag_ocean_month.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ def run():

def heat_trans_by_basin(x,mask=None,lat=None,minlat=None):
if mask is not None:
if not (x.shape[0] == 1+mask.shape[0]): #symmetric case
assert len(mask.shape) == 2, 'mask should be 2 dimensions'
assert len(x.shape) == 2 or len(x.shape) == 3, 'data should be 2 or 3 dimensions'
# symmetric case
if x.shape[-2:][1] == 1+mask.shape[1] and x.shape[-2:][0] == 1+mask.shape[0]:
mask=np.append(mask,np.zeros((1,mask.shape[1])),axis=0)
varmask = np.sum(mask,axis=-1)
varmask = np.expand_dims(varmask,0)
Expand Down