Context Navigation

Dust

Timestamp:

Mar 29, 2023, 3:14:27 PM (20 months ago)

Author:

lguez

Message:

Sync latest trunk changes to branch LMDZ_ECRad

Location:

LMDZ6/branches/LMDZ_ECRad

Files:

Property svn:mergeinfo changed

/LMDZ6/branches/Ocean_skin	merged: 4013,4020-4021,4024-4025,4368-4369
/LMDZ6/trunk	merged: 4224-4234,4236,4240-4266,4268,4270-4285,4287-4298,4300-4303,4305,4318-4319,4325-4328,4332-4334,4348-4352,4354,4356-4359,4361-4363,4365,4367,4370-4371,4374,4376-4377,4379-4381,4383-4386,4389,4391-4397,4399-4404,4408,4412-4416,4419-4420,4424-4426,4428-4434,4436-4438,4440-4441,4443,4448-4456,4458,4460-4464,4466-4467,4469-4473,4475-4479,4481

r4160	r4482
381	381	USE pbl_surface_mod, ONLY: snow
382	382	USE indice_sol_mod, ONLY: nbsrf
383		USE infotrac, ONLY: nqtot, nbtr, tracers~~, type_trac~~
	383	USE infotrac, ONLY: nqtot, nbtr, tracers
384	384	USE geometry_mod, ONLY: cell_area
385	385	USE surface_data, ONLY: type_ocean, version_ocean, ok_veget, landice_opt

Note: See TracChangeset for help on using the changeset viewer.