Changes between Version 14 and Version 15 of DevelopmentActivities/MergeHydro/Martial_notes_on_merge


Ignore:
Timestamp:
10/24/11 09:06:31 (11 years ago)
Author:
mmaipsl
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DevelopmentActivities/MergeHydro/Martial_notes_on_merge

    v14 v15  
    207207          ENDDO 
    208208}}} 
    209 }}} 
     209 * Définitions des soilclass, clayfraction, soiltile et njsc : On fait deux appel à slowproc_soilt 
     210{{{ 
     211       IF ( MINVAL(soilclass) .EQ. MAXVAL(soilclass) .AND. MAXVAL(soilclass) .EQ. val_exp .OR.& 
     212            & MINVAL(clayfraction) .EQ. MAXVAL(clayfraction) .AND. MAXVAL(clayfraction) .EQ. val_exp) THEN 
     213 
     214          CALL slowproc_soilt(kjpindex, lalo, neighbours, resolution, contfrac, soilclass, clayfraction) 
     215 
     216       ENDIF 
     217 
     218       IF ( MINVAL(soiltile) .EQ. MAXVAL(soiltile) .AND. MAXVAL(soiltile) .EQ. val_exp .OR.& 
     219            & MINVAL(njsc) .EQ. MAXVAL(njsc) .AND. MAXVAL(njsc) .EQ. undef_int .OR.& 
     220            & MINVAL(clayfraction) .EQ. MAXVAL(clayfraction) .AND. MAXVAL(clayfraction) .EQ. val_exp) THEN 
     221          CALL slowproc_soilt(kjpindex, lalo, neighbours, resolution, contfrac, soilclass, clayfraction) 
     222 
     223          ! Soiltiles are only used in hydrol, but we fix them in here because some time it might depend 
     224}}} 
     225  Le second appel me semble inutile. Si les soiltile et njsc ne sont pas dans le restart, il suffit simplement de les recalculer. Je simplifie donc : 
     226{{{ 
     227       IF ( MINVAL(soilclass) .EQ. MAXVAL(soilclass) .AND. MAXVAL(soilclass) .EQ. val_exp .OR.& 
     228            & MINVAL(clayfraction) .EQ. MAXVAL(clayfraction) .AND. MAXVAL(clayfraction) .EQ. val_exp) THEN 
     229 
     230          CALL slowproc_soilt(kjpindex, lalo, neighbours, resolution, contfrac, soilclass, clayfraction) 
     231 
     232       ENDIF 
     233 
     234       IF ( MINVAL(soiltile) .EQ. MAXVAL(soiltile) .AND. MAXVAL(soiltile) .EQ. val_exp .OR.& 
     235            & MINVAL(njsc) .EQ. MAXVAL(njsc) .AND. MAXVAL(njsc) .EQ. undef_int) THEN 
     236 
     237          ! Soiltiles are only used in hydrol, but we fix them in here because some time it might depend 
     238}}}