From 3bea55f109ccdca502d26909fbb0a66054a16c4b Mon Sep 17 00:00:00 2001 From: Iulian Grindeanu Date: Mon, 22 Jul 2024 12:59:58 -0500 Subject: [PATCH 1/3] new argument for apply weights --- driver-moab/main/seq_map_mod.F90 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/driver-moab/main/seq_map_mod.F90 b/driver-moab/main/seq_map_mod.F90 index be47473f444c..82e67b8b195e 100644 --- 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') From 71af25a190706654cb5ae9e52ec253d9f54d03e8 Mon Sep 17 00:00:00 2001 From: Iulian Grindeanu Date: Mon, 22 Jul 2024 15:12:35 -0500 Subject: [PATCH 2/3] extra endif in mpas ocean mct module --- components/mpas-ocean/driver/ocn_comp_mct.F | 1 - 1 file changed, 1 deletion(-) diff --git a/components/mpas-ocean/driver/ocn_comp_mct.F b/components/mpas-ocean/driver/ocn_comp_mct.F index bd425e7e806a..5bedda574003 100644 --- a/components/mpas-ocean/driver/ocn_comp_mct.F +++ b/components/mpas-ocean/driver/ocn_comp_mct.F @@ -3936,7 +3936,6 @@ subroutine ocn_import_moab( Eclock, errorCode)!{{{ call mpas_dmpar_exch_halo_field(iceFluxDMSPField) endif endif - endif !----------------------------------------------------------------------- !EOC From 181b07ccc550fd079e11d2ce4ff3b9ae723fefac Mon Sep 17 00:00:00 2001 From: Iulian Grindeanu Date: Wed, 24 Jul 2024 11:44:33 -0500 Subject: [PATCH 3/3] local compile changes --- components/mpas-ocean/driver/ocn_comp_mct.F | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/mpas-ocean/driver/ocn_comp_mct.F b/components/mpas-ocean/driver/ocn_comp_mct.F index bd425e7e806a..d1b140563bb7 100644 --- 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