diff --git a/cmake/SCHISM.local.build b/cmake/SCHISM.local.build index 1f9672a9..12d93f4b 100644 --- a/cmake/SCHISM.local.build +++ b/cmake/SCHISM.local.build @@ -31,7 +31,7 @@ set( USE_ICE OFF CACHE BOOLEAN "Use ICE module") set( USE_GEN OFF CACHE BOOLEAN "Use generic tracer module") set( USE_AGE OFF CACHE BOOLEAN "Use age module") set( USE_ECO OFF CACHE BOOLEAN "Use ECO-SIM module") -set( USE_ICM ON CACHE BOOLEAN "Use ICM module") +set( USE_ICM OFF CACHE BOOLEAN "Use ICM module") ##pH model is active only if ICM is on set( ICM_PH OFF CACHE BOOLEAN "Use pH module inside ICM") set( USE_COSINE OFF CACHE BOOLEAN "Use CoSiNE module") diff --git a/src/ICM/icm.F90 b/src/ICM/icm.F90 index 8ce2b8fe..3bea0dbc 100644 --- a/src/ICM/icm.F90 +++ b/src/ICM/icm.F90 @@ -3256,10 +3256,10 @@ subroutine calkwq(id,nv,ure,it) do j=1,3 if(tdep-hcanveg(id,j)>1.e-5) then if(idry_e(id)==1) then - rtmp=rtmp+aocrveg(j)*plfveg(id,j)*tlfveg(id,j)/max(1.e-5,hcanveg(id,j)) + rtmp=rtmp+aocrveg(j)*plfveg(id,j)*(1-famveg(j))*tlfveg(id,j)/max(1.e-5,hcanveg(id,j)) else if(ze(klev-1,id)0.0) then if(O20<0.02)then sed_zbrent=a return + elseif(SOD<1.e-1)then + sed_zbrent=SOD + return else - ierr=1 + !ierr=1 write(12,*)'sed_zbrent: sod=',fa,fb,myrank return endif !water column hypoxia