Merge pull request #10 from TRACMASS/develop

Bug removal from Tracmass

Author: jekabs-ledlauzis

src/_funit/mod_tracers.fun

@@ -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

src/mod_init.F90

@@ -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

src/mod_loop.F90

@@ -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

src/mod_tracers.F90

@@ -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))

src/mod_vars.F90

@@ -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