Changes between Version 11 and Version 12 of ticket/0665_mass_heat_salt_fluxes
- Timestamp:
- 2010-05-04T08:30:40+02:00 (14 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
ticket/0665_mass_heat_salt_fluxes
v11 v12 35 35 '''(0) stylistic modification''' 36 36 37 style change only (results identical) with in particular the suppression of 'thd_ice(_2)' (merged in the 'ice(_2)' module) in order to have in a single line the declaration of a 2D ice array and its associated 1d array37 style changes only have been put in revision 1855. 38 38 39 For example: in thd_ice_2.F90 you have: 40 {{{ 41 REAL(wp), PUBLIC, DIMENSION(jpij) :: qldif_1d !: corresponding to the 2D var qldif 42 }}} 43 and in ice_2 : 44 {{{ 45 REAL(wp), PUBLIC, DIMENSION(jpi,jpj) :: qldif !: heat balance of the lead (or of the open ocean) 46 }}} 47 becomes simply in ice_2.F90 48 {{{ 49 REAL(wp), PUBLIC :: qldif(jpi,jpj), qldif_1d(jpij) !: heat balance of the lead (or of the open ocean) 50 }}} 39 Nevertheless we have return back to the original revision 1850 from which we start from the trunk. The style changes we be re-added at the end of the development, after the testing phase. 51 40 52 CAUTION : r1855 : this has been done for LIM-2, the LIM-3 case will come later on41 The following is thus done directly from the trunk. 53 42 54 CAUTION : the changes have to be tested with NVTK55 56 '''N.B. :'''57 • define in ice_2.F90 one for all rone=1.e0 ; rzero=0.e0 ; epsi20=1.e-20 ; epsi13=1.e-13 ; epsi06=1.e-06, ... and suppress their local definition almost every where in LIM-258 • limthd_lac.F90 : use one single big loop over ice covered grid points, and replace locally defined arrays by scalars59 43 60 44 '''(1) heat content of Freezing/Melting ice'''. … … 63 47 64 48 '''LIM2''' : the modules involved in the change are .... 65 • '''ice_2.F90''' : add arrays to describe the heat content associated with both snow and ice changes : 49 • '''ice_2.F90''' : add arrays to describe the heat content associated with both snow and ice mass changes 50 51 We also change the name of the mass changes. Thus the following lines 66 52 {{{ 67 REAL(wp), PUBLIC :: rdqsnif(jpi,jpj), rdqsnif_1d(jpij) !: heat content associated to rdqsnif [J/m2]68 REAL(wp), PUBLIC :: rdqicif(jpi,jpj), rdqicif_1d(jpij) !: heat content associated to rdmicif [J/m2]53 REAL(wp), PUBLIC, DIMENSION(jpi,jpj) :: rdqsnif !: Variation of snow mass 54 REAL(wp), PUBLIC, DIMENSION(jpi,jpj) :: rdqicif !: Variation of ice mass 69 55 }}} 56 becomes 57 {{{ 58 REAL(wp), PUBLIC, DIMENSION(jpi,jpj) :: rdm_snw !: Variation of snow mass over 1 time step [Kg/m2] 59 REAL(wp), PUBLIC, DIMENSION(jpi,jpj) :: rdq_snw !: heat content associated to rdm_snw [J/m2] 60 REAL(wp), PUBLIC, DIMENSION(jpi,jpj) :: rdq_ice !: Variation of ice mass over 1 time step [Kg/m2] 61 REAL(wp), PUBLIC, DIMENSION(jpi,jpj) :: rdq_ice !: heat content associated to rdm_snw [J/m2] 62 }}} 63 64 • '''thd_ice_2.F90''' : associated 1D array names (rdsnif_1d, rdmicif_1d) have been changed into (rdm_snw_1d, rdm_ice_1d) and (rdq_snw_1d, rdq_ice_1d) have been added. 65 66 • '''limthd_2.F90''' : introduce the new variable names, and pass the new variables (rdq_snw, rdq_ice) to the lim_thd_zdf and lim_thd_lac routines 67 68 Note 1: we suppress the change of ssit from Celcius to Kelvin and vice versa by adding a " + rt0 " at the 2 places it is used. 69 70 Note 2: zfontn has been suppressed as the heat associated with the melting of solid precipitation is now added to qns in sbc modules ('''==>> TO BE DONE in SBC''') 71 72 • '''limthd_lac_2.F90''' : introduce the new variable name (rdm_ice), and add the computation of rdq_ice) : 73 74 • '''limthd_zdf_2.F90''' : introduce the new variable names (rdm_snw, rdm_ice), and and add the computation/update of rdq_snw, rdq_ice : 75 76 • '''phycst.F90''' : style changes + : 77 78 - update of name: rau0r ==>> r1_rau0 ; ro0cpr = r1_rau0_rcp 79 80 - new variable: xlsn = lfus * rhosn (for lim3, already defined in lim2) ; lfus = xlsn / rhosn (for lim2, already defined in lim3) 70 81 71 82