Changeset 7515 for branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba

Timestamp:

2022-03-10T16:32:09+01:00 (2 years ago)

Author:

josefine.ghattas

Message:

Reorganizing in output variables related to validation of interpolation, see ticket #812

• Regrouped all output variables after interpolation into the new file sechiba_inter_diag
• Renamed output variables axxx for availabilty for interpolation into interp_avail_axxx
• Added some more variables needed to validate interpolation for pftmap and soils_param files
• Set level to only output the final variables after interpolation
• Removed variable "aveget5k" from field_def not sent from fortran code anymore

Location:

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba

Files:

• condveg.f90 (modified) (3 diffs)
• slowproc.f90 (modified) (6 diffs)
• thermosoil.f90 (modified) (1 diff)

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/condveg.f90

@@ -1048 +1048 @@
   !! 1. Open file and allocate memory
 
+  IF (grid_type==unstructured) THEN
+     CALL ipslerr_p(3,'condveg_soilalb','Reading of SOILALB_FILE must be implemented with XIOS to be used for unstructured grid.', &
+             'Use option alb_bg_modis for unstructured grid for now.','')
+  END IF
+
+
   ! Open file with soil colours 
 
@@ -1184 +1190 @@
 
   ! Write diagnostics
-  CALL xios_orchidee_send_field("asoilcol",asoilcol)
+  CALL xios_orchidee_send_field("interp_avail_asoilcol",asoilcol)
 
 
@@ -1352 +1358 @@
     CALL xios_orchidee_send_field("interp_diag_alb_vis",soilalb_bg(:,ivis))
     CALL xios_orchidee_send_field("interp_diag_alb_nir",soilalb_bg(:,inir))
-    CALL xios_orchidee_send_field("aalb_bg",aalb_bg)
+    CALL xios_orchidee_send_field("interp_avail_aalb_bg",aalb_bg)
     
   END SUBROUTINE condveg_background_soilalb

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/slowproc.f90

@@ -2426 +2426 @@
 
     ! Write diagnostics
-    CALL xios_orchidee_send_field("alaimap",alaimap)
+    CALL xios_orchidee_send_field("interp_avail_alaimap",alaimap)
     CALL xios_orchidee_send_field("interp_diag_lai",laimap)
    
@@ -2600 +2600 @@
 
     IF ( .NOT. partial_update ) THEN
+       ! Case for not DGVM or (DGVM and init)
        veget_next(:,:)=zero
        
@@ -2777 +2778 @@
 
     ! Write diagnostics
-    CALL xios_orchidee_send_field("aveget",aveget)
-    CALL xios_orchidee_send_field("interp_diag_aveget",aveget)
+    CALL xios_orchidee_send_field("interp_avail_aveget",aveget)
     CALL xios_orchidee_send_field("interp_diag_vegetrefrac",vegetrefrac)
+    CALL xios_orchidee_send_field("interp_diag_veget_next",veget_next)
 
     IF (printlev_loc >= 3) WRITE(numout,*) '  slowproc_readvegetmax ended'
@@ -3096 +3097 @@
 
     ELSE ! spmipexp is either exp1=maps, or texture for exp2 or exp3 (or typing error!)
-       
+        
        ! In these cases (maps or texture), we need to read the soil texture map
        
@@ -3671 +3672 @@
          ENDIF
        ENDIF
-   ENDIF ! SPMIPEXP 
-             
+   ENDIF ! SPMIPEXP
+   
     ! Write diagnostics
-    CALL xios_orchidee_send_field("atext",atext)
-    CALL xios_orchidee_send_field("interp_diag_atext",atext)
+    CALL xios_orchidee_send_field("interp_avail_atext",atext)
     CALL xios_orchidee_send_field("interp_diag_soilclass",soilclass)
+    CALL xios_orchidee_send_field("interp_diag_njsc",REAL(njsc, r_std))
     CALL xios_orchidee_send_field("interp_diag_clayfraction",clayfraction)
+    CALL xios_orchidee_send_field("interp_diag_sandfraction",sandfraction)
+    CALL xios_orchidee_send_field("interp_diag_siltfraction",siltfraction)
     
     IF (printlev_loc >= 3) WRITE(numout,*) '  slowproc_soilt ended'
@@ -3819 +3822 @@
     
       ! Write diagnostics
-    CALL xios_orchidee_send_field("aslope",aslope)
-    CALL xios_orchidee_send_field("interp_diag_aslope",aslope)
-
+    CALL xios_orchidee_send_field("interp_avail_aslope",aslope)
     CALL xios_orchidee_send_field("interp_diag_reinf_slope",reinf_slope)
 

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/thermosoil.f90

@@ -1932 +1932 @@
 
     ! Write diagnostics
-    CALL xios_orchidee_send_field("areftemp",areftemp)
+    CALL xios_orchidee_send_field("interp_avail_areftemp",areftemp)
     CALL xios_orchidee_send_field("interp_diag_reftemp",reftemp_file)