Commit 73b3046d authored by kbk's avatar kbk
Browse files

NN not needed for barotropic runs, NO_SUSP_MATTER works

parent 05725937
...@@ -76,6 +76,9 @@ ...@@ -76,6 +76,9 @@
allocate(idpdy(I3DFIELD),stat=rc) ! Internal pressure gradient - y allocate(idpdy(I3DFIELD),stat=rc) ! Internal pressure gradient - y
if (rc /= 0) stop 'init_3d: Error allocating memory (idpdy)' if (rc /= 0) stop 'init_3d: Error allocating memory (idpdy)'
#endif
#ifndef NO_SUSP_MATTER
allocate(spm(I3DFIELD),stat=rc) ! Suspended particulate matter allocate(spm(I3DFIELD),stat=rc) ! Suspended particulate matter
if (rc /= 0) stop 'init_3d: Error allocating memory (spm)' if (rc /= 0) stop 'init_3d: Error allocating memory (spm)'
......
!$Id: m3d.F90,v 1.12 2004-01-06 15:04:00 kbk Exp $ !$Id: m3d.F90,v 1.13 2004-01-08 10:23:20 kbk Exp $
#include "cppdefs.h" #include "cppdefs.h"
!----------------------------------------------------------------------- !-----------------------------------------------------------------------
!BOP !BOP
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
use salinity, only: init_salinity, do_salinity use salinity, only: init_salinity, do_salinity
use eqstate, only: init_eqstate, do_eqstate use eqstate, only: init_eqstate, do_eqstate
#endif #endif
#ifndef NO_BAROCLINIC #ifndef NO_SUSP_MATTER
use suspended_matter, only: init_spm, do_spm use suspended_matter, only: init_spm, do_spm
#endif #endif
use variables_3d use variables_3d
...@@ -50,7 +50,10 @@ ...@@ -50,7 +50,10 @@
! Original author(s): Karsten Bolding & Hans Burchard ! Original author(s): Karsten Bolding & Hans Burchard
! !
! $Log: m3d.F90,v $ ! $Log: m3d.F90,v $
! Revision 1.12 2004-01-06 15:04:00 kbk ! Revision 1.13 2004-01-08 10:23:20 kbk
! NN not needed for barotropic runs, NO_SUSP_MATTER works
!
! Revision 1.12 2004/01/06 15:04:00 kbk
! FCT advection + split of advection_3d.F90 + extra adv. input checks ! FCT advection + split of advection_3d.F90 + extra adv. input checks
! !
! Revision 1.11 2004/01/05 13:23:27 kbk ! Revision 1.11 2004/01/05 13:23:27 kbk
...@@ -314,7 +317,9 @@ ...@@ -314,7 +317,9 @@
T = _ZERO_ ; S = _ZERO_ ; rho = _ZERO_ T = _ZERO_ ; S = _ZERO_ ; rho = _ZERO_
if(calc_temp) call init_temperature(1) if(calc_temp) call init_temperature(1)
if(calc_salt) call init_salinity(1) if(calc_salt) call init_salinity(1)
#ifndef NO_SUSP_MATTER
if(calc_spm) call init_spm(1) if(calc_spm) call init_spm(1)
#endif
call init_eqstate() call init_eqstate()
#ifndef PECS #ifndef PECS
call do_eqstate() call do_eqstate()
...@@ -426,7 +431,9 @@ ...@@ -426,7 +431,9 @@
if(runtype .eq. 4) then ! prognostic T and S if(runtype .eq. 4) then ! prognostic T and S
if (calc_temp) call do_temperature(n) if (calc_temp) call do_temperature(n)
if (calc_salt) call do_salinity(n) if (calc_salt) call do_salinity(n)
#ifndef NO_SUSP_MATTER
if (calc_spm) call do_spm() if (calc_spm) call do_spm()
#endif
#ifndef PECS #ifndef PECS
call do_eqstate() call do_eqstate()
#endif #endif
......
...@@ -31,10 +31,10 @@ ...@@ -31,10 +31,10 @@
REALTYPE :: tke(I3DFIELD) REALTYPE :: tke(I3DFIELD)
REALTYPE :: eps(I3DFIELD) REALTYPE :: eps(I3DFIELD)
REALTYPE :: SS(I3DFIELD) REALTYPE :: SS(I3DFIELD)
REALTYPE :: NN(I3DFIELD)
#ifndef NO_BAROCLINIC #ifndef NO_BAROCLINIC
! 3D baroclinic fields ! 3D baroclinic fields
REALTYPE :: NN(I3DFIELD)
REALTYPE :: S(I3DFIELD) REALTYPE :: S(I3DFIELD)
REALTYPE :: T(I3DFIELD) REALTYPE :: T(I3DFIELD)
REALTYPE :: rho(I3DFIELD) REALTYPE :: rho(I3DFIELD)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment