Skip to content

Commit

Permalink
Merge branch '4.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Fredrik Jansson committed Apr 21, 2020
2 parents 9299a01 + f53b66f commit f719f49
Show file tree
Hide file tree
Showing 151 changed files with 3,352,278 additions and 22 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ PROJECT(DALES Fortran)
cmake_minimum_required(VERSION 2.6)
set(VERSION_MAJOR "4")
set(VERSION_MINOR "2")
set(VERSION_PATCH "0")
set(VERSION_PATCH "1")

### If necessary, resort to BASH-methods to find netcdf-directory
EXEC_PROGRAM(${CMAKE_CURRENT_SOURCE_DIR}/findnetcdf OUTPUT_VARIABLE ADDMODULEPATH)
Expand Down
Binary file added cases/GOAMAZON14/ControlExperiment/input/backrad.inp.047.nc
View file
Binary file not shown.
202 changes: 202 additions & 0 deletions cases/GOAMAZON14/ControlExperiment/input/baseprof.inp.047
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
#baseprofiles
#height rhobf
10.0 0.11640840786983979E+01
30.0 0.11619301076933068E+01
50.0 0.11597791875799781E+01
70.0 0.11576313153622140E+01
90.0 0.11554864880454687E+01
110.0 0.11533447026368133E+01
130.0 0.11512059561449783E+01
150.0 0.11490702455803226E+01
170.0 0.11469375679548521E+01
190.0 0.11448079202822086E+01
210.0 0.11426812995776676E+01
230.0 0.11405577028581468E+01
250.0 0.11384371271422113E+01
270.0 0.11363195694500523E+01
290.0 0.11342050268034998E+01
310.0 0.11320934962260325E+01
330.0 0.11299849747427548E+01
350.0 0.11278794593804209E+01
370.0 0.11257769471674026E+01
390.0 0.11236774351337364E+01
410.0 0.11215809203110672E+01
430.0 0.11194873997327011E+01
450.0 0.11173968704335699E+01
470.0 0.11153093294502388E+01
490.0 0.11132247738209127E+01
510.0 0.11111432005854365E+01
530.0 0.11090646067852834E+01
550.0 0.11069889894635681E+01
570.0 0.11049163456650433E+01
590.0 0.11028466724360861E+01
610.0 0.11007799668247200E+01
630.0 0.10987162258805991E+01
650.0 0.10966554466550076E+01
670.0 0.10945976262008774E+01
690.0 0.10925427615727630E+01
710.0 0.10904908498268526E+01
730.0 0.10884418880209810E+01
750.0 0.10863958732146042E+01
770.0 0.10843528024688156E+01
790.0 0.10823126728463435E+01
810.0 0.10802754814115483E+01
830.0 0.10782412252304321E+01
850.0 0.10762099013706050E+01
870.0 0.10741815069013425E+01
890.0 0.10721560388935272E+01
910.0 0.10701334944196970E+01
930.0 0.10681138705539932E+01
950.0 0.10660971643722119E+01
970.0 0.10640833729517780E+01
990.0 0.10620724933717365E+01
1010.0 0.10600645227127792E+01
1030.0 0.10580594580572185E+01
1050.0 0.10560572964889994E+01
1070.0 0.10540580350937006E+01
1090.0 0.10520616709585295E+01
1110.0 0.10500682011723297E+01
1130.0 0.10480776228255599E+01
1150.0 0.10460899330103288E+01
1170.0 0.10441051288203615E+01
1190.0 0.10421232073510218E+01
1210.0 0.10401441656992916E+01
1230.0 0.10381680009637904E+01
1250.0 0.10361947102447693E+01
1270.0 0.10342242906440997E+01
1290.0 0.10322567392652924E+01
1310.0 0.10302920532134754E+01
1330.0 0.10283302295954138E+01
1350.0 0.10263712655195008E+01
1370.0 0.10244151580957548E+01
1390.0 0.10224619044358170E+01
1410.0 0.10205115016529631E+01
1430.0 0.10185639468620982E+01
1450.0 0.10166192371797482E+01
1470.0 0.10146773697240743E+01
1490.0 0.10127383416148561E+01
1510.0 0.10108021499735020E+01
1530.0 0.10088687919230539E+01
1550.0 0.10069382645881708E+01
1570.0 0.10050105650951475E+01
1590.0 0.10030856905718879E+01
1610.0 0.10011636381479463E+01
1630.0 0.99924440495448441E+00
1650.0 0.99732798812429002E+00
1670.0 0.99541438479178479E+00
1690.0 0.99350359209301353E+00
1710.0 0.99159560716564255E+00
1730.0 0.98969042714896660E+00
1750.0 0.98778804918389351E+00
1770.0 0.98588847041297090E+00
1790.0 0.98399168798036518E+00
1810.0 0.98209769903186617E+00
1830.0 0.98020650071487658E+00
1850.0 0.97831809017844562E+00
1870.0 0.97643246457322774E+00
1890.0 0.97454962105151066E+00
1910.0 0.97266955676719147E+00
1930.0 0.97079226887580727E+00
1950.0 0.96891775453450146E+00
1970.0 0.96704601090205833E+00
1990.0 0.96517703513886977E+00
2010.0 0.96331082440694960E+00
2030.0 0.96144737586994355E+00
2050.0 0.95958668669311120E+00
2070.0 0.95772875404333735E+00
2090.0 0.95587357508912285E+00
2110.0 0.95402114700060103E+00
2130.0 0.95217146694950694E+00
2150.0 0.95032453210921863E+00
2170.0 0.94848033965471712E+00
2190.0 0.94663888676261843E+00
2210.0 0.94480017061113775E+00
2230.0 0.94296418838013851E+00
2250.0 0.94113093725108055E+00
2270.0 0.93930041440705170E+00
2290.0 0.93747261703276086E+00
2310.0 0.93564754231453318E+00
2330.0 0.93382518744031395E+00
2350.0 0.93200554959966631E+00
2370.0 0.93018862598377305E+00
2390.0 0.92837441378543983E+00
2410.0 0.92656291019907921E+00
2430.0 0.92475411242073424E+00
2450.0 0.92294801764805956E+00
2470.0 0.92114462308032341E+00
2490.0 0.91934392591841929E+00
2510.0 0.91754592336485241E+00
2530.0 0.91575061262375468E+00
2550.0 0.91395799090086216E+00
2570.0 0.91216805540352897E+00
2590.0 0.91038080334073923E+00
2610.0 0.90859623192307826E+00
2630.0 0.90681433836275471E+00
2650.0 0.90503511987359175E+00
2670.0 0.90325857367103402E+00
2690.0 0.90148469697212630E+00
2710.0 0.89971348699554077E+00
2730.0 0.89794494096156996E+00
2750.0 0.89617905609210413E+00
2770.0 0.89441582961066701E+00
2790.0 0.89265525874238238E+00
2810.0 0.89089734071399795E+00
2830.0 0.88914207275386525E+00
2850.0 0.88738945209196152E+00
2870.0 0.88563947595987269E+00
2890.0 0.88389214159079765E+00
2910.0 0.88214744621954755E+00
2930.0 0.88040538708255289E+00
2950.0 0.87866596141784592E+00
2970.0 0.87692916646508812E+00
2990.0 0.87519499946553592E+00
3010.0 0.87346345766207045E+00
3030.0 0.87173453829917569E+00
3050.0 0.87000823862296239E+00
3070.0 0.86828455588114162E+00
3090.0 0.86656348732303656E+00
3110.0 0.86484503019958203E+00
3130.0 0.86312918176332876E+00
3150.0 0.86141593926843485E+00
3170.0 0.85970529997067002E+00
3190.0 0.85799726112741626E+00
3210.0 0.85629181999765958E+00
3230.0 0.85458897384201493E+00
3250.0 0.85288871992267723E+00
3270.0 0.85119105550348395E+00
3290.0 0.84949597784985309E+00
3310.0 0.84780348422883534E+00
3330.0 0.84611357190907732E+00
3350.0 0.84442623816083695E+00
3370.0 0.84274148025598627E+00
3390.0 0.84105929546800062E+00
3410.0 0.83937968107196614E+00
3430.0 0.83770263434457648E+00
3450.0 0.83602815256413843E+00
3470.0 0.83435623301055528E+00
3490.0 0.83268687296535127E+00
3510.0 0.83102006971164866E+00
3530.0 0.82935582053418377E+00
3550.0 0.82769412271929899E+00
3570.0 0.82603497355493283E+00
3590.0 0.82437837033065164E+00
3610.0 0.82272431033761173E+00
3630.0 0.82107279086857499E+00
3650.0 0.81942380921792091E+00
3670.0 0.81777736268163204E+00
3690.0 0.81613344855728853E+00
3710.0 0.81449206414408670E+00
3730.0 0.81285320674282013E+00
3750.0 0.81121687365589124E+00
3770.0 0.80958306218730802E+00
3790.0 0.80795176964268112E+00
3810.0 0.80632299332922985E+00
3830.0 0.80469673055577196E+00
3850.0 0.80307297863273541E+00
3870.0 0.80145173487214993E+00
3890.0 0.79983299658764972E+00
3910.0 0.79821676109447381E+00
3930.0 0.79660302570945862E+00
3950.0 0.79499178775104884E+00
3970.0 0.79338304453929098E+00
3990.0 0.79177679339583862E+00
92 changes: 92 additions & 0 deletions cases/GOAMAZON14/ControlExperiment/input/chem.inp.047
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
# FORMAT OF inputchem
# EVERY ITEM SHOULD BE SEPERATED BY AT LEAST ONE SPACE
# EXCEPT FOR THE COEFFICIENTS IN THE REACTIONS
# PUT NONACTIVE CHEMICAL COMPONENTS WITH COEFFICIENTS IN ().
# No empty lines are allowed. Comment line should start with a #.
# The file should start with a line with a @ as the first character, the rest of the line is free.
# and should be followed by 3 lines with no comments in between.
# The first line should contain the chemical species in same order as in scalar.inp, follwoed by
# 2 lines with the atol and rtol value's
# After the last reaction there should be a line with a $ as the first character.
@ 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
INERT O3 O1D NO NO2 CH4 CH2O CH3O2 MVK ISO RO2 OH HO2 CO H2O PRODUC O2 N2 HNO3 H2O2 CO2
1e-5 1e-5 1e-5 1e-5 1e-5 1e-5 1e-5 1e-5 1e-5 1e-5 1e-5 1e-5 1e-5 1e-5 1e-5 1e-5 1e-5 1e-5 1e-5 1e-5 1e-5
0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01
#
#--------------------------------------------------------------------------------------------------------------
# kr2nd |Name |Rad |func1| A | B | C | D | E | F | G | chemical reaction
# | |Dep | | | | | | | | | with inactive species
# |6char|int |int | real | real | real | real | real | real | real | in ( )
#---------------------------------------------------------------------------------------------------------------
# all reactions must have a name
2.e-5 R_1 1 2 6.62e-5 -.575 1.2 1.0 1.0 1.0 1.0 O3 + (hv) -> O1D + O2
1.0 R_2 0 2 1.63e-10 60 1.0 1.0 1.0 1.0 1.0 O1D + H2O -> 2OH
1.0 R_3 0 2 2.15e-11 110 1.0 1.0 1.0 1.0 1.0 O1D + N2 -> O3
1.0 R_4 0 2 3.30e-11 55 1.0 1.0 1.0 1.0 1.0 O1D + O2 -> O3
#5.0667e-6 R_O3 1 4 6.29e-5 2.412 0.7 2.2e-10 2.9e-11 1.0 1.0 O3 -> 2OH + (O2)
#
1.0 R_5 0 1 2.40e-13 1.0 1.0 1.0 1.0 1.0 1.0 OH + CO -> HO2 + (CO2)
1.0 R_6 0 2 2.45e-12 -1775. 1.0 1.0 1.0 1.0 1.0 OH + CH4 -> CH3O2
1.0 R_7 0 1 1.00e-10 1.0 1.0 1.0 1.0 1.0 1.0 OH + ISO -> RO2
1.0 R_8 0 1 2.40e-11 1.0 1.0 1.0 1.0 1.0 1.0 OH + MVK -> HO2 + CH2O
#
1.0 R_9 0 2 3.50e-12 250. 1.0 1.0 1.0 1.0 1.0 HO2 + NO -> OH + NO2
1.0 R_10 0 2 2.8e-12 300. 1.0 1.0 1.0 1.0 1.0 CH3O2 + NO -> HO2 + NO2 + CH2O
1.0 R_11 0 1 1.00e-11 1.0 1.0 1.0 1.0 1.0 1.0 RO2 + NO -> HO2 + NO2 + MVK + CH2O
#
1.0 R_12 0 2 5.50e-12 125 1.0 1.0 1.0 1.0 1.0 OH + CH2O -> HO2
#1.0 R_14 0 2 2.10e-13 750 1.0 1.0 1.0 1.0 1.0 HO2 + HO2 -> H2O2
1.0 R_14 0 6 2.20e-13 600 1.9e-33 980 1.4e-21 2200 1.0 2HO2 -> H2O2 + (O2)
1.0 R_15 0 2 4.10e-13 750 1.0 1.0 1.0 1.0 1.0 CH3O2 + HO2 -> PRODUC
1.0 R_16 0 1 1.50e-11 750 1.0 1.0 1.0 1.0 1.0 RO2 + HO2 -> PRODUC
1.0 R_17 0 2 3.50e-12 340 1.0 1.0 1.0 1.0 1.0 OH + NO2 -> HNO3
#
0.0167 R_NO2 1 2 1.67e-2 -.575 1.2 1.0 1.0 1.0 1.0 NO2 + (O2) -> NO + O3
1.0 R_CH2O 1 2 5.88e-5 -.575 1.2 1.0 1.0 1.0 1.0 CH2O + (hv) -> HO2
1.0 R_19 0 2 3.00e-12 -1500 1.0 1.0 1.0 1.0 1.0 NO + O3 -> NO2 + (O2)
$ end of chemical reactions specified by $ as first character on the line.

#
# function = 0 => Meaning K colum kn2rd in PPB*sec no temp dependence
# function = 1 => Meaning K colum A in cm3/molecule*sec no temp dependence (conversion factor cm3/molecs -> 1/ppbs)
# function = 2 => K = K (cm3/molecule*sec)
# MEANING of A..G K = A * exp (B/T)
# function = 3 => K = K (cm3/molecule*s)
# MEANING of A..G K = A * (T/B)^C * exp (D/T)
# function = 4 => K = K'* K"/(K'+ K")* G (cm3/molecule*sec)
# MEANING of A..G K'= A * (T/300)^B * exp(C/T)[M] K" = D * (T/300)^E * exp(F/T) Fc = G
# function = 5 => K = K'* K"/(K'+ K")* G (/sec)
# MEANING of A..G K'= A * (T/300)^B * exp(C/T)[M] K" = D * (T/300)^E * exp(F/T) Fc = G
# function = 6 => K = K'* K" (cm3/molecule*s)
# MEANING of A..G K= A * exp (B/T) K" = 1 + C * exp(D/T)[H20]
# function = 7 => K = K (cm6/molecule2*s)for above R63Ab reaction K = A * (T/1)^0 * exp(0/T)=A*1*1 = A
# MEANING of A..G K = A * (T/B)^C * exp (D/T)

# function for photolysis reactions

# function = 1 => ! constant independent of sza
# Keff = A
# function = 2 =>) ! exponential function
# Keff = A * exp(B / coszen)
# function = 3 => ! powerfunction
# Keff = A * coszen ** B
# function = 4 => ! powerfunction but special for JO3 because of dependence on H2O and Air
# Keff = A * (coszen ** B) * D*[H2O] / (D*[H2O] + E*[M])
# function = any other number =>
# Keff = 1.
#
#

# reactions for nighttime chemistry
#0.583E+0 R_57A 0 2 1.8e-11 110 1.0 1.0 1.0 1.0 1.0 NO + NO3 -> 2NO2
#0.109E-5 R_58A 0 2 1.4e-13 -2470 1.0 1.0 1.0 1.0 1.0 NO2 + O3 -> NO3 + (O2)
#0.148E-1 R_61A 0 4 3.6e-30 -4.1 0.0 1.9e-12 0.2 0.0 .35 NO2 + NO3 -> N2O5
#0.996E-1 R_62A 0 5 1.3e-3 -3.5 -11000 9.7e14 0.1 -11080 .35 N2O5 -> NO3 + NO2
#0.567E-11 R_63Aa 0 2 2.5e-22 0.0 1.0 1.0 1.0 1.0 1.0 N2O5 + H2O -> 2HNO3
#1.0 R_63Ab 0 7 1.8e-39 1.0 0.0 0.0 1.0 1.0 1.0 N2O5 + 2H2O -> 2HNO3 + H2O

#Photolysis
#5.0667e-6 R_O3 1 1 1.0 1.0 1.0 1.0 1.0 1.0 1.0 O3 -> 2HO + (O2)
#0.0167 R_NO2 1 1 1.0 1.0 1.0 1.0 1.0 1.0 1.0 NO2 + (O2) -> NO + O3
#2.530e-6 R_O3 1 0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 O3 -> 2HO + (O2)
#8.330e-3 R_NO2 1 0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 NO2 + (O2) -> NO + O3
Loading

0 comments on commit f719f49

Please sign in to comment.