Pull request to put the Isca Mars configurations into Isca's master - #299
Open
sit23 wants to merge 96 commits into
Open
Pull request to put the Isca Mars configurations into Isca's master#299sit23 wants to merge 96 commits into
sit23 wants to merge 96 commits into
Conversation
…my module in order that we can correctly calculate rrsun using the true anomaly rather than the mean anomaly. Have also added multiplication by rrsun to two-stream-grey-rad, which makes no difference to results in initial tests when ecc = 0.0
…ue anomaly, and therefore be able to do mars time-telling.
… expects orbital_period in seconds, but I had supplied it in days. This is because Alex's code expects it in days. Will fix Alex code to make it consistent.
…e of surface optical depths and albedos, assuming transparancy in the visible. Useful for working out rough values for optical depths and albedos for a simple mars model.
…ay is not the same as one mars day. Have altered rotation rate and orbital rate such that each can be set as an integer, and we end up with a length of sol which is also an integer. This can then be used as the averaging period.
…dependently. Then also only calculating rh when rh is asked for. Model now runs and looks vaguely mars-like, but dates of equinox etc still not right.
…nml, and ability to use specified temperatures for evaporation calculations in surface flux. This means that, when using a dry model where temperatures are outside standard range for sat specific humidity calculations, then false temps can be used to stop it failing.
Cores on a Mac cannot be tied in the same way that they can on linux, so core affinity is not possible. Here I am just stubbing out the core affinity functions to mimic the linux case where it cannot get the affinity info. More info in links inline in `affinity.c`.
…xis. For some reason, the interpolator will get rid of such variables when used on its own, so I modified the python to add them back.
…o idealized moist phys back in teh old GFDLMoistmodel repo on the local_heating_dev branch. This seems to work now, and should hopefully be useful. Only tried the Isidoro option, and not the input file option, but this should be fine.
Adding mac functionality to local heating branch
…cal prescribed heating input files. Seems to work alright, but problem is that local heating code always reads zeros no matter what I seem to do. Reading the created files into RRTM as an ozone does work, and reading ozone-1990 into local heating does not. Very odd. Tried everything I can think of, but we'll have to carry on testing.
…not being passed time, and therefore was not being fed to the correct interpolator within the interface type structure.
Updating from master
Local dry heating
Conflicts: src/atmos_param/two_stream_gray_rad/two_stream_gray_rad.F90
…resentation. This is an option used specifically by the Titan version of fms-idealized from Tapio Schneider et al. I copied this section of code from their github on 15th June 2020. N.b. that this does change the way update-tracers works for all cases, not just when do-spec-tracer-filter is True, so will have to think about this when it comes to merging all this into the master.
…ed. Does not work yet.
Conflicts: postprocessing/plevel_interpolation/scripts/run_plevel.py src/atmos_param/socrates/interface/read_control.F90 src/atmos_spectral/driver/solo/idealized_moist_phys.F90 src/coupler/surface_flux.F90
…p dry heating test case and associated script for generating heating rate. This now produced a heating array of zeros purely for test purposes.
…s and not automated compile tests.
…ing discovered by pytest.
…mn variants to prevent compilation failure.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The Isca Mars configurations haven't ever been merged into the master, and I'd like to make sure this is done ASAP.
In this P/R I have put in my grey-radiation Mars and Socrates Mars configurations without dust as test cases that can be run with the trip tests. These are the ones that are described in this paper:
https://www.mdpi.com/2073-4433/10/12/803
I'd also like to get in Emily Ball's Isca-Mars configurations that built on my Mars stuff, but I wanted to do this first. This P/R is ready for merging (pending passing the trip tests).