Skip to content

Bug removal from Tracmass #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jekabs-ledlauzis merged 6 commits into from
Dec 14, 2025
Merged

Bug removal from Tracmass #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f134486
update_bounce subroutine missing from analytical module. Copy pasted …
Oct 17, 2025
87743d3
Swapped time indeces, time integration seemed to have been swapped ar…
Oct 17, 2025
c343de6
removed unused variable 'darea_name'
Oct 17, 2025
038c6f1
Fixed update_bounce method calling if the method is analytical
Dec 11, 2025
ee03beb
comment removal
Dec 11, 2025
156d07e
Fixed test tracer function
Dec 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/_funit/mod_tracers.fun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ TEST test_update_tracer_1

CALL update_tracer(1,ia,ja,ka,ib,jb,kb,x1,y1,z1)

ASSERT_EQUAL(trajectories(1)%tracerval(1),17.5)
ASSERT_EQUAL(trajectories(1)%tracerval(1),12.5)


END TEST
Expand Down
2 changes: 1 addition & 1 deletion src/mod_init.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ SUBROUTINE init_namelist()
usgs_name, vsgs_name, usub_name, vsub_name, w_name
namelist /INIT_GRID_SIZE/ imt, jmt, km, iperio, jperio, &
topoDataDir, &
hgridFile, darea_name, dy_name, dyu_name, dx_name, dxv_name, &
hgridFile, dy_name, dyu_name, dx_name, dxv_name, &
zgridFile, dzt_name, dzu_name, dzv_name, dep_name,&
bathyFile, kmt_name
namelist /INIT_GRID_SUBDOMAIN/ l_subdom, imindom, imaxdom, jmindom, jmaxdom
Expand Down
3 changes: 3 additions & 0 deletions src/mod_loop.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,10 @@ SUBROUTINE loop
dstep = tseas/dxyz
#endif

! Function not needed for analytical process
#ifndef time_analytical
CALL update_bounce(ia, iam, ja, ka, x0, y0, z0)
#endif

CALL cross_time(1,ia,ja,ka,x0,dse,dsw) ! zonal
CALL cross_time(2,ia,ja,ka,y0,dsn,dss) ! meridional
Expand Down
4 changes: 2 additions & 2 deletions src/mod_tracers.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ SUBROUTINE update_tracer(ntrac,ia,ja,ka, ib,jb,kb,x1,y1,z1)

! The trajectory is within the grid cell
IF (x1/=DBLE(ib) .AND. y1/=DBLE(jb) .AND. z1/=DBLE(kb)) THEN
tu = tracers(itrac)%data(ib,jb,kbtracer,nsp)
tm = tracers(itrac)%data(ib,jb,kbtracer,nsm)
tu = tracers(itrac)%data(ib,jb,kbtracer,nsm)
tm = tracers(itrac)%data(ib,jb,kbtracer,nsp)
! The trajectory crosses a wall
ELSE
tu = 0.5*(tracers(itrac)%data(ib,jb,kbtracer,nsm) + tracers(itrac)%data(ia,ja,katracer,nsm))
Expand Down
2 changes: 1 addition & 1 deletion src/mod_vars.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ MODULE mod_grid
usgs_name = '', vsgs_name = '', usub_name = '', vsub_name = '', &
w_name = ''

CHARACTER(LEN=50) :: hgridFile, darea_name, dy_name, dyu_name, dx_name, dxv_name, &
CHARACTER(LEN=50) :: hgridFile, dy_name, dyu_name, dx_name, dxv_name, &
zgridFile, dzt_name, dzu_name, dzv_name, dep_name, &
bathyFile, kmt_name

Expand Down