59656e9249
Merge pull request #3 from evelynmacdonald/master
alphaparrot2023-05-15 00:12:12 -04:00
028f7b8381
Updating versions and docs, and adding ability to concatenate output variables using the inspect function and to preserve the time axis when computing spatial averages with gcmt.spatialmath
Adiv Paradise2023-05-15 00:09:16 -04:00
51192d9293
Added ability to output and postprocessor scalar and columnar variables, and added outputs for true anomaly, solar declination, solar ecliptic longitude, and distance modulus
Adiv Paradise2023-05-14 19:03:33 -04:00
ce2a703345
Fixed gen_orb_decl routine; should have the correct math now for declination and longitude
Adiv Paradise2023-05-14 14:54:02 -04:00
dad3104d7d
Hopefully fixed the bug in finalize() where the code looks for snapshot metadata in the snapshot folder instead of the working directory
maureenjcohen2023-05-06 07:48:35 +01:00
e1913ea642
Fixed tiny bug in definition of backscatter ratio. It's qback/qscat, not qback/qext.
maureenjcohen2023-05-04 23:14:10 +01:00
b1483b3a46
Modified aerosole rad code to be more similar to Stephens 1978, using backscatter ratio instead of asymmetry factor
maureenjcohen2023-05-04 19:16:59 +01:00
3455f9b2d3
Committing switch settings for nsela and nqspec
maureenjcohen2023-05-04 19:16:19 +01:00
a759b1f28b
Fixed error where meananomaly0 was sent to Fortran even if it's None
Adiv Paradise2023-04-30 21:04:44 -04:00
4ed79c3b34
Fixed tiny bug in mean free path calculation of aerocore
maureenjcohen2023-04-28 18:28:58 +01:00
81aa630d81
Fixed floating point errors in source. Source now based on SW flux rather than cosine of solar zenith angle for l_aerorad = 1
maureenjcohen2023-04-28 15:21:57 +01:00
b69cde89c6
Restored where losun block which now magically works as long as I take out the write statements. Code running fast.
maureenjcohen2023-04-28 15:19:59 +01:00
e0c140701e
Commented out the import pyfft lines that are causing an error when trying to postprocess
maureenjcohen2023-04-28 10:04:30 +01:00
034d57b673
Added quickprocess script to manually postprocess ou
maureenjcohen2023-04-28 10:03:57 +01:00
c8737db6b5
Added diagnostic printout settings to rad_run
maureenjcohen2023-04-26 21:55:38 +01:00
415d1197b5
Added stellar spectra and haze data for study
maureenjcohen2023-04-26 19:02:29 +01:00
68bf88d740
Committing bugfixes and code blocks to write out diagnostics for aerosols
maureenjcohen2023-04-26 18:59:41 +01:00
6a62629c01
Added script for test runs rad_run.py to repo
maureenjcohen2023-04-26 18:37:18 +01:00
3ced10d3ad
Fixed bug - radini was reading aerosol data if l_aerorad was set to 0 instead of 1!
maureenjcohen2023-04-26 12:48:19 +01:00
eb7eac36d8
Commiting bug fixes for Python API. As of this commit, code works from a technical perspective, but model is unstable
maureenjcohen2023-04-26 12:37:38 +01:00
3a3975d17d
Fixed bug of missing parenthesis, code now compiling
maureenjcohen2023-04-25 17:50:14 +01:00
3f5ae9d3d7
Added aerosol R and T for direct/diffuse and for both bands to total layer R and T by considering aerosol effects significant in ONLY the clear sky column (1-dcc)
maureenjcohen2023-04-25 17:47:41 +01:00
321db0ec97
Free of compiler errors as of this commit
maureenjcohen2023-04-25 17:44:09 +01:00
5eea556b7a
Removed circular dependency between radmod and aeromod
maureenjcohen2023-04-25 11:32:42 +01:00
1240252eb4
Removed l_aerorad from pumamad. It is set in aeromod and then read out from aero_namelist
maureenjcohen2023-04-25 10:30:32 +01:00
f47638d636
Added kwarg to input path to file containing aerosol optical constants data to configure(). The filename is written to aero_namelist, which is then read by aero_ini. If the logical l_aerorad is set, aero_ini will use readdat to read out the optical constants in the dat file and store them in variables in the model
maureenjcohen2023-04-24 18:13:07 +01:00
b5c1295831
Version 1 of the aerosol radiative transfer code in full. Yet to be compiled.
maureenjcohen2023-04-24 18:11:41 +01:00
e50f39d4bb
Added pCH4 as a configuration option for use in calculation of mmw and gascon of atmosphere
maureenjcohen2023-04-24 17:04:52 +01:00
c2f4134012
Specified that numrhos is an inout array like mmr. Both are 4-D
maureenjcohen2023-04-24 12:40:19 +01:00
744b4903a7
OK, undid adding numrho 3-D number density and instead output mmr2n straight to numrhos(:,:,:,ic). An extra intermediate 3-D array isn't needed since we aren't doing any calculations on number density within the loop
maureenjcohen2023-04-24 12:38:58 +01:00
f57619ae39
Added numrho 3-D number density array, analogous to daero 3-D mass mixing ratio array and dq 3-D specific humidity array
maureenjcohen2023-04-24 12:33:04 +01:00
efe54dbb55
Added undebugged and untested calculations to l_aerorad code block - working on debugging/testing in a standalone program in haze.f90
maureenjcohen2023-04-21 17:08:14 +01:00
807555164d
Added, debugged, and tested two-stream multiscattering approximation assuming reflected light (fixed cosine of solar zenith angle)
maureenjcohen2023-04-21 17:06:05 +01:00
cd1bd1cbc0
Changed imported properties. Now have single scattering albedo, asymmetry factor, aerosol optical depth, and layer height thickness
maureenjcohen2023-04-20 18:22:51 +01:00
3b6899e5f5
Eccentricity limits are now only considered if not using general Keplerian orbits
Adiv Paradise2023-04-16 19:21:10 -04:00
3e9dad5954
Added orbital code for generic keplerian orbits, including with high eccentricity. Untested, use at own risk. Will test soon.
Adiv Paradise2023-04-16 19:03:36 -04:00
52d4944a27
Added logical controlling aerosol radiative transfer (l_aerorad) to init
maureenjcohen2023-04-14 17:41:53 +01:00
c279ea6c95
Added a block for aerosol radiative effects. As of this commit, the code reads in a dat file containing 8 optical constants (4 for each SW band), calculates the layer height thickness, and calculates the transmissivity due to absorption only (qext-qscat).
maureenjcohen2023-04-14 17:01:02 +01:00
47a4afe382
Added missing thens to if/then statements using l_aerorad
maureenjcohen2023-04-14 16:08:29 +01:00
44eb371d5f
Imported l_aerorad from aeromod and created an aerosol radiative transfer block in radmod
maureenjcohen2023-04-14 16:06:02 +01:00
a73e7b7ea2
Added a function that converts mass mixing ratio to number density mmr2n. The corresponding arrays in plasimmod are nrho and numrhos. Added get/put/scatter calls for these arrays and also added them to the output. nrho has been added to outmod and the name and unit to pyburn
maureenjcohen2023-04-14 15:53:50 +01:00
eb2f20b08c
Added number density and transmissivity calculation to tester haze program, adjusted generate_data to be somewhat more realistic, compiled and ran
maureenjcohen2023-04-13 14:57:37 +01:00
01aefd7f0d
Added condition that if l_aerorad = 1, the source is proportional to the SW flux as a fraction of the max SW flux
maureenjcohen2023-04-13 12:21:24 +01:00
c8cbaec9a0
Added call to import SW flux from main program into aeromod/aerocore for use in defining the photochemical haze source; set l_aerorad to 0 by default (to be overriden by aero_namelist
maureenjcohen2023-04-13 12:13:17 +01:00
4f94bf505e
Added l_aerorad=1 to plasimmod to control radiative transfer blocks for aerosols
maureenjcohen2023-04-13 12:01:39 +01:00
8f4f25e535
Moved aerosol transport block to be before radstep/just after Semi-LA tracer transport block
maureenjcohen2023-04-13 11:41:12 +01:00
97bcd33585
Fix for bug related to previous postprocess bug
alphaparrot2023-04-12 21:55:38 -04:00
71da981a34
Merge branch 'dust' of github.com:maureenjcohen/ExoPlaSim into dust
maureenjcohen2023-04-05 17:56:32 +01:00
4cea34c369
Fixed bug in starspec arg with missing .dat endings/incorrect filenames
maureenjcohen2023-04-05 17:55:50 +01:00
96d213ff80
Fixed bug when including starspec file in configure method: added .dat to low-res file and removed [:-4] from high-res file
maureenjcohen2023-04-05 17:50:21 +01:00
6d885aba80
Added l_bulk/aerobulk as a property of a model object and to configuration file
maureenjcohen2023-03-31 14:07:22 +01:00
2f919250f3
Commit current version of aerosol modules
maureenjcohen2023-03-30 16:37:04 +01:00
06dfcff694
Fixed bug that causes crash during postprocessing if you have set snapshots to None in configure by adding an if self.snapshots condition before postprocess calls
maureenjcohen2023-03-20 18:11:55 +00:00
147ee213b7
Bugfixes: geomspace kw arg num requires an integer as input; moved wvref.txt to same directory as script
maureenjcohen2023-03-17 18:20:59 +00:00
d7c6b8146d
Added switch for bulk gas for aerosol module to Python API. Options are 1 (N2) or 2 (H2)
maureenjcohen2023-03-17 16:37:39 +00:00
6883dde5e9
Added a logical to switch atmosphere to bulk H2 and the relevant values for calculations of viscosity, Cunningham factor, and density
maureenjcohen2023-03-15 18:02:41 +00:00
e556d33ea3
Commented out references to exoplasim so I can import pyburn functions in the Python interpreter within the package directory. Need to undo this later.
maureenjcohen2023-03-14 15:56:20 +00:00
fd1b13e49e
Changed default compiler settings to debug=1 and nyears=1
maureenjcohen2023-03-14 14:13:48 +00:00
e8901bcb42
Bugfixes related to stellar spectral file classification in the configure() function and error-handling for when a relative path is provided
Adiv Paradise2022-10-02 11:21:56 -04:00
f5d7ef4b65
Switched of snow albedo arrays to see if sufficient hack to make outmod work
Maureen Cohen2022-06-20 16:39:17 +01:00
4f75ffe061
Moved gmu0 and dls source alls outside aerocore to aero_main before the call to aerocore. Turned off broadcasting of aerosol parameters/logicals as these caused a message truncation error. Set up logicals so aerosol module can be run while nsela is off and q is in spectral mode. Trying to fix outmod hanging/message truncation but not solved it yet.
Maureen Cohen2022-06-18 09:39:52 +01:00
f4bd47f67b
Removed import of exoplasim.pyfft for distribution
Maureen Cohen2022-06-06 18:03:14 +01:00
6731e72095
Turn off debug switch in aeromod and tracermod to save disc space
Maureen Cohen2022-06-06 17:59:43 +01:00
alphaparrot