Edit Joey Smith's PR: exchange tau_oi(2,npa)

Author: josephzhang8

cmake/SCHISM.local.build

@@ -45,6 +45,7 @@ set( USE_WWM OFF CACHE BOOLEAN "Use wind-wave module")
 set( USE_WW3 OFF CACHE BOOLEAN "Use Wave Watch III")
 set( USE_ICE OFF CACHE BOOLEAN "Use 1-class ICE module")
 set( USE_MICE OFF CACHE BOOLEAN "Use multi-class ICE module")
+set( USE_CICE OFF CACHE BOOLEAN "Coupled to CICE via ESMF/UFS")
 
 #Tracer models
 set( USE_GEN OFF CACHE BOOLEAN "Use generic tracer module")

mk/include_modules

@@ -22,6 +22,7 @@
 # EXEC := $(EXEC)_ATMOS
 
 # Build a library that can be used from BMI, with sources and some b.c. provided by BMI
+## Try to use cmake for this
 # USE_BMI = yes
 # EXEC := $(EXEC)_BMI
 

src/Hydro/schism_init.F90

@@ -1695,29 +1695,29 @@ subroutine schism_init(iorder,indir,iths,ntime)
 #endif
 
 #ifdef USE_FIB
-       allocate(kk_fib(nea,2),sink_fib(nea),fraction_fib(nea))
-       allocate(sink0(npa),fraction0(npa),kk10(npa),kk20(npa))
+         allocate(kk_fib(nea,2),sink_fib(nea),fraction_fib(nea))
+         allocate(sink0(npa),fraction0(npa),kk10(npa),kk20(npa))
 #endif
 
 #ifdef USE_CICE
-      allocate(aice(npa),tau_oi(2,npa),fresh_wa_flux(npa),salinity_flux(npa),net_heat_flux(npa), &
+        allocate(aice(npa),tau_oi(2,npa),fresh_wa_flux(npa),salinity_flux(npa),net_heat_flux(npa), &
                srad_o(npa),srad_th_ice(npa),srad_ocn(npa),sflux_ocn(npa),fluxprc_ocn(npa),fluxevp_ocn(npa),stat=istat)
-      if(istat/=0) call parallel_abort('INIT: ice frac allocation failure')
-      aice(:)          = real(0)
-      tau_oi(:,:)      = real(0)
-      fresh_wa_flux(:) = real(0)
-      salinity_flux(:) = real(0)
-      net_heat_flux(:) = real(0)
-      srad_o(:)        = real(0)
-      srad_th_ice(:)   = real(0)
+        if(istat/=0) call parallel_abort('INIT: ice frac allocation failure')
+        aice(:)          = real(0)
+        tau_oi(:,:)      = real(0)
+        fresh_wa_flux(:) = real(0)
+        salinity_flux(:) = real(0)
+        net_heat_flux(:) = real(0)
+        srad_o(:)        = real(0)
+        srad_th_ice(:)   = real(0)
 
-      fluxprc_ocn(:)   = real(0)
-      fluxevp_ocn(:)   = real(0)
-      sflux_ocn(:)     = real(0)
-      srad_ocn(:)      = real(0)
+        fluxprc_ocn(:)   = real(0)
+        fluxevp_ocn(:)   = real(0)
+        sflux_ocn(:)     = real(0)
+        srad_ocn(:)      = real(0)
 #endif
-       allocate(sflux_o(npa),stat=istat)
-       sflux_o(:)     = real(0)
+!        allocate(sflux_o(npa),stat=istat)
+!        sflux_o(:)     = real(0)
 
 #ifdef USE_MICE
         allocate(tau_oi(2,npa),fresh_wa_flux(npa),net_heat_flux(npa), &

src/Hydro/schism_step.F90

@@ -1032,13 +1032,20 @@ subroutine schism_step(it)
 
   call exchange_p2d(aice)
   call exchange_p2d(CdnIO)
-  call exchange_p2d(tau_oi)
+  !call exchange_p2d(tau_oi)
   call exchange_p2d(uvice)
   call exchange_p2d(vvice)
   call exchange_p2d(fresh_wa_flux)
   call exchange_p2d(srad_th_ice)
   call exchange_p2d(net_heat_flux)
 
+  swild(1:npa)=tau_oi(1,:)
+  call exchange_p2d(swild)
+  tau_oi(1,:)=swild(1:npa)
+  swild(1:npa)=tau_oi(2,:)
+  call exchange_p2d(swild)
+  tau_oi(2,:)=swild(1:npa)
+
   do i = 1,npa
     if (aice(i) > real(1e-8)) then
       !>-------------------------------------------------