Mercurial > hgweb > burst-coupling
changeset 62:314d5bc6a0d9
Removed unused variables. This NEITHER introduces NOR solves the bgct_sed index problem!
| author | Marco van Hulten <marco@hulten.org> |
|---|---|
| date | Thu, 07 Mar 2019 15:27:02 +0100 |
| parents | eed43d1dbdcd |
| children | 992fe5b8be2f |
| files | aufr_bgc_onlysed.F90 aufw_bgc_onlysed.F90 hamocc4bcm.F90 hamocc_step.F mo_sedmnt_offline.F90 sediment_step.F90 |
| diffstat | 6 files changed, 15 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/aufr_bgc_onlysed.F90 Wed Mar 06 16:35:59 2019 +0100 +++ b/aufr_bgc_onlysed.F90 Thu Mar 07 15:27:02 2019 +0100 @@ -44,9 +44,8 @@ ! Local variables ! - integer :: ncid,ncvarid,ncstat,ncoldmod,ncdimst(4) & - & ,nclatid,nclonid,otraid,carkid,timeid & - & ,nstart2(2),ncount2(2),nstride2(2) + integer :: ncid, ncvarid, ncstat, ncoldmod, ncdimst(4), & + & nclatid, nclonid, otraid, carkid, timeid real :: keqb_one(kpie,kpje) real :: rmissing #ifdef PNETCDF
--- a/aufw_bgc_onlysed.F90 Wed Mar 06 16:35:59 2019 +0100 +++ b/aufw_bgc_onlysed.F90 Thu Mar 07 15:27:02 2019 +0100 @@ -51,7 +51,7 @@ integer :: ncid, ncvarid, ncstat, ncoldmod, ncdimst(4) & & ,nclatid=-1, nclonid=-1, otraid=-1, carkid=-1 & & ,timeid =-1 & - & ,nstart2(2), ncount2(2), nstride2(2), idate(5) + & ,idate(5) real :: keqb_one(kpie,kpje) real :: rmissing #ifdef PNETCDF
--- a/hamocc4bcm.F90 Wed Mar 06 16:35:59 2019 +0100 +++ b/hamocc4bcm.F90 Thu Mar 07 15:27:02 2019 +0100 @@ -307,8 +307,8 @@ co3_kbo(i,j) = co3(i,j,kbo(i,j)) enddo enddo - call sediment_step(kpie, kpje, kpke, pglat, pddpo, pdlxp, pdlyp, & - & psao_kbo, prho_kbo, omask, & + call sediment_step(kpie, kpje, kpke, pddpo, pdlxp, pdlyp, & + & psao_kbo, prho_kbo, omask, & & ocetra_kbo, bolay, keqb, & & prorca, prcaca, silpro, produs, co3_kbo) ! Do not add ocetra back assignment code: we update ocetra directly!
--- a/hamocc_step.F Wed Mar 06 16:35:59 2019 +0100 +++ b/hamocc_step.F Thu Mar 07 15:27:02 2019 +0100 @@ -37,7 +37,7 @@ is_start_of_day = mod(nstep-1,nstep_in_day)==0 #ifdef SED_OFFLINE call sedmnt_offline(idm, jdm, kdm, maxyear_sediment, nstep, - . pglat, bgc_dp, bgc_dx, bgc_dy, omask) + . bgc_dp, bgc_dx, bgc_dy, omask) #endif c call hamocc4bcm(idm,jdm,kdm,pglat,bgc_swr,bgc_fice, @@ -51,7 +51,7 @@ ! accumulate bottom water tracers when in ! the last year of MICOM/HAMOCC simulation if ( (lsed_wclim .or. lsed_spinup) .and. mod(nyear,maxyear_ocean)==0 ) then - call prepare_clim(idm, jdm, kdm, maxyear_sediment, nstep) + call prepare_clim(nstep) endif #endif
--- a/mo_sedmnt_offline.F90 Wed Mar 06 16:35:59 2019 +0100 +++ b/mo_sedmnt_offline.F90 Thu Mar 07 15:27:02 2019 +0100 @@ -205,8 +205,7 @@ contains -subroutine read_clim(nstep) - integer, intent(in) :: nstep +subroutine read_clim() integer :: imonth ! Read the bottom seawater climatology from the netCDF forcing file @@ -242,12 +241,10 @@ co3_kbo_avg = 0.0 end subroutine read_clim -subroutine prepare_clim(kpie, kpje, kpke, maxyear, nstep) +subroutine prepare_clim(nstep) ! Subprogram arguments ! - integer, intent(in) :: kpie,kpje,kpke - integer, intent(in) :: maxyear - integer, intent(in) :: nstep + integer, intent(in) :: nstep ! Accumulate the bottom seawater fields from HAMOCC nstep_in_month = nstep_in_month + 1 @@ -375,7 +372,7 @@ end subroutine updcln_onlysed subroutine sedmnt_offline(kpie, kpje, kpke, maxyear, nstep, & - & pglat, pddpo, pdlxp, pdlyp, omask) + & pddpo, pdlxp, pdlyp, omask) ! Arrays needed to update two time levels after the sediment spin-up ! @@ -386,7 +383,6 @@ integer, intent(in) :: kpie,kpje,kpke integer, intent(in) :: maxyear integer, intent(in) :: nstep - real, dimension(kpie,kpje), intent(in) :: pglat real, dimension(kpie,kpje,kpke), intent(in) :: pddpo real, dimension(kpie,kpje), intent(in) :: pdlxp, pdlyp real, dimension(kpie,kpje), intent(in) :: omask @@ -398,7 +394,7 @@ ! Read the bottom water climatology ! if (lread_clim) then - call read_clim(nstep) ! Read the bottom water climatology, + call read_clim() ! Read the bottom water climatology, lread_clim = .false. ! but only one time. endif @@ -438,7 +434,7 @@ dtoff = 3600*24*nd_in_m(nmonth) call bodensed(kpie,kpje,kpke,pddpo) - call sediment_step(idm,jdm,kdm,pglat, bgc_dp,bgc_dx,bgc_dy, & + call sediment_step(idm, jdm, kdm, bgc_dp, bgc_dx, bgc_dy, & & bgc_s_kbo_clim(:,:,nmonth), bgc_rho_kbo_clim(:,:,nmonth), & & omask, & & ocetra_kbo_clim(:,:,nmonth,:), bolay_clim(:,:,nmonth), & @@ -820,8 +816,7 @@ integer, intent(in) :: iogrp -integer i,j,k,l,nt -integer nhour,ny,nm,nd,dayfrac,irec(nsedmax),cmpflg +integer irec(nsedmax), cmpflg character(len= 2) seqstring character(len=80) fname(nsedmax) character(len=20) startdate
--- a/sediment_step.F90 Wed Mar 06 16:35:59 2019 +0100 +++ b/sediment_step.F90 Thu Mar 07 15:27:02 2019 +0100 @@ -1,4 +1,4 @@ -subroutine sediment_step(kpie, kpje, kpke, pglat, pddpo, pdlxp, pdlyp, & +subroutine sediment_step(kpie, kpje, kpke, pddpo, pdlxp, pdlyp, & & psao_, prho_, omask, & & ocetra_, bolay_, keqb_, & & prorca_, prcaca_, silpro_, produs_, co3_) @@ -47,7 +47,6 @@ ! Function arguments; see hamocc4bcm.F90 for variable description ! integer, intent(in) :: kpie,kpje,kpke -real, intent(in) :: pglat (kpie,kpje) real, intent(in) :: pddpo (kpie,kpje,kpke) real, intent(in) :: pdlxp (kpie,kpje) real, intent(in) :: pdlyp (kpie,kpje)