Parent Directory | Revision Log
Links to HEAD: | (view) (annotate) |
Sticky Revision: |
Add output variables rld and rldcs Add output variables rld and rldcs (following LMDZ). In procedure cdrag, rename variables zdu2, ztsolv, ztvd, zri to du2, tsolv, tvd, ri. Replace `exp(log(psol))` by psol. In procedure `pbl_surface`, rename u, v to `u_seri`, `v_seri`.
Inline the list of files in `phylmd/CMakeLists.txt`. The drawback of reading a separate file `file_list` is that cmake seems not to reconfigure automatically when `file_list` is modified. Remove possibility to call nuage. So remove also variable `ok_newmicro`. (nuage is probably never used in LMDZ any longer, although it is still possible to use it in LMDZ.)
In procedure newmicro, rename dummy argument cltau to cldtau. In procedure nuage, rename dummy argument pcltau to cldtau. In procedure radlwsw, rename dummy argument cldtaupd to cldtau. Motivation: same variable name across procedures. In procedure newmicro, no need for arrays zflwp and zfiwp: scalars are sufficient (following LMDZ).
Julian dates be in double precision `ConfigureCompilerFlags.cmake` and `TAGS.cmake` are now copied into LMDZE, to avoid dependency on the environment. Julian dates must be in double precision, to get time step precision. Add optional attribute to argument sec of procedure ju2ymds. We do not need sec in procedure dynredem0. In procedure ju2ymds, by construction, sec cannot be > `un_jour`. Remove useless intermediary variables in procedure ymds2ju.
Change all `.f` suffixes to `.f90`. (The opposite was done in revision 82.) Because of change of philosopy in GNUmakefile: we already had a rewritten rule for `.f`, so it does not make the makefile longer to replace it by a rule for `.f90`. And it spares us options of makedepf90 and of the compiler. Also we prepare the way for a simpler `CMakeLists.txt`.
GNUmakefile does not depend on `settings.mk`. Rename argument precip1 of `cv_driver` to rain, matching the name of the corresponding actual argument in concvl. Add Netcdf variable pmflxr to history file, following LMDZ. In procedure phyetat0, no need for intermediary variable fractint.
Rename iniadvtrac to infotrac_init, to be closer to LMDZ.
Remove module temps. Move variable itau_dyn from module temps to module dynetat0_m, where it is defined. Split module dynetat0_m into dynetat0_m and dynetat0_chosen_m. The motivation is to create smaller modules. Procedures principal_cshift and invert_zoomx had to stay in dynetat0_m because of circular dependency. Now we will be able to move them away. Module variables which are chosen by the user, not computed, in program ce0l go to dynetat0_chosen_m: day_ref, annee_ref, clon, clat, grossismx, grossismy, dzoomx, dzoomy, taux, tauy. Move variable "pa" from module disvert_m to module dynetat0_chosen_m. Define "pa" in dynetat0_chosen rather than etat0. Define day_ref and annee_ref in procedure read_serre rather than etat0.
Remove variable pourc_* in histins.nc, redundant with fract_*. In procedure physiq, change the meaning of variable "sens" to avoid changing the sign several times needlessly. Also the meaning of variable "sens" in physiq is now the same than the meaning of netCDF variable "sens". Also the convention for "sens" is now the same than for radsol, zxfluxlat, and flux_t.
In procedure calcul_fluxs, rename coef1lay to cdragh (following LMDZ). Use named constant min_wind_speed (following LMDZ). Change name of NetCDF variable soll to CF standard rls.
Add output NetCDF variable "flat" (following LMDZ).
Move the call to conf_interface up to physiq, so there is no need to test first call inside pbl_surface for this. run_off_lic in fonte_neige was computed but not used. Pass it up to pbl_surface so we can output it (following LMDZ). Simplify the logic in interfsur_lim so we do not need debut. Remove the tests on the order of surface types in interfsurf_hq. Just add comments in indicesol.
Use directly dtphys from module comconst when possible instead of having it trickle down through procedure arguments.
fqcalving was saved in physiq and had intent inout in pbl_surface. So we could set fqcalving to 0 only once per run. The point is fqcalving must be defined everywhere for the computation of the average over all surfaces, even values that get multiplied by pctsrf = 0. I find it clearer to set fqcalving to 0 at every call of pbl_surface. This is more expensive but allows to give intent out to fqcalving in pbl_surface and remove the save attribute in physiq. Add zxfqcalving output netCDF variable (following LMDZ).
Rename module dimens_m to dimensions.
Try to clarify the logic. Remove module ener. Move variables from module ener to module dynetat0_m, where they are defined in program gcm. In sortvarc, I do not see how ptot0 could be 0, discard this possibility. Remove dummy argument resetvarc of procedure sortvarc. The difference is that sortvarc is called by caldyn or caldyn0 so just do different processing in caldyn and caldyn0 instead of inside sortvarc. No need for variables ang, etot, ptot, rmsdpdt, rmsv, stot, ztot to be at module level in module sortvarc_m, downgrade them to arguments of sortvarc. Instead of modyfying the meaning of ang, etot, ptot, rmsdpdt, rmsv, stot, ztot from absolute quantities to variations of these quantities, print the ratio in caldyn.
Move Sources/* to root directory.
*trmb[1-3] were just filled with 0. Remove these variables and output.
Rename phisinit to phis in restart.nc: clearer, same name as Fortran variable. In aaam_bud, use rlat and rlon from phyetat0_m instead of having these module variables associated to actual arguments in physiq. In clmain, too many wind variables make the procedure hard to understand. Use yu(:knon, 1) and yv(:knon, 1) instead of u1lay(:knon) and v1lay(:knon). Note that when yu(:knon, 1) and yv(:knon, 1) are used as actual arguments, they are probably copied to new arrays since the elements are not contiguous. Rename yu10m to wind10m because this is the norm of wind vector, not its zonal component. Rename yustar to ustar. Rename uzon and vmer to u1 and v1 since these are wind components at first layer and u1 and v1 are the names of corresponding dummy arguments in stdlevvar. In clmain, rename yzlev to zlev. In clmain, screenc, stdlevvar and coefcdrag, remove the code corresponding to zxli true (not used in LMDZ either). Subroutine ustarhb becomes a function. Simplifications using the fact that zx_alf2 = 0 and zx_alf1 = 1 (discarding the possibility to change this). In procedure vdif_kcay, remove unused dummy argument plev. Remove useless computations of sss and sssq. In clouds_gno, exp(100.) would overflow in single precision. Set maximum to exp(80.) instead. In physiq, use u(:, 1) and v(:, 1) as arguments to phytrac instead of creating ad hoc variables yu1 and yv1. In stdlevvar, rename dummy argument u_10m to wind10m, following the corresponding modification in clmain. Simplifications using the fact that ok_pred = 0 and ok_corr = 1 (discarding the possibility to change this).
LMDZE is now in Fortran 2003 (use of allocatable arguments). gradsdef was not used. Change names: [uv]10m to [uv]10m_srf in clmain, y[uv]1 to [uv]1lay. Remove useless complication: zx_alf[12]. Do not modify [uv]1lay after initial definition from [uv]. Add [uv]10m_srf to output. Change names in physiq: [uv]10m to [uv]10m_srf, z[uv]10m to [uv]10m, corresponding to NetCDF output names. Remove unused complication couchelimite and useless variable inirnpb in phytrac.
clcdrag is no longer used in LMDZ. Replaced by cdrag in LMDZ. In cdrag in LMDZ, zxli is a symbolic constant, false. So removed case zxli true in LMDZE. read_sst is called zero (if no ocean point on the whole planet) time or once per call of physiq. If mod(itap - 1, lmt_pas) == 0 then we have advanced in time of lmt_pas and deja_lu is necessarily false. qsat[sl] and dqsat[sl] were never called. Added output of qsurf in histins, following LMDZ. Last dummy argument dtime of phystokenc is always the same as first dummy argument pdtphys, removed dtime. Removed make rules for nag_xref95, since it does not exist any longer.
run_off_lic downgraded from variable of module interface_surf to local variable of fonte_neige. Code could not work with ok_aie set to true, so removed this possibility. tauae, piz_ae, cg_ae, topswai, solswai were then 0. cldtaupi was the same as cldtaupd. In sw and procedures called by sw, flag_aer did not need to be double precision, changed it to logical. Downgraded re and fl from arguments of newmicro to local variables. Added output of re and fl (following LMDZ).
size(snow) is now knon in interfsurf_hq. Renamed snow to fsnow in clmain, same name as corresponding actual argument. We can then rename ysnow to simply snow in clmain, same name as corresponding dummy argument of clqh. No need to initialize local snow to 0 since it is only used with indices 1:knon and already initialized from fsnow for each type of surface. If there is no point for a given type of surface, fsnow should be reset to 0 for this type. We need to give a valid value to fsnow in this case even if it will be multiplied by pctsrf = 0 in physiq. In physiq, no need for intermediate zxsnow for output. Removed unused arguments tsurf, p1lay, beta, coef1lay, ps, t1lay, q1lay, u1lay, v1lay, petAcoef, peqAcoef, petBcoef, peqBcoef of fonte_neige, with unused computations of zx_qs and zcor. (Same was done in LMDZ.)
Removed module conema3_m. Moved variables epmax and iflag_clw of conema3_m to conf_phys_m, where they are defined. Removed unused variable ok_adj_ema of conema3_m. Added variables d_t_ec, dtsw0 and dtlw0 to histins.nc (following LMDZ). Removed case not lessivage in phytrac. (Not used in LMDZ without INCA either.)
Moved variables from module com_io_dyn to module inithist_m, where they are defined. Split grid_atob.f into grille_m.f and dist_sphe.f. Extracted ASCCI art to documentation. In grille_m, use automatic arrays instead of maximum size. In grille_m, instead of printing data for every problematic point, print a single diagnostic message. Removed variables top_height, overlap, lev_histhf, lev_histday, lev_histmth, type_run, ok_isccp, ok_regdyn, lonmin_ins, lonmax_ins, latmin_ins, latmax_ins of module clesphys, not used. Removed variable itap of module histwrite_phy_m, not used. There is a variable itap in module time_phylmdz. Added output of tro3. In physiq, no need to compute wo at every time-step, since we only use it in radlwsw.
New philosophy on compiler options. Removed source code for thermcep = f. (Not used in LMDZ either.)
Removed dimension klev of flux_[tquv] and y_flux_[tquv] in clmain. Removed dimension klev of flux_[tquv] in physiq. Removed dimension klev of flux_[tq] in hbtm. Removed dimension klev of flux_[tq] in clqh and computations for layers other than the surface layer. Removed dimension klev of flux_v in clvent and computations for layers other than the surface layer. Values for layers other than the surface layer were not used nor output (not even in LMDZ). Removed argument dnwd0 of concvl. Simply write - mp in physiq (following LMDZ). Removed useless intermediary variables zxflux[tquv] in physiq.
Promoted lmt_pas from local variable of physiq to variable of module conf_gcm_m. Removed variable run_off of module interface_surf. Was not used. Called run_off_ter in LMDZ, but not used nor printed there either. Simplified logic in interfoce_lim. The way it was convoluted with interfsurf_hq and clmain was quite a mess. Extracted reading of SST into a separate procedure: read_sst. We do not need SST and pctsrf_new at the same time: SST is not needed for sea-ice surface. I did not like this programming: going through the procedure repeatedly for different purposes and testing inside whether there was something to do or it was already done. Reading is now only controlled by itap and lmt_pas, instead of debut, jour, jour_lu and deja_lu. Now we do not copy from pct_tmp to pctsrf_new every time step. Simplified processing of pctsrf in clmain and below. It was quite troubling: pctsrf_new was intent out in interfoce_lim but only defined for ocean and sea-ice. Also the idea of having arrays for all surfaces, pcsrf and pctsrf_new, in interfsurf_hq, which is called for a particular surface, was troubling. pctsrf_new for all surfaces was intent out in intefsurf_hq, but not defined for all surfaces at each call. Removed argument pctsrf_new of clmain: was a duplicate of pctsrf on output, and not used in physiq. Replaced pctsrf_new in clmain by pctsrf_new_oce and pctsrf_new_sic, which were the only ones modified.
Extracted the call to read_comdissnew out of conf_gcm. Made ok_instan a variable of module clesphys, itau_phy a variable of module phyetat0_m, nid_ins a variable of module ini_histins_m, itap a variable of new module time_phylmdz, so that histwrite_phy can be called from any procedure without the need to cascade those variables into that procedure. Made itau_w a variable of module time_phylmdz so that it is computed only once per time step of physics. Extracted variables of module clesphys which were in namelist conf_phys_nml into their own namelist, clesphys_nml, and created procedure read_clesphys reading clesphys_nml, to avoid side effect. No need for double precision in procedure getso4fromfile. Assume there is a single variable for the whole year in the NetCDF file instead of one variable per month. Created generic procedure histwrite_phy and removed procedure write_histins, following LMDZ. histwrite_phy has only two arguments, can be called from anywhere, and should manage the logic of writing or not writing into various history files with various operations. So the test on ok_instan goes inside histwrite_phy. Test for raz_date in phyetat0 instead of physiq to avoid side effect. Created procedure increment_itap to avoid side effect. Removed unnecessary differences between procedures readsulfate and readsulfate_pi.
Created module cv_thermo_m around procedure cv_thermo. Moved variables from module cvthermo to module cv_thermo_m, where they are defined. In ini_histins and initphysto, using part of rlon and rlat from phyetat0_m is pretending that we do not know about the dynamical grid, while the way we extract zx_lon(:, 1) and zx_lat(1, :) depends on ordering inside rlon and rlat. So we might as well simplify and clarify by using directly rlonv and rlatu. Removed intermediary variables in write_histins and phystokenc.
There was a function gr_phy_write_3d in dyn3d and a function gr_phy_write_2d in module grid_change. Moved them into a new module gr_phy_write_m under a generic interface gr_phy_write. Replaced calls to gr_fi_ecrit by calls to gr_phy_write. Removed arguments len, nloc and nd of cv30_compress. Removed arguments wd and wd1 of cv30_uncompress, wd of cv30_yield, wd of concvl, wd1 of cv_driver. Was just filled with 0. Removed option ok_gust in physiq, never used. In cv30_unsat, cv30_yield and cv_driver, we only need to define b to level nl - 1.
Removed variables nlm and nlp of module cv30_param_m. We do not believe much in the benefit of these intermediary variables so we go for clarity. Removed variable noff of module cv30_param_m. Never used anywhere else. Just set the value of nl explicitly in cv30_param. Removed argument nd of cv30_param. Only called with nd = klev. Replaced calls to zilch by array assignments. There was a strange double call to zilch with the same arguments in cv30_mixing. Removed procedure cv_flag. Just set the value of variable cvflag_grav of module cvflag at declaration.
Removed argument snow_con of concvl. Just set snow_con to 0 in physiq instead of in concvl. Removed unused argument cbmf1 of cv_driver. Added computation and output of ptop (following LMDZ).
Moved variables date0, deltat, datasz_max, ncvar_ids, point, buff_pos, buffer, regular from module histcom_var to modules where they are defined. Removed procedure ioipslmpp, useless for a sequential program. Added argument datasz_max to histwrite_real (to avoid circular dependency with histwrite). Removed useless variables and computations everywhere. Changed real litteral constants from default kind to double precision in lwb, lwu, lwvn, sw1s, swtt, swtt1, swu. Removed unused arguments: paer of sw, sw1s, sw2s, swclr; pcldsw of sw1s, sw2s; pdsig, prayl of swr; co2_ppm of clmain, clqh; tsol of transp_lay; nsrf of screenp; kcrit and kknu of gwstress; pstd of orosetup. Added output of relative humidity.
Added argument itau_phy to ini_histins, phyetat0, phytrac and phyredem0. Removed variable itau_phy of module temps. Avoiding side effect in etat0 and phyetat0. The procedures ini_histins, phyetat0, phytrac and phyredem0 are all called by physiq so there is no cascading variable penalty. In procedure inifilr, made the condition on colat0 weaker to allow for rounding error. Removed arguments flux_o, flux_g and t_slab of clmain, flux_o and flux_g of clqh and interfsurf_hq, tslab and seaice of phyetat0 and phyredem. NetCDF variables TSLAB and SEAICE no longer in restartphy.nc. All these variables were related to the not-implemented slab ocean. seaice and tslab were just set to 0 in phyetat0 and never used nor changed. flux_o and flux_g were computed in clmain but never used in physiq. Removed argument swnet of clqh. Was used only to compute a local variable, swdown, which was not used.
Write variables from phytrac to "histins.nc" instead of "histrac.nc". The idea is to have different output files only if they have different coordinates, and not according to content (following LMDZ).
Do not write any longer to startphy.nc nor read from restartphy.nc the NetCDF variable ALBLW: it was the same than ALBE. ALBE was for the visible and ALBLW for the near infrared. In physiq, use only variables falbe and albsol, removed falblw and albsollw. See revision 888 of LMDZ. Removed unused arguments pdp of SUBROUTINE lwbv, ptave of SUBROUTINE lwv, kuaer of SUBROUTINE lwvd, nq of SUBROUTINE initphysto.
Sources inside, compilation outside.
Removed arguments day0, anne0 of procedures initdynav and inithist. Use directly day_ref, annee_ref instead. Moved variables annee_ref, day_ref of module temps to module dynetat0_m. Deleted variables dayref and anneeref of module conf_gcm_m and removed them from namelist conf_gcm_nml. These variables were troubling intermediary on the way to annee_ref and day_ref. Gave as default values to annee_ref and day_ref the default values of dayref and anneeref. Moved the test on raz_date from main unit gcm to procedure dynetat0. Created namelist dynetat0_nml. Read annee_ref and day_ref from standard input in dynetat0 and redefine them from "start.nc" if not raz_date. Rationale: 1 - Choose the best programming from the point of view of program gcm only, forgetting program ce0l. 2 - The normal case is to define annee_ref and day_ref from "start.nc" so put them in module dynetat0_m rather than in conf_gcm_m. 3 - Try to always read the same namelists in the same order regardless of choices in previous namelists. Downsides: 1 -We now need the file "dynetat0.f" for the program ce0l, because dynetat0_m is used by dynredem0. 2 - We need to define annee_ref and day_ref from procedure etat0. Removed useless variable day_end of module temps.
Extracted procedures that were in module calendar into separate files.
Changed all ".f90" suffixes to ".f".
Moved everything out of libf.
Cleaning.
Changed name of module "comvert" to "disvert_m". Changed constant 1. to 0.3 in vertical sampling "strato".
No more included file in LMDZE, not even "netcdf.inc". Created a variable containing the list of common source files in GNUmakefile. So we now also see clearly files that are specific to each program. Split module "histcom". Assembled resulting files in directory "Histcom". Removed aliasing in calls to "laplacien".
Split "ini_hist.f90" into single-procedure files. In "calfis" and "physiq", removed dummy argument "nq" since "nq" must be equal to "nqmx". In "calfis", renamed dummy argument "pq" to "q", same name as actual argument in "leapfrog". Renamed local variable "zqfi" to "qx", same name as dummy argument in "physiq". Removed arguments "itop_con" and "ibas_con" of "phytrac", which were not used.
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.
ViewVC Help | |
Powered by ViewVC 1.1.21 |