r2785-2838
Commissions entre r2664 et r2719
------------------------------------------------------------------------
r2838 | fairhead | 2017-03-30 13:45:47 +0200 (Thu, 30 Mar 2017) | 2 lines
Modifications to ensure missig data value is correctly handled by XIOS
------------------------------------------------------------------------
r2837 | acozic | 2017-03-30 10:59:48 +0200 (Thu, 30 Mar 2017) | 2 lines
remove commit 2836 and come back to previous version. There was a bug that need to be fixed before a new commit
------------------------------------------------------------------------
r2836 | acozic | 2017-03-29 15:34:39 +0200 (Wed, 29 Mar 2017) | 3 lines
make some modification to remove the reading of p0 that is not present in forcage files. And add the possibility to have dim in "presnivs" and "time_counter"
------------------------------------------------------------------------
r2835 | idelkadi | 2017-03-29 13:18:00 +0200 (Wed, 29 Mar 2017) | 2 lines
Supression des messages de sorties (print*) dans Cosp!
------------------------------------------------------------------------
r2834 | idelkadi | 2017-03-29 13:07:59 +0200 (Wed, 29 Mar 2017) | 3 lines
- Mise a jour des fichiers *.xml pour la compatibilite avec la nouvelle version XIOS.
- Correction de la frequence de sorties mensuelle (1mo au lieu de 30j)
------------------------------------------------------------------------
r2833 | acozic | 2017-03-28 16:32:15 +0200 (Tue, 28 Mar 2017) | 2 lines
use pseudoalt calculated in the dynamic instead of Alt in phys_output_mod
------------------------------------------------------------------------
r2832 | acozic | 2017-03-28 15:39:31 +0200 (Tue, 28 Mar 2017) | 2 lines
transfer aps and bps to INCA / in phys_output_mod replace Ahyb and Bhyb by aps and bps as decide by email (poihl / 28/03/2017)
------------------------------------------------------------------------
r2831 | acozic | 2017-03-27 16:35:14 +0200 (Mon, 27 Mar 2017) | 2 lines
add an argument date0 to inca initialisation
------------------------------------------------------------------------
r2830 | acozic | 2017-03-24 16:42:11 +0100 (Fri, 24 Mar 2017) | 2 lines
Add a missing OM MASTER directive for the strataer version.
------------------------------------------------------------------------
r2829 | fairhead | 2017-03-22 17:30:18 +0100 (Wed, 22 Mar 2017) | 2 lines
Missing scalar grid definition that got deleted in revision 2822
------------------------------------------------------------------------
r2828 | fhourdin | 2017-03-20 18:05:17 +0100 (Mon, 20 Mar 2017) | 10 lines
Modifications de yamada4 issues de la these d'Etienne Vignon (sous
l'otpion new_yamada4=y) :
1/ schema numerique inspire de celui de MAR
2/ viscosite moleculaire ajoute pour les cas ou la diffusion
turbulente s'effondre.
3/ Desactivation de la modification Holtzlag Boville pour les
couches limites tres stables.
4/ longueur de melange nulle par defaut.
------------------------------------------------------------------------
r2827 | emillour | 2017-03-16 16:35:40 +0100 (Thu, 16 Mar 2017) | 3 lines
Adding some missing initializations in phyaqua_mod and phys_local_var_mod.
EM
------------------------------------------------------------------------
r2826 | fhourdin | 2017-03-16 14:31:15 +0100 (Thu, 16 Mar 2017) | 3 lines
Nouvelle option (provisoire) de contrôle de la convection par wbmax
------------------------------------------------------------------------
r2825 | musat | 2017-03-15 16:32:31 +0100 (Wed, 15 Mar 2017) | 2 lines
Delete paire_ter LMDZ variable and aireTER output
------------------------------------------------------------------------
r2824 | fairhead | 2017-03-15 12:15:55 +0100 (Wed, 15 Mar 2017) | 5 lines
Introduction of convoccur variable and modification of the wbeff variable
in the convection so that wbeff/convoccur is the mean value of wbeff when
convection occurs
Jyg
------------------------------------------------------------------------
r2823 | oboucher | 2017-03-14 23:10:55 +0100 (Tue, 14 Mar 2017) | 6 lines
Climatological ASNO3M, CSNO3M, CINO3M aerosol fields can be read and fed
through the aerosol routines for optical properties. The get_aero_fromfile
routine needed some change so that it doesn't stop if a particular field
is not there.
------------------------------------------------------------------------
r2822 | idelkadi | 2017-03-14 10:58:56 +0100 (Tue, 14 Mar 2017) | 9 lines
1. Ecriture des champs de sorties Cosp 4D dans les fichiers Netcdf en utilisant les fonctionalites Xios.
- ajout d'une routine histwrite_cosp4D appelee si les sorties sont gerees par Xios (dans cosp_output_write.F90)
- definitions des differents axes et grilles 4D pour Cosp (dans context_lmdz.xml)
2. Traitement des valeurs indefinies par Xios et mise a zero si l'on utilise Ioipsl.
3. Correction d'erreur sur les sorties Modis
------------------------------------------------------------------------
r2821 | dcugnet | 2017-03-13 14:54:30 +0100 (Mon, 13 Mar 2017) | 2 lines
Fix bug introduced in rev. 2820.
------------------------------------------------------------------------
r2820 | dcugnet | 2017-03-10 17:46:08 +0100 (Fri, 10 Mar 2017) | 9 lines
Fix and cleaning/improvements over the previous commit:
* Old style climoz files are handled without trouble.
* New style climoz (monthly with 14 records or daily) are handled
with the same read_climoz key values (1 or 2).
* Daily files reading activation is done using the same key
used in ce0l to create them: ok_daily_climoz=y. This key is now
put to FALSE by default (old style 360 days files are not considered
as daily).
------------------------------------------------------------------------
r2819 | dcugnet | 2017-03-08 15:34:12 +0100 (Wed, 08 Mar 2017) | 5 lines
* Modification to allow previous convention climoz files (360 records for all calendars) to be handled again:
- read_climoz=1 / 2 (tro3 only / tro3 and tro3_daylight) => 360 records file
- read_climoz=3 / 4 (same) => daily (calendar compliant) file or monthly (14 records) file
* Few fixes in the ozone forcing reading routine
------------------------------------------------------------------------
r2818 | fairhead | 2017-03-08 15:29:37 +0100 (Wed, 08 Mar 2017) | 3 lines
Bug corrected to get same restarts when using ok_conserv_q=y and different
parallel domain sectionning
------------------------------------------------------------------------
r2817 | fhourdin | 2017-03-07 10:05:20 +0100 (Tue, 07 Mar 2017) | 5 lines
En option, nouveaux schemas numeriques pour l'integration temporelle.
yamada4_num=0 : std
=1 : comme MAR
------------------------------------------------------------------------
r2816 | fhourdin | 2017-03-07 09:28:32 +0100 (Tue, 07 Mar 2017) | 4 lines
Modification pour sortir bils_ech meme si la conservation de l'energie
n'est pas activee (question d'initialisation).
------------------------------------------------------------------------
r2814 | jyg | 2017-03-06 17:38:36 +0100 (Mon, 06 Mar 2017) | 1 line
Cosmetic changes to fisrtilp
------------------------------------------------------------------------
r2813 | oboucher | 2017-03-06 16:45:34 +0100 (Mon, 06 Mar 2017) | 2 lines
Adding OD550_ASNO3M, OD550_CSNO3M and OD550_CINO3M to the file_def_*.xml
------------------------------------------------------------------------
r2812 | jyg | 2017-03-06 14:56:26 +0100 (Mon, 06 Mar 2017) | 5 lines
Addition of a diagnostic mode for add_phys_tend,
with a new argument diag_mode (=0 for normal use;
=1 for diagnostic use).
------------------------------------------------------------------------
r2811 | jyg | 2017-03-06 14:49:30 +0100 (Mon, 06 Mar 2017) | 4 lines
In interp_case_vertical and interp2_case_vertical,
dtrad_mod_cas were not computed (MPL)
------------------------------------------------------------------------
r2810 | oboucher | 2017-03-06 10:35:59 +0100 (Mon, 06 Mar 2017) | 3 lines
Removing CSSO4M for now as this aerosol species should not be looked at
according to Didier H. This is done by setting fac=0 for this species
------------------------------------------------------------------------
r2809 | jyg | 2017-03-06 09:26:24 +0100 (Mon, 06 Mar 2017) | 1 line
Another spurious print removed
------------------------------------------------------------------------
r2808 | jyg | 2017-03-06 00:14:20 +0100 (Mon, 06 Mar 2017) | 1 line
Extra print deleted
------------------------------------------------------------------------
r2807 | jyg | 2017-03-06 00:10:54 +0100 (Mon, 06 Mar 2017) | 6 lines
Various corrections in fisrtilp.F90 yielding an
energy conserving scheme. Energy is conserved
provided: fl_cor_ebil>0, ok_bad_ecmwf_thermo=n
and iflag_bergeron=2
------------------------------------------------------------------------
r2806 | oboucher | 2017-03-02 20:46:14 +0100 (Thu, 02 Mar 2017) | 3 lines
Adding od443aer diagnostic for CMIP6.
Removing od670aer and AI calculations as they are not used.
------------------------------------------------------------------------
r2805 | fairhead | 2017-03-01 17:50:11 +0100 (Wed, 01 Mar 2017) | 2 lines
Correcting bug introduced in r2795
------------------------------------------------------------------------
r2804 | emillour | 2017-03-01 08:15:23 +0100 (Wed, 01 Mar 2017) | 3 lines
Fix some OpenMP typos introduced in revision 2799.
EM
------------------------------------------------------------------------
r2803 | oboucher | 2017-02-28 22:05:52 +0100 (Tue, 28 Feb 2017) | 2 lines
Correcting bug on current day in the year in RSUN forcing
------------------------------------------------------------------------
r2802 | oboucher | 2017-02-28 17:55:03 +0100 (Tue, 28 Feb 2017) | 2 lines
Changed comment for days_elapsed (upon recommendation of Laurent F)
------------------------------------------------------------------------
r2801 | jyg | 2017-02-28 12:48:45 +0100 (Tue, 28 Feb 2017) | 2 lines
Bug fix in a call to add_phys_tend.
------------------------------------------------------------------------
r2800 | jyg | 2017-02-24 19:57:04 +0100 (Fri, 24 Feb 2017) | 1 line
complement to the previous commit
------------------------------------------------------------------------
r2799 | jyg | 2017-02-24 19:50:33 +0100 (Fri, 24 Feb 2017) | 16 lines
New diagnostics to verify energy conservation.
Some corrections to improve energy conservation.
Some bug correction.
New output variables and new flags are
introduced:
(1)New variables: d_xx_col is the budget over
each column of variable "xx".
(2) fl_ebil: 0 -> no diag; 1 -> diags activated
(3) fl_cor_ebil: 0 -> no correction ensuring
energy conservation; 1 -> first set of
corrections.
+ ok_bad_ecmwf_thermo: if true, a bug setting
RVTMP2 to 0 is fixed; for backward compatibility
the default is "false".
------------------------------------------------------------------------
r2798 | jghattas | 2017-02-24 15:40:57 +0100 (Fri, 24 Feb 2017) | 2 lines
Add option no_ter_antartique that will remove all land fractions souther than 60deg south. This option is only used by ce0l.
------------------------------------------------------------------------
r2797 | fairhead | 2017-02-23 17:05:46 +0100 (Thu, 23 Feb 2017) | 3 lines
Inclusion des correspondances CMIP5
LF
------------------------------------------------------------------------
r2796 | fairhead | 2017-02-22 13:30:58 +0100 (Wed, 22 Feb 2017) | 3 lines
Initial include of correspondance table between model
variables names and CMIP6 Data Request
------------------------------------------------------------------------
r2795 | fairhead | 2017-02-22 09:29:30 +0100 (Wed, 22 Feb 2017) | 4 lines
Upgrading time counter in the physics to a count of seconds from the start of the run.
The old counter made the model diverge when runs made in 4 months chunks were compared
to runs made in 1 month chunks
------------------------------------------------------------------------
r2794 | idelkadi | 2017-02-17 19:32:49 +0100 (Fri, 17 Feb 2017) | 2 lines
Traitement des valeurs indefinies par XIOS et correction d'erreur pour le simulateur Modis
------------------------------------------------------------------------
r2793 | fhourdin | 2017-02-16 08:57:30 +0100 (Thu, 16 Feb 2017) | 3 lines
Petite correction a la precedente commission de iophys
------------------------------------------------------------------------
r2792 | fairhead | 2017-02-13 16:25:12 +0100 (Mon, 13 Feb 2017) | 2 lines
Needed for new revision of XIOS
------------------------------------------------------------------------
r2790 | acozic | 2017-02-08 16:05:38 +0100 (Wed, 08 Feb 2017) | 4 lines
Modification for INCA
If there is no value for O3 concentration in start.nc, we decide to read value of OX (OX=O3 + O1D + O) instead of initialized to zero.
------------------------------------------------------------------------
r2789 | emillour | 2017-02-06 14:04:15 +0100 (Mon, 06 Feb 2017) | 3 lines
Fix problem introduced in rev2786 : Call to init_vertical_layers not needed in lmdz1d because done in inigeomphy which is called by iniphysiq.
EM
------------------------------------------------------------------------
r2788 | dcugnet | 2017-02-02 19:01:50 +0100 (Thu, 02 Feb 2017) | 39 lines
Changes in ce0l about the way ozone forcing files are generated:
1) 3D raw input files "climoz.nc" are now handled.
2) Default behaviour is now to let the gcm interpolate in time online.
This helps to avoid huge forcing files (in particular for 3D fields).
In this case, the output files "climoz_LMDZ.nc" all have 14 records:
* records 2-13 are obtained with records 1-12 of "climoz.nc".
* records 1 and 14 are obtained respectively with:
- record 12 of "climoz_m.nc" if available, of "climoz.nc" otherwise.
- record 1 of "climoz_p.nc" if available, of "climoz.nc" otherwise.
3) If ok_daily_climoz key is TRUE, the time interpolation (one record
a day) is forced, using the 14 records described below.
This now depends on the calendar (it was on a 360 days basis only).
Changes in the gcm about the way zone forcing files are read/interpolated:
1) 3D horizontally interpolated "climoz_LMDZ.nc" files are now handled.
2) Daily files (already interpolated in time) are still handled, but their
number of records must match the expected number of days, that depends
on the calendar (records step is no longer 1/360 year).
3) 14 records monthly files are now handled (and prefered). This reduces
the I/O to a minimum and the aditional computational cost is low (simple
online linear time interpolation).
4) If adjust_tropopause key is TRUE, the input fields are stretched using
following method:
* LMDZ dynamical tropopause is detected:
Ptrop_lmdz = MAX ( P(Potential Vorticity==2PVU), P(theta==380K) )
* file chemical tropopause is detected:
Ptrop_file = P( tro3 == o3t ), where:
o3t = 91. + 28. * SIN(PI*(month-2)/6) (ppbV)
This formula comes from Thouret & al., ACP 6, 1033-1051, 2006.
The second term of the expression is multiplied by TANH(lat_deg/20.)
to account for latitude dependency.
* File profile is streched in a +/- 5kms zone around the mean tropopause
to ensure resulting tropopause matches the one of LMDZ.
See procedure regr_pr_time_av for more details.
------------------------------------------------------------------------
r2786 | emillour | 2017-01-30 11:24:47 +0100 (Mon, 30 Jan 2017) | 7 lines
Further convergence with planetary models:
- move vertical_layers_mod.F90 to phy_common and call init_vertical_layers in inigeomphy_mod
- add aps and bps (mid-layer coordinates) to vertical_layers_mod.F90
- same adaptations for the 1D case
EM
------------------------------------------------------------------------