Changing hard-coded value of 28.97 g/mol by RMD physical constant defined in suphel.F90
As rmd = 28.9644, this involves a lack of numerical convergence with previous commit.
12 lines of code changed in 3 files:
Introduce variable activate_ocean_skin in module config_ocean_skin_m.
Bug fix in phys_state_var_end: we need to deallocate variables for
lmdz1d (although it is useless for a 3D run).
74 lines of code changed in 7 files:
Wrong order in call sequence of XIOS context initialisation meant that the coupled model hung.
LF
6 lines of code changed in 3 files:
For debugging purposes and running without COSP
LF
148 lines of code changed in 1 file:
Adding some forgotten SAVE in wake.F90
6 lines of code changed in 1 file:
Bug fix: uninitialized variable in wake.F90 when iflag_wk_pop_dyn >= 1
3 lines of code changed in 1 file:
Adding some diagnostics for type_trac=co2i
75 lines of code changed in 4 files:
gregorian calendar option disappeared in latest commits
OB/LF
2 lines of code changed in 1 file:
Saving old version of thermcell_plume in thermcell_plume_6A.F90
It includes both thermcell_plume_6A and thermcell_plume_5B corresponding
to the 5B and 6A versions used for CMIP5 and CMIP6.
The latest was previously named thermcellV1_plume.
The new thermcell_plume is a clean version (removing obsolete
options) of thermcell_plume_6A.
The 3 versions are controled by
flag_thermals_ed <= 9 thermcell_plume_6A
<= 19 thermcell_plume_5B
else thermcell_plume (default 20 for convergence with 6A)
Fredho
1261 lines of code changed in 4 files:
Various additions for the interactive CO2 cycle
70 lines of code changed in 3 files:
changed hard coded CO2 molar mass to corresponding variable
and capitalize all of: if endif or and
33 lines of code changed in 1 file:
small changes for interactive CO2
cleaning up END IF statements
19 lines of code changed in 1 file:
A first package with molar masses for radiatively active gases, a new switch for interactive radiative CO2
and minor changes to the carbon_cycle module.
37 lines of code changed in 4 files:
sorry, should leave histins disabled by default
1 lines of code changed in 1 file:
adding some CO2 diagnostics
6 lines of code changed in 1 file:
change Xhistins to histins
and added a few CO2 variables for debug
6 lines of code changed in 1 file:
Changing dimension of fields_trac_2D to grid_glo
1 lines of code changed in 1 file:
Following merging of DYNAMICO/LMDZ branches, modifications needed for the 1D LMDZ model
Added a 1D special version of dimphy which is called before the real dimphy in lmdz1d
MPL
29 lines of code changed in 2 files:
Undo (unwanted) change made in r3437 . Default shell should be bash.
EM
0 lines of code changed in 1 file:
For checking purposes
739 lines of code changed in 2 files:
Initialisations wrongly placed
2 lines of code changed in 2 files:
Choosing the right ORCHIDEE interface and some XIOS stuff
7 lines of code changed in 3 files:
Compiler sans XIOS
Fredho
6 lines of code changed in 3 files:
Additional modifications wrt previous commit to enable working without XIOS.
EM+LF
30 lines of code changed in 5 files:
"Historic" :-) commit merging the physics branch used for DYNAMICO with the LMDZ trunk.
The same physics branch can now be used seamlessly with the traditional lon-lat LMDZ
dynamical core and DYNAMICO.
Testing consisted in running a lon-lat LMDZ bucket simulation with the NPv6.1 physics package
with the original trunk sources and the merged sources. Tests were succesful in the sense that
numeric continuity was preserved in the restart files from both simulation. Further tests
included running both versions of the physics codes for one year in a LMDZOR setting in which
the restart files also came out identical.
Caution:
- as the physics package now manages unstructured grids, grid information needs to be transmitted
to the surface scheme ORCHIDEE. This means that the interface defined in surf_land_orchidee_mod.F90
is only compatible with ORCHIDEE version orchidee2.1 and later versions. If previous versions of
ORCHIDEE need to be used, the CPP key ORCHIDEE_NOUNSTRUCT needs to be set at compilation time.
This is done automatically if makelmdz/makelmdz_fcm are called with the veget orchidee2.0 switch
- due to a limitation in XIOS, the time at which limit conditions will be read in by DYNAMICO will be
delayed by one physic timestep with respect to the time it is read in by the lon-lat model. This is caused
by the line
IF (MOD(itime-1, lmt_pas) == 0 .OR. (jour_lu /= jour .AND. grid_type /= unstructured)) THEN ! time to read
in limit_read_mod.F90
Work still needed on COSP integration and XML files for DYNAMICO
EM, YM, LF
4242 lines of code changed in 113 files:
Forgot to include makelmdz_fcm in previous commit.
0 lines of code changed in 2 files:
Move the call to config_ocean_skin out of !$OMP MASTER in procedure
conf_phys. Definition of jcool, jwarm and rain_effect must be done by
all threads.
Use keywords in call to bulk_flux in procedure surf_ocean, for clarity.
Define CPP_KEY IN_LMDZ in makelmdz_fcm. This could be useful for any
external code used with LMDZ.
Move the Ocean_skin folder out of the LMDZ tree. This is more
convenient and clearer because Ocean_skin stays under Git control for
now. So we do not declare a phylmd/Ocean_skin folder in
"bld.cfg". Instead, we use the option -ext_src of makelmdz_fcm.
7 lines of code changed in 3 files:
merge with rev 3430 on trunk - Inca folder config create by fcm at the end of the simulation is renamed build
2 lines of code changed in 1 file:
Inca folder config create by fcm at the end of the simulation is renamed build
2 lines of code changed in 1 file:
Create subdirectory Ocean_skin in libf. For now, Ocean_skin is under
control of git, not subversion.
Add variable eps_w to common YOMCST.
For now, continue to read ocean skin parameters from a namelist in
config_ocean_skin.
The parameterisation is called from procedure surf_ocean.
Add two prognostic variables for the parameterisation: dt_ns and
ds_ns. Add eight diagnostic variables: t_int, s_int, dter, dser, tkt,
tks, rf, taur. The ten variables are only defined on ocean surface,
elsewhere they are set to nf90_fill_real. In pbl_surface, we can
initialize the eight diagnostic variables to nf90_fill_real before the
loop on sub-surfaces, but we need to keep the old values of dt_ns and
ds_ns as input of the parameterisation so we set dt_ns and ds_ns to
nf90_fill_real after the call to surf_ocean. Define ten corresponding
compressed variables in pbl_surface. Define ten corresponding NetCDF
output variables in phys_output_ctrlout_mod.
In procedure pbl_surface_newfrac, for an appearing ocean sub-surface,
dt_ns and ds_ns are set to 0. In phyetat0, also set initial dt_ns and
ds_ns to 0 if they are not in start file.
In procedure surf_ocean, for now, we use a constant specific latent
heat of vaporization, as elsewhere in LMDZ, and a constant bulk
salinity.
0 lines of code changed in 24 files: