Dust
(9 files, 9256 lines)
cospv2
(1 files, 1040 lines)
dyn1d
(10 files, 8528 lines)
[root]/branches/LMDZ-tracers/libf/phylmd
Dust
(9 files, 9256 lines)
cospv2
(1 files, 1040 lines)
dyn1d
(10 files, 8528 lines)
| Author | Changes | Lines of Code | Lines per Change |
|---|---|---|---|
| dcugnet | 89 (100.0%) | 3060 (100.0%) | 34.3 |
Fix to make the 1D version run.
3 lines of code changed in 1 file:
* fix of the delPhase function.
* getvar1 and getvar2 fixed and modified to avoid the usage of files with
several time records and make the calls rather short.
* works again with iadv==0
* no more issues with tracers numbers (nqo, nqtot, etc.)
* fixes in the algebrical reduction routine used for "isotopes_parems.def"
(containing simple expressions with variables that have to be substituted).
* still to be validated numerically
9 lines of code changed in 1 file:
In readTracFiles: the separator between the tracer name and its phase is no longer hardcoded and equal to "-",
but is a parameter ("phases_sep") which default value is "_".
Few more fixes.
11 lines of code changed in 1 file:
* Bugs corrections:
- sequential gcm fixed
- parallel gcm compilation fixed ; to be tested
* Some generic operations moved from infotrac to readTracFile
* Fixed algebrical reduction routine, used in the isotopes parameters file.
* Additional component "comp" in the tracers descriptor derived type "tra",
specifying the model component name(s) (cf. tracers sections) it belongs.
* isotopes class selection tool fixed.
59 lines of code changed in 2 files:
Extension of the tracers management.
The tracers files can be:
1) "traceur.def": old format, with:
- the number of tracers on the first line
- one line for each tracer: <tracer name> <hadv> <vadv> [<parent name>]
2) "tracer.def": new format with one section each model component.
3) "tracer_<name>.def": new format with a single section.
The formats 2 and 3 reading is driven by the "type_trac" key, which can be a
coma-separated list of components.
* Format 2: read the sections from the "tracer.def" file.
* format 3: read one section each "tracer_<section name>.def" file.
* the first line of a section is "&<section name>
* the other lines start with a tracer name followed by <key>=<val> pairs.
* the "default" tracer name is reserved ; the other tracers of the section
inherit its <key>=<val>, except for the keys that are redefined locally.
This format helps keeping the tracers files compact, thanks to the "default"
special tracer and the three levels of factorization:
* on the tracers names: a tracer name can be a coma-separated list of tracers
=> all the tracers of the list have the same <key>=<val> properties
* on the parents names: the value of the "parent" property can be a
coma-separated list of tracers
=> only possible for geographic tagging tracers
* on the phases: the property "phases" is [g](l][s] (gas/liquid/solid)
Read information is stored in the vector "tracers(:)", of derived type "tra".
"isotopes_params.def" is a similar file, with one section each isotopes family.
It contains a database of isotopes properties ; if there are second generation
tracers (isotopes), the corresponding sections are read.
Read information is stored in the vector "isotopes(:)", of derived type "iso".
The "getKey" function helps to get the values of the parameters stored in
"tracers" or "isotopes".
266 lines of code changed in 14 files:
Update the branch to the current trunk.
2712 lines of code changed in 70 files: