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

Timestamp:

2011-10-24T09:06:31+02:00 (13 years ago)

Author:

mmaipsl

Comment:

--

DevelopmentActivities/MergeHydro/Martial_notes_on_merge

@@ -207 +207 @@
           ENDDO
 }}}
-}}}
+ * Définitions des soilclass, clayfraction, soiltile et njsc : On fait deux appel à slowproc_soilt
+{{{
+       IF ( MINVAL(soilclass) .EQ. MAXVAL(soilclass) .AND. MAXVAL(soilclass) .EQ. val_exp .OR.&
+            & MINVAL(clayfraction) .EQ. MAXVAL(clayfraction) .AND. MAXVAL(clayfraction) .EQ. val_exp) THEN
+
+          CALL slowproc_soilt(kjpindex, lalo, neighbours, resolution, contfrac, soilclass, clayfraction)
+
+       ENDIF
+
+       IF ( MINVAL(soiltile) .EQ. MAXVAL(soiltile) .AND. MAXVAL(soiltile) .EQ. val_exp .OR.&
+            & MINVAL(njsc) .EQ. MAXVAL(njsc) .AND. MAXVAL(njsc) .EQ. undef_int .OR.&
+            & MINVAL(clayfraction) .EQ. MAXVAL(clayfraction) .AND. MAXVAL(clayfraction) .EQ. val_exp) THEN
+          CALL slowproc_soilt(kjpindex, lalo, neighbours, resolution, contfrac, soilclass, clayfraction)
+
+          ! Soiltiles are only used in hydrol, but we fix them in here because some time it might depend
+}}}
+  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 :
+{{{
+       IF ( MINVAL(soilclass) .EQ. MAXVAL(soilclass) .AND. MAXVAL(soilclass) .EQ. val_exp .OR.&
+            & MINVAL(clayfraction) .EQ. MAXVAL(clayfraction) .AND. MAXVAL(clayfraction) .EQ. val_exp) THEN
+
+          CALL slowproc_soilt(kjpindex, lalo, neighbours, resolution, contfrac, soilclass, clayfraction)
+
+       ENDIF
+
+       IF ( MINVAL(soiltile) .EQ. MAXVAL(soiltile) .AND. MAXVAL(soiltile) .EQ. val_exp .OR.&
+            & MINVAL(njsc) .EQ. MAXVAL(njsc) .AND. MAXVAL(njsc) .EQ. undef_int) THEN
+
+          ! Soiltiles are only used in hydrol, but we fix them in here because some time it might depend
+}}}