Skip to content

Commit

Permalink
resolve conflict with the lastest ICM change
Browse files Browse the repository at this point in the history
  • Loading branch information
wzhengui committed Jul 29, 2024
1 parent 60e67b7 commit e209a4f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/Core/schism_glbl.F90
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ module schism_glbl
&nstep_ice,niter_shap,iunder_deep,flag_fib,ielm_transport,max_subcyc, &
&itransport_only,iloadtide,nc_out,nu_sum_mult,iprecip_off_bnd, &
&iof_ugrid,model_type_pahm,iof_icm_sav,iof_icm_marsh,iof_icm_sed,iof_icm_ba,&
&iof_icm_clam,iof_icm_dbg,nbins_veg_vert,veg_lai,veg_cw
&iof_icm_clam,nbins_veg_vert,veg_lai,veg_cw
integer,save :: ntrs(natrm),nnu_pts(natrm),mnu_pts,lev_tr_source(natrm)
integer,save,dimension(:),allocatable :: iof_hydro,iof_wwm,iof_gen,iof_age,iof_sed,iof_eco, &
&iof_icm,iof_icm_core,iof_icm_silica,iof_icm_zb,iof_icm_ph,iof_icm_cbp,iof_cos,iof_fib, &
Expand Down
2 changes: 1 addition & 1 deletion src/Hydro/schism_step.F90
Original file line number Diff line number Diff line change
Expand Up @@ -7956,7 +7956,7 @@ subroutine schism_step(it)
call ecosystem(it)

!feedback from ICM to Hydro
if(iveg/=0.and.isav_icm==1)then
if(iveg/=0.and.isav_icm/=0)then
!Convert hcansav to nodes
do i=1,np
veg_h_unbent(i)=sum(sht(indel(1:nne(i),i)))/real(nne(i),rkind)
Expand Down

0 comments on commit e209a4f

Please sign in to comment.