Skip to content
Snippets Groups Projects
Commit 30811b80 authored by WAUTELET Philippe's avatar WAUTELET Philippe
Browse files

Philippe 17/03/2021: budgets: choose source terms for budgets with character... 

Philippe 17/03/2021: budgets: choose source terms for budgets with character strings instead of multiple integer variables
parent 4604aaf5
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
src/MNH/ini_budget.f90
+ 3104
− 2861
View file @ 30811b80
This diff is collapsed.
src/MNH/modd_budget.f90
+ 22
− 462
View file @ 30811b80
This diff is collapsed.
src/MNH/modn_budget.f90
+ 15
− 86
View file @ 30811b80
...@@ -215,21 +215,7 @@ ...@@ -215,21 +215,7 @@
!! MODIFICATIONS !! MODIFICATIONS
!! ------------- !! -------------
!! Original 01/03/95 !! Original 01/03/95
!! J. Stein 29/06/95 new processes' list ! P. Wautelet 17/03/2021: choose source terms for budgets with character strings instead of multiple integer variables
!! J.-P. Pinty 11/01/97 add several SVx
!! J.-P. Pinty 18/02/97 add forcing and ice
!! J.-P. Pinty 25/09/00 add budget terms for C2R2
!! D. Gazen 22/01/01 add NCHEMSV
!! C.Lac 04/2016 negative contribution to the budget split between advection, turbulence and microphysics for KHKO/C2R2
!! C. Barthe /16 add budget terms for LIMA
!! C.Lac 10/2016 Add droplet deposition
!! S. Riette 11/2016 New budgets for ICE3/ICE4
! P. Wautelet 28/01/2020: add missing budgets for viscosity
! B. Vie 03/02/2020: LIMA negativity checks after turbulence, advection and microphysics budgets
! P. Wautelet 09/03/2020: add missing budgets for electricity
! P. Wautelet 30/06/2020: add NNETURSV, NNEADVSV and NNECONSV variables
! P. Wautelet 02/03/2021: budgets: add terms for blowing snow
! P. Wautelet 04/03/2021: add terms for drag due to buildings
!------------------------------------------------------------------------------- !-------------------------------------------------------------------------------
! !
!* 0. DECLARATIONS !* 0. DECLARATIONS
...@@ -242,87 +228,30 @@ IMPLICIT NONE ...@@ -242,87 +228,30 @@ IMPLICIT NONE
NAMELIST/NAM_BUDGET/CBUTYPE, NBUMOD, XBULEN, NBUKL, NBUKH, LBU_KCP, XBUWRI, & NAMELIST/NAM_BUDGET/CBUTYPE, NBUMOD, XBULEN, NBUKL, NBUKH, LBU_KCP, XBUWRI, &
NBUIL, NBUIH, NBUJL, NBUJH, LBU_ICP, LBU_JCP, NBUMASK NBUIL, NBUIH, NBUJL, NBUJH, LBU_ICP, LBU_JCP, NBUMASK
! !
NAMELIST/NAM_BU_RU/LBU_RU, NASSEU, NNESTU, NADVU, NFRCU, NNUDU, & NAMELIST/NAM_BU_RU/LBU_RU, CBULIST_RU
NCURVU, NCORU, NDIFU, NRELU, NDRAGU, NDRAGBU, NHTURBU, NVTURBU, NMAFLU, NPRESU, NVISCU
! !
NAMELIST/NAM_BU_RV/LBU_RV, NASSEV, NNESTV, NADVV, NFRCV, NNUDV, & NAMELIST/NAM_BU_RV/LBU_RV, CBULIST_RV
NCURVV, NCORV, NDIFV, NRELV, NDRAGV, NDRAGBV, NHTURBV, NVTURBV, NMAFLV, NPRESV, NVISCV
NAMELIST/NAM_BU_RW/LBU_RW, NASSEW, NNESTW, NADVW, NFRCW, NNUDW, & NAMELIST/NAM_BU_RW/LBU_RW, CBULIST_RW
NCURVW, NCORW, NGRAVW, NDIFW, NRELW, NHTURBW, NVTURBW, NPRESW, NVISCW
! !
NAMELIST/NAM_BU_RTH/LBU_RTH, NASSETH, NNESTTH, NADVTH, NFRCTH, & NAMELIST/NAM_BU_RTH/LBU_RTH, CBULIST_RTH
NNUDTH, NPREFTH, NDIFTH, NRELTH, NRADTH, NDCONVTH, NHTURBTH, &
NVTURBTH, NDISSHTH, NNEGATH, NREVATH, NCONDTH, NHENUTH, NHONTH, &
NSFRTH, NDEPSTH, NDEPGTH,NRIMTH, NACCTH, NCFRZTH, NWETGTH, &
NDRYGTH, NGMLTTH, NIMLTTH, NBERFITH, NCDEPITH, NWETHTH, NHMLTTH, &
NMAFLTH, NSNSUBTH, NNETURTH, NNEADVTH,NNECONTH, NDRYHTH, NADJUTH, NCORRTH, &
NHINDTH, NHINCTH, NHONHTH, NHONCTH, NHONRTH, NCEDSTH, NSEDITH, NVISCTH
! !
NAMELIST/NAM_BU_RTKE/LBU_RTKE, NASSETKE, NADVTKE, & NAMELIST/NAM_BU_RTKE/LBU_RTKE, CBULIST_RTKE
NFRCTKE, NDIFTKE, NRELTKE, NDRAGTKE, NDRAGBTKE, &
NDPTKE, NTPTKE, NDISSTKE, NTRTKE
! !
NAMELIST/NAM_BU_RRV/LBU_RRV, NASSERV, NNESTRV, NADVRV, NFRCRV, & NAMELIST/NAM_BU_RRV/LBU_RRV, CBULIST_RRV
NNUDRV, NDIFRV, NRELRV, NDCONVRV, NHTURBRV, NVTURBRV, NNEGARV, &
NREVARV, NCONDRV, NHENURV, NDEPSRV, NDEPGRV, NCDEPIRV, NMAFLRV, NSNSUBRV, &
NNETURRV, NNEADVRV,NNECONRV, NADJURV, NCORRRV, NHINDRV, NHONHRV, NCEDSRV, NVISCRV
! !
NAMELIST/NAM_BU_RRC/LBU_RRC, NASSERC, NNESTRC, NADVRC, NFRCRC, & NAMELIST/NAM_BU_RRC/LBU_RRC, CBULIST_RRC
NDIFRC, NRELRC, NDCONVRC, NHTURBRC, NVTURBRC, NNEGARC, NACCRRC, &
NAUTORC, NCONDRC, NHONRC, NRIMRC, NWETGRC, NDRYGRC, NIMLTRC, &
NBERFIRC, NCDEPIRC, NHENURC, NSEDIRC, NWETHRC, NNETURRC, &
NNEADVRC,NNECONRC, NDRYHRC, NADJURC, NCORRRC, NCMELRC, &
NHINCRC, NHONCRC, NCEDSRC, NREVARC, NDEPORC,NDEPOTRRC, &
NCORRRC, NR2C1RC, NCVRCRC, NVISCRC
! !
NAMELIST/NAM_BU_RRR/LBU_RRR, NASSERR, NNESTRR, NADVRR, NFRCRR, & NAMELIST/NAM_BU_RRR/LBU_RRR, CBULIST_RRR
NDIFRR, NRELRR, NNEGARR, NACCRRR, NAUTORR, NREVARR, NSEDIRR, &
NSFRRR, NACCRR, NCFRZRR, NWETGRR, NDRYGRR, NGMLTRR, NWETHRR, &
NHMLTRR, NDRYHRR, NCORRRR, NCMELRR,NHONRRR, NCORRRR, NR2C1RR, NCVRCRR, &
NNETURRR, NNEADVRR, NNECONRR, NVISCRR
! !
NAMELIST/NAM_BU_RRI/LBU_RRI, NASSERI, NNESTRI, NADVRI, NFRCRI, & NAMELIST/NAM_BU_RRI/LBU_RRI, CBULIST_RRI
NDIFRI, NRELRI, NDCONVRI, NHTURBRI, NVTURBRI, NNEGARI, NSEDIRI, &
NHENURI, NHONRI, NAGGSRI, NAUTSRI, NCFRZRI, NWETGRI, NDRYGRI, &
NIMLTRI, NBERFIRI, NCDEPIRI, NWETHRI, NDRYHRI, NADJURI, NCORRRI, &
NHINDRI, NHINCRI, NHONHRI, NHONCRI, NCNVIRI, NCNVSRI, &
NHMSRI, NHMGRI, NCEDSRI, NCORRRI, &
NNETURRI, NNEADVRI, NNECONRI, NVISCRI
! !
NAMELIST/NAM_BU_RRS/LBU_RRS, NASSERS, NNESTRS, NADVRS, NFRCRS, & NAMELIST/NAM_BU_RRS/LBU_RRS, CBULIST_RRS
NDIFRS, NRELRS, NNEGARS, NSEDIRS, NDEPSRS, NAGGSRS, NAUTSRS, &
NRIMRS, NACCRS, NCMELRS, NWETGRS, NDRYGRS, NWETHRS, NDRYHRS, &
NCORRRS, NCNVIRS, NCNVSRS, NHMSRS, NCORRRS, &
NNETURRS, NNEADVRS, NNECONRS, NVISCRS
! !
NAMELIST/NAM_BU_RRG/LBU_RRG, NASSERG, NNESTRG, NADVRG, NFRCRG, & NAMELIST/NAM_BU_RRG/LBU_RRG, CBULIST_RRG
NDIFRG, NRELRG, NNEGARG, NSEDIRG, NSFRRG, NDEPGRG, NRIMRG, NACCRG, &
NCMELRG, NCFRZRG, NWETGRG, NDRYGRG, NGMLTRG, NWETHRG, &
NDRYHRG, NCORRRG, NHGCVRG, NGHCVRG,NHONRRG, NHMGRG, NCOHGRG, &
NNETURRG, NNEADVRG, NNECONRG, NVISCRG
! !
NAMELIST/NAM_BU_RRH/LBU_RRH, NASSERH, NNESTRH, NADVRH, NFRCRH, & NAMELIST/NAM_BU_RRH/LBU_RRH, CBULIST_RRH
NDIFRH, NRELRH, NNEGARH, NSEDIRH, NWETGRH, NWETHRH, NDRYHRH, NHMLTRH, & !
NCORRRH, NHGCVRH, NGHCVRH, NCOHGRH, NHMLTRH, & NAMELIST/NAM_BU_RSV/ LBU_RSV, CBULIST_RSV
NNETURRH, NNEADVRH, NNECONRH, NVISCRH
!
NAMELIST/NAM_BU_RSV/ LBU_RSV, NASSESV, NNESTSV, NADVSV, NFRCSV, &
NDIFSV, NRELSV, NDCONVSV, NVTURBSV, NHTURBSV, NCHEMSV, NMAFLSV, &
NVISCSV, NSNSUBSV, NSNSEDSV, NNEGASV, NNETURSV, NNEADVSV, NNECONSV, NNEGA2SV, &
NDRIFTQV, NCORAYQV, NDEPSQV, NDEPGQV, NREVAQV, NCDEPIQV, NNEUTQV, &
NHONQC, NAUTOQC, NACCRQC, NRIMQC, NWETGQC, NDRYGQC, NINCGQC, NWETHQC, &
NIMLTQC, NBERFIQC, NSEDIQC, NCDEPIQC, NNEUTQC, &
NSFRQR, NAUTOQR, NACCRQR, NREVAQR, NACCQR, NCFRZQR, NWETGQR, NDRYGQR, &
NGMLTQR, NWETHQR, NHMLTQR, NSEDIQR, NNEUTQR, &
NHONQI, NAGGSQI, NAUTSQI, NCFRZQI, NWETGQI, NDRYGQI, NWETHQI, &
NIMLTQI, NBERFIQI, NNIISQI, NSEDIQI, NCDEPIQI, NNEUTQI, &
NDEPSQS, NAGGSQS, NAUTSQS, NRIMQS, NACCQS, NCMELQS, NWETGQS, &
NDRYGQS, NNIISQS, NWETHQS, NSEDIQS, NNEUTQS, &
NSFRQG, NDEPGQG, NRIMQG, NACCQG, NCMELQG, NCFRZQG, NWETGQG, NDRYGQG, &
NINCGQG, NGMLTQG, NWETHQG, NSEDIQG, NNEUTQG, &
NWETGQH, NWETHQH, NHMLTQH, NSEDIQH, NNEUTQH, &
NDRIFTNI, NCORAYNI, NDEPSNI, NDEPGNI, NREVANI, NCDEPINI, NNEUTNI, &
NDEPOTRSV
! !
END MODULE MODN_BUDGET END MODULE MODN_BUDGET
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

Documentation | Mentions légales | CGU | Accessibilité : non conforme