Skip to content

Commit

Permalink
fix(recom): correct idetn and idetc sms
Browse files Browse the repository at this point in the history
Fix grazing contribution to idetn and idetc

Second detritus related parts are removed from the
computation of carbon (idetc) and nitrogen (idetn)
concentration of slow sinking detritus. Besides,
we should use grazEff instead of grazEff2
in the calculation of idetn. Because this is not related
to the number of the detritus class,
but to the zooplankton group / the source to this
detritus class.
  • Loading branch information
ogurses committed Sep 19, 2024
1 parent 4ef4d5b commit 3d25748
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 30 deletions.
6 changes: 2 additions & 4 deletions config/case_2p1z1d/job_albedo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#SBATCH --job-name=test_3zoo_ballast
#SBATCH --account=nwg_hauck.maresys
#SBATCH --account=nwg_maresys.maresys
#SBATCH --partition=mpp
#SBATCH -N 9
#SBATCH --cpus-per-task=1
Expand All @@ -10,8 +10,6 @@

#SBATCH -o slurm-out.out
#SBATCH -e slurm-err.out
#SBATCH [email protected]
#SBATCH --mail-type=END

# disable hyperthreading
#SBATCH --hint=nomultithread
Expand Down Expand Up @@ -47,7 +45,7 @@ date
#sbatch job_albedo
#fi

Resultpath='/albedo/scratch/user/ogurses/test_14.06.2023/'
Resultpath='/albedo/scratch/user/xxx/'
test -e $Resultpath/fesom.1970.oce.restart.nc && exit

IsInFile=$( tail -1 fesom2.0.out | grep -c should)
Expand Down
6 changes: 2 additions & 4 deletions config/case_2p3z2d/job_albedo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#SBATCH --job-name=test_3zoo_ballast
#SBATCH --account=nwg_hauck.maresys
#SBATCH --account=nwg_maresys.maresys
#SBATCH --partition=mpp
#SBATCH -N 9
#SBATCH --cpus-per-task=1
Expand All @@ -10,8 +10,6 @@

#SBATCH -o slurm-out.out
#SBATCH -e slurm-err.out
#SBATCH [email protected]
#SBATCH --mail-type=END

# disable hyperthreading
#SBATCH --hint=nomultithread
Expand Down Expand Up @@ -47,7 +45,7 @@ date
#sbatch job_albedo
#fi

Resultpath='/albedo/scratch/user/ogurses/test_14.06.2023/'
Resultpath='/albedo/scratch/user/xxx/'
test -e $Resultpath/fesom.1970.oce.restart.nc && exit

IsInFile=$( tail -1 fesom2.0.out | grep -c should)
Expand Down
6 changes: 2 additions & 4 deletions config/case_3p1z1d/job_albedo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#SBATCH --job-name=test_3zoo_ballast
#SBATCH --account=nwg_hauck.maresys
#SBATCH --account=nwg_maresys.maresys
#SBATCH --partition=mpp
#SBATCH -N 9
#SBATCH --cpus-per-task=1
Expand All @@ -10,8 +10,6 @@

#SBATCH -o slurm-out.out
#SBATCH -e slurm-err.out
#SBATCH [email protected]
#SBATCH --mail-type=END

# disable hyperthreading
#SBATCH --hint=nomultithread
Expand Down Expand Up @@ -47,7 +45,7 @@ date
#sbatch job_albedo
#fi

Resultpath='/albedo/scratch/user/ogurses/test_14.06.2023/'
Resultpath='/albedo/scratch/user/xxx/'
test -e $Resultpath/fesom.1970.oce.restart.nc && exit

IsInFile=$( tail -1 fesom2.0.out | grep -c should)
Expand Down
6 changes: 2 additions & 4 deletions config/case_3p3z2d/job_albedo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#SBATCH --job-name=test_3zoo_ballast
#SBATCH --account=nwg_hauck.maresys
#SBATCH --account=nwg_maresys.maresys
#SBATCH --partition=mpp
#SBATCH -N 9
#SBATCH --cpus-per-task=1
Expand All @@ -10,8 +10,6 @@

#SBATCH -o slurm-out.out
#SBATCH -e slurm-err.out
#SBATCH [email protected]
#SBATCH --mail-type=END

# disable hyperthreading
#SBATCH --hint=nomultithread
Expand Down Expand Up @@ -47,7 +45,7 @@ date
#sbatch job_albedo
#fi

Resultpath='/albedo/scratch/user/ogurses/test_14.06.2023/'
Resultpath='/albedo/scratch/user/xxx/'
test -e $Resultpath/fesom.1970.oce.restart.nc && exit

IsInFile=$( tail -1 fesom2.0.out | grep -c should)
Expand Down
26 changes: 12 additions & 14 deletions src/int_recom/recom_sms.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1284,25 +1284,25 @@ subroutine REcoM_sms(n,Nn,state,thick,recipthick,SurfSR,sms,Temp, Sali_depth &
if (Grazing_detritus) then
#if defined (__3Zoo2Det)
sms(k,idetn) = ( &
+ grazingFlux_phy3 &
- grazingFlux_phy3 * grazEff3 &
+ grazingFlux_dia3 &
- grazingFlux_dia3 * grazEff3 &
+ grazingFlux_phy3 & ! --> grazing on small phytoplankton by third zooplankton
- grazingFlux_phy3 * grazEff3 & ! --> fraction of grazingFlux_phy3 into microzooplankton pool
+ grazingFlux_dia3 & ! --> grazing on diatoms by third zooplankton
- grazingFlux_dia3 * grazEff3 & ! --> fraction of grazingFlux_dia3 into microzooplankton pool
#if defined (__coccos)
+ grazingFlux_Cocco3 &
- grazingFlux_Cocco3 * grazEff3 &
+ grazingFlux_Cocco3 & ! --> grazing on coccolithophores by third zooplankton
- grazingFlux_Cocco3 * grazEff3 & ! --> fraction of grazingFlux_Cocco3 into microzooplankton pool
+ aggregationRate * CoccoN &
#endif
- grazingFlux_Det * grazEff & ! --> grazing of first zoo (meso) on first detritus
- grazingFlux_Det2 * grazEff2 & ! --> grazing of second zoo on first detritus
- grazingFlux_Det * grazEff & ! --> grazing of first zoo (meso) on first detritus class
- grazingFlux_Det2 * grazEff2 & ! --> grazing of second zoo (macro) on first detritus class
+ aggregationRate * PhyN &
+ aggregationRate * DiaN &
+ miczooLossFlux &
- reminN * arrFunc * O2Func * DetN & ! O2remin
+ miczooLossFlux & ! --> microzooplankton, mortality
- reminN * arrFunc * O2Func * DetN & ! --> O2remin
) * dt_b + sms(k,idetn)
#else
sms(k,idetn) = ( &
+ grazingFlux_phy &
+ grazingFlux_phy & ! Technically it is mesooooooooooooooooo
- grazingFlux_phy * grazEff &
+ grazingFlux_dia &
- grazingFlux_dia * grazEff &
Expand All @@ -1312,7 +1312,6 @@ subroutine REcoM_sms(n,Nn,state,thick,recipthick,SurfSR,sms,Temp, Sali_depth &
+ aggregationRate * CoccoN &
#endif
- grazingFlux_Det * grazEff & ! Sloppy feeding is thought because of grazing flux multiplied with grazeff
- grazingFlux_Det2 * grazEff2 &
+ aggregationRate * PhyN &
+ aggregationRate * DiaN &
+ hetLossFlux &
Expand Down Expand Up @@ -1366,7 +1365,7 @@ subroutine REcoM_sms(n,Nn,state,thick,recipthick,SurfSR,sms,Temp, Sali_depth &
+ aggregationRate * CoccoC &
#endif
- grazingFlux_Det * recipDet * grazEff &
- grazingFlux_Det2 * recipDet2 * grazEff2 &
- grazingFlux_Det2 * recipDet * grazEff2 & ! corrected recipDet2 -> recipDet
+ aggregationRate * PhyC &
+ aggregationRate * DiaC &
+ miczooLossFlux * recipQZoo3 &
Expand All @@ -1384,7 +1383,6 @@ subroutine REcoM_sms(n,Nn,state,thick,recipthick,SurfSR,sms,Temp, Sali_depth &
+ aggregationRate * CoccoC &
#endif
- grazingFlux_Det * recipDet * grazEff &
- grazingFlux_Det2 * recipDet2 * grazEff &
+ aggregationRate * phyC &
+ aggregationRate * DiaC &
+ hetLossFlux * recipQZoo &
Expand Down

0 comments on commit 3d25748

Please sign in to comment.