Skip to content
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

MOAB api change in projection #6523

Merged
merged 4 commits into from
Aug 16, 2024
Merged

MOAB api change in projection #6523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3bea55f
new argument for apply weights
iulian787 Jul 22, 2024
71af25a
extra endif in mpas ocean mct module
iulian787 Jul 22, 2024
181b07c
local compile changes
iulian787 Jul 24, 2024
2ff6e26
Merge branch 'local_ocn_cmp' into iulian787/moab_api_change
iulian787 Jul 24, 2024
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
3 changes: 2 additions & 1 deletion components/mpas-ocean/driver/ocn_comp_mct.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2952,6 +2952,8 @@ subroutine ocn_export_mct(o2x_o, errorCode) !{{{
block_ptr => block_ptr % next
end do

errorCode = 0

!-----------------------------------------------------------------------
!EOC

Expand Down Expand Up @@ -3936,7 +3938,6 @@ subroutine ocn_import_moab( Eclock, errorCode)!{{{
call mpas_dmpar_exch_halo_field(iceFluxDMSPField)
endif
endif
endif

!-----------------------------------------------------------------------
!EOC
Expand Down
4 changes: 3 additions & 1 deletion driver-moab/main/seq_map_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,7 @@ subroutine seq_map_map( mapper, av_s, av_d, fldlist, norm, avwts_s, avwtsfld_s,
real(r8), dimension(:), allocatable :: wghts
real(kind=r8) , allocatable :: targtags(:,:), targtags_ini(:,:)
real(kind=r8) :: factor
integer :: filter_type ! used for caas projection
#endif
!
! Local Variables
Expand Down Expand Up @@ -649,7 +650,8 @@ subroutine seq_map_map( mapper, av_s, av_d, fldlist, norm, avwts_s, avwtsfld_s,
call shr_sys_flush(logunit)
endif
#endif
ierr = iMOAB_ApplyScalarProjectionWeights ( mapper%intx_mbid, mapper%weight_identifier, fldlist_moab, fldlist_moab)
filter_type = 0 ! no
ierr = iMOAB_ApplyScalarProjectionWeights ( mapper%intx_mbid, filter_type, mapper%weight_identifier, fldlist_moab, fldlist_moab)
if (ierr .ne. 0) then
write(logunit,*) subname,' error in applying weights '
call shr_sys_abort(subname//' ERROR in applying weights')
Expand Down