Changeset 3391 for LMDZ6/trunk/libf/phylmd/surf_land_orchidee_mod.F90

Timestamp:

Sep 16, 2018, 5:52:25 PM (6 years ago)

Author:

oboucher

Message:

Fields can now be passed to ORCHIDEE through surf_land_orchidee.
Fields are compressed in pbl_surface_mod and uncompressed in surf_land_orchidee.
Cosmetic changes, including in surf_land_mod.

File:

• LMDZ6/trunk/libf/phylmd/surf_land_orchidee_mod.F90 (modified) (15 diffs)

LMDZ6/trunk/libf/phylmd/surf_land_orchidee_mod.F90

@@ -26 +26 @@
   USE mod_grid_phy_lmdz
   USE mod_phys_lmdz_para, mpi_root_rank=>mpi_master
+  USE carbon_cycle_mod, ONLY : nbcf_in_orc, nbcf_out, fields_in, yfields_in, yfields_out, cfname_in, cfname_out
 
   IMPLICIT NONE
@@ -48 +49 @@
        veget, lai, height )
 
-
     USE mod_surf_para
     USE mod_synchro_omp
-    USE carbon_cycle_mod, ONLY : carbon_cycle_cpl
+    USE carbon_cycle_mod
     USE indice_sol_mod
     USE print_control_mod, ONLY: lunout
@@ -96 +96 @@
 !   ps           pression au sol
 !   radsol       rayonnement net aus sol (LW + SW)
-!   
 !
 ! output:
@@ -113 +112 @@
     INCLUDE "YOMCST.h"
     INCLUDE "dimpft.h"
-
-
-  
 !
 ! Parametres d'entree
@@ -149 +145 @@
     REAL, DIMENSION(klon,nvm_lmdz), INTENT(OUT) :: height
 
-
 ! Local
 !****************************************************************************************
-    INTEGER                                   :: ij, jj, igrid, ireal, index
+    INTEGER                                   :: ij, jj, igrid, ireal, index, nb
     INTEGER                                   :: error
     REAL, DIMENSION(klon)                     :: swdown_vrai
@@ -365 +360 @@
 ! carbon_cycle_cpl not possible with this interface and version of ORHCHIDEE
 !
-       IF (carbon_cycle_cpl) THEN
-          abort_message='carbon_cycle_cpl not yet possible with this interface of ORCHIDEE'
-          CALL abort_physic(modname,abort_message,1)
-       END IF
+! >> PC
+!       IF (carbon_cycle_cpl) THEN
+!          abort_message='carbon_cycle_cpl not yet possible with this interface of ORCHIDEE'
+!          CALL abort_physic(modname,abort_message,1)
+!       END IF
+! << PC
        
     ENDIF                          ! (fin debut) 
  
-
 ! 
 ! Appel a la routine sols continentaux
@@ -413 +409 @@
        IF (knon > 0) THEN
 
+         print *,'OB before intersurf=', SIZE(cfname_in), SIZE(cfname_out)
 #ifdef CPP_VEGET
          CALL intersurf_initialize_gathered (itime+itau_phy-1, nbp_lon, nbp_lat, knon, ktindex, dtime, &
@@ -421 +418 @@
                evap, fluxsens, fluxlat, coastalflow, riverflow, &
                tsol_rad, tsurf_new, qsurf, albedo_out, emis_new, z0m_new, &    
-               lon_scat, lat_scat, q2m, t2m, z0h_new, nvm_orch)
+! >> PC
+               !lon_scat, lat_scat, q2m, t2m, z0h_new, nvm_orch)
+               lon_scat, lat_scat, q2m, t2m, z0h_new, nvm_orch, &
+               field_out_names=cfname_out, field_in_names=cfname_in(1:nbcf_in_orc))
+! << PC
 #endif         
        ENDIF
@@ -430 +431 @@
 
     ENDIF
-
     
 !  swdown_vrai(1:knon) = swnet(1:knon)/(1. - albedo_keep(1:knon))
@@ -452 +452 @@
             lon_scat, lat_scat, q2m, t2m, z0h_new(1:knon),&
             veget(1:knon,:),lai(1:knon,:),height(1:knon,:),&
+            fields_out=yfields_out(1:knon,1:nbcf_out),  &
+            fields_in=yfields_in(1:knon,1:nbcf_in_orc), &
             coszang=yrmu0(1:knon))
 #endif       
@@ -480 +482 @@
     IF (debut) CALL Finalize_surf_para
 
+! >> PC
+! Decompressing variables into LMDz for the module carbon_cycle_mod
+! nbcf_in can be zero, in which case the loop does not operate
+! fields_in can then used elsewhere in the model
+     
+     fields_in(:,:)=0.0
+
+     DO nb=1, nbcf_in_orc
+       DO igrid = 1, knon
+        ireal = knindex(igrid)
+        fields_in(ireal,nb)=yfields_in(igrid,nb)
+       ENDDO
+       WRITE(*,*) 'surf_land_orchidee_mod --- yfields_in :',cfname_in(nb)
+     ENDDO
+! >> PC
     
   END SUBROUTINE surf_land_orchidee
@@ -541 +558 @@
 !****************************************************************************************
     
-    
     IF (is_omp_root) THEN          
       
@@ -566 +582 @@
       ENDDO
     ENDIF
-   
     
   END SUBROUTINE Get_orchidee_communicator
@@ -628 +643 @@
        off_ini(4,3) =  1          ; off_ini(5,3) = nbp_lon           ; off_ini(6,3) = nbp_lon - 1
        off_ini(7,3) = -1          ; off_ini(8,3) = - nbp_lon - 1
-!
 !
 ! Attention aux poles
@@ -645 +659 @@
          ENDDO
        ELSE
-       print*,'sonia : knon_glo,ij,jj', knon_glo, ij,jj
        
        DO igrid = 1, knon_glo