Merge branch 'iulian787/moab_api_change' (PR #6523)

Add an extra argument, related to CAAS filtering, in iMOAB mapping. [BFB]
E3SM-Project · Aug 16, 2024 · 5d44648 · 5d44648
2 parents 063fb3a + 2ff6e26
commit 5d44648
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/components/mpas-ocean/driver/ocn_comp_mct.F b/components/mpas-ocean/driver/ocn_comp_mct.F
@@ -2952,6 +2952,8 @@ subroutine ocn_export_mct(o2x_o, errorCode)   !{{{
      block_ptr => block_ptr % next
    end do
 
+   errorCode = 0
+
 !-----------------------------------------------------------------------
 !EOC
 
@@ -3936,7 +3938,6 @@ subroutine ocn_import_moab( Eclock, errorCode)!{{{
          call mpas_dmpar_exch_halo_field(iceFluxDMSPField)
       endif
    endif
-   endif
 
 !-----------------------------------------------------------------------
 !EOC

diff --git a/driver-moab/main/seq_map_mod.F90 b/driver-moab/main/seq_map_mod.F90
@@ -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
@@ -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')