Changeset 4368 for LMDZ6/branches/Ocean_skin/libf/phylmdiso/phyredem.F90

Timestamp:

Dec 6, 2022, 12:01:16 AM (22 months ago)

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• libf/phylmdiso/phyredem.F90 (modified) (17 diffs)

LMDZ6/branches/Ocean_skin/libf/phylmdiso/phyredem.F90

@@ -23 +23 @@
                                 wake_delta_pbl_tke, zmax0, f0, sig1, w01,    &
                                 wake_deltat, wake_deltaq, wake_s, wake_dens, &
+                                awake_dens, cv_gen,                          &
                                 wake_cstar,                                  &
                                 wake_pe, wake_fip, fm_therm, entr_therm,     &
@@ -38 +39 @@
   USE iostart, ONLY: open_restartphy, close_restartphy, enddef_restartphy, put_field, put_var
   USE traclmdz_mod, ONLY : traclmdz_to_restart
-  USE infotrac_phy, ONLY: type_trac, niadv, tname, nbtr, nqo,itr_indice
+  USE infotrac_phy, ONLY: types_trac, nqtot, tracers, nbtr, niso
 #ifdef ISO
-  USE infotrac_phy, ONLY: itr_indice,niso,ntraciso
 #ifdef ISOVERIF
   USE isotopes_verif_mod
 #endif
 #endif
-  USE carbon_cycle_mod, ONLY : carbon_cycle_cpl, co2_send
+  USE carbon_cycle_mod, ONLY : carbon_cycle_cpl, co2_send, carbon_cycle_rad, RCO2_glo
   USE indice_sol_mod, ONLY: nbsrf, is_oce, is_sic, is_ter, is_lic, epsfra
   USE surface_data, ONLY: type_ocean, version_ocean
@@ -56 +56 @@
   include "dimsoil.h"
   include "clesphys.h"
-  include "thermcell.h"
+  include "alpale.h"
   include "compbl.h"
   !======================================================================
@@ -74 +74 @@
   REAL Rland_ice(niso,klon)
 #endif
-  INTEGER iq ! C Risi
 
   INTEGER nid, nvarid, idim1, idim2, idim3
@@ -85 +84 @@
   CHARACTER (len=2) :: str2
   CHARACTER (len=256) :: nam, lnam
-  INTEGER           :: it, iiq, pass
+  INTEGER           :: it, iq, pass
 
   !======================================================================
@@ -131 +130 @@
 
   ! co2_ppm0 : initial value of atmospheric CO2
-  tab_cntrl(16) = co2_ppm0
+  ! tab_cntrl(16) = co2_ppm0
+
+  !  PC -- initial value of RCO2 for the radiation scheme
+  !  tab_cntrl(17) = co2_ppm * 1.0e-06 * RMCO2 / RMD
+  IF (carbon_cycle_rad) tab_cntrl(17) = RCO2_glo
+  !PRINT*, "PC : phyredem RCO2_glo =",RCO2_glo
 
   DO pass=1,2   ! pass=1 netcdf definition ; pass=2 netcdf write
@@ -185 +189 @@
     CALL put_field_srf1(pass,"TS","Temperature",ftsol(:,:))
 
-!!    CALL put_field_srf1(pass,"DELTA_TS","w-x surface temperature difference", delta_tsurf(:,:))
-    CALL put_field_srf1(pass,"DELTATS","w-x surface temperature difference", delta_tsurf(:,:))
-
-!    CALL put_field_srf1(pass,"BETA_S","Aridity factor", beta_aridity(:,:))
-    CALL put_field_srf1(pass,"BETAS","Aridity factor", beta_aridity(:,:))
+    IF (iflag_pbl>1 .AND. iflag_wake>=1  .AND. iflag_pbl_split >=1) then
+       CALL put_field_srf1(pass, "DELTATS", &
+                      "w-x surface temperature difference",  delta_tsurf(:,:))
+       CALL put_field_srf1(pass, "BETAS", "Aridity factor", beta_aridity(:,:))
+    end IF
 !    End surface variables
 
@@ -313 +317 @@
     CALL put_field(pass,"WAKE_DENS", "Wake num. /unit area", wake_dens)
 
+    CALL put_field(pass,"AWAKE_DENS", "Active Wake num. /unit area", awake_dens)
+
+    CALL put_field(pass,"CV_GEN", "CB birth rate", cv_gen)
+
     CALL put_field(pass,"WAKE_CSTAR", "WAKE_CSTAR", wake_cstar)
 
@@ -342 +350 @@
 
 
-    ! trs from traclmdz_mod
-    IF (type_trac == 'lmdz') THEN
-       CALL traclmdz_to_restart(trs)
-       DO it=1, nbtr
-!!        iiq=niadv(it+2)                                                           ! jyg
-          !iiq=niadv(it+nqo) ! C Risi: on efface pour remplacer:
-          iq=itr_indice(it)                                                           ! jyg
-          iiq=niadv(iq)                                                           ! jyg
-          CALL put_field(pass,"trs_"//tname(iiq), "", trs(:, it))
-       END DO
+    IF (ANY(types_trac == 'co2i') .OR. ANY(types_trac == 'inco')) THEN
        IF (carbon_cycle_cpl) THEN
           IF (.NOT. ALLOCATED(co2_send)) THEN
@@ -360 +359 @@
           CALL put_field(pass,"co2_send", "co2_ppm for coupling", co2_send)
        END IF
+
+    ! trs from traclmdz_mod
+    ELSE IF (ANY(types_trac == 'lmdz')) THEN
+       CALL traclmdz_to_restart(trs)
+       it = 0
+       DO iq = 1, nqtot
+          IF(.NOT.(tracers(iq)%isAdvected .AND. tracers(iq)%isInPhysics)) CYCLE
+          it = it+1
+          CALL put_field(pass,"trs_"//tracers(iq)%name, "", trs(:, it))
+       END DO
     END IF
 
@@ -408 +417 @@
   ENDDO ! DO pass=1,2   ! pass=1 netcdf definition ; pass=2 netcdf write
   
-
-  
   !$OMP BARRIER
 
@@ -419 +426 @@
 
   IMPLICIT NONE
-  INTEGER, INTENT(IN)            :: pass
+  INTEGER, INTENT(IN)           :: pass
   CHARACTER(LEN=*),  INTENT(IN) :: nam, lnam
   REAL,              INTENT(IN) :: field(:,:)
@@ -482 +489 @@
         xtrain_fall,xtsnow_fall, ql_ancien,xtl_ancien,qs_ancien,xts_ancien, &
         xtsol,fxtevap
-      USE infotrac_phy,ONLY: niso, ntraciso
+      USE infotrac_phy,ONLY: niso, ntiso
       !USE control_mod
       USE indice_sol_mod, ONLY: nbsrf
       USE iostart, ONLY: put_field
-      USE isotopes_mod, ONLY: striso,iso_eau
+      USE isotopes_mod, ONLY: isoName,iso_eau
 #ifdef ISOVERIF
       USE isotopes_verif_mod
@@ -501 +508 @@
 #include "dimsoil.h"
 #include "clesphys.h"
-#include "thermcell.h"
+#include "alpale.h"
 #include "compbl.h"      
       ! inputs
       !REAL xtsol(niso,klon)
       REAL xtsnow(niso,klon,nbsrf) 
-      !REAL xtevap(ntraciso,klon,nbsrf)     
+      !REAL xtevap(ntiso,klon,nbsrf)     
       REAL xtrun_off_lic_0(niso,klon)
       REAL Rland_ice(niso,klon)
@@ -521 +528 @@
       CHARACTER*7 str7
       CHARACTER*2 str2
-      CHARACTER*50 striso_sortie
+      CHARACTER*50 outiso
       integer lnblnk
 #ifdef ISOTRAC
@@ -563 +570 @@
 #endif
 
-   do ixt=1,ntraciso
-
-     if (ixt.le.niso) then
-        striso_sortie=striso(ixt)
-     else
-#ifdef ISOTRAC
-        iiso=index_iso(ixt)
-        izone=index_zone(ixt)       
-        striso_sortie=striso(iiso)//strtrac(izone)
-#else
-        write(*,*) 'phyredem 546: ixt,ntraciso=', ixt,ntraciso
-        stop
-#endif
-     endif !if (ixt.le.niso) then
-      write(*,*) 'phyredem 550: ixt,striso_sortie=',ixt,striso_sortie(1:lnblnk(striso_sortie))
+   do ixt=1,ntiso
+
+      outiso = TRIM(isoName(ixt))
+      i = INDEX(outiso, '_', .TRUE.)
+      outiso = outiso(1:i-1)//outiso(i+1:LEN_TRIM(outiso))
+      write(*,*) 'phyredem 550: ixt,outiso=',ixt,TRIM(outiso)
       
       iso_tmp_lonsrf(:,:)=fxtevap(ixt,:,:)
-      CALL put_field_srf1(pass,"XTEVAP"//striso_sortie(1:lnblnk(striso_sortie)), &
-     &           "Evaporation de surface",iso_tmp_lonsrf)
+      CALL put_field_srf1(pass, "XTEVAP"//TRIM(outiso), "Evaporation de surface",iso_tmp_lonsrf)
 
       iso_tmp_lonsrf(:,:)=xtsnow(ixt,:,:)
-      CALL put_field_srf1(pass,"XTSNOW"//striso_sortie(1:lnblnk(striso_sortie)), &
-     &           "NEIGE",iso_tmp_lonsrf)       
+      CALL put_field_srf1(pass, "XTSNOW"//TRIM(outiso), "NEIGE",       iso_tmp_lonsrf)       
 
       iso_tmp(:)=xtrain_fall(ixt,:)
-      CALL put_field(pass,"xtrain_f"//striso_sortie(1:lnblnk(striso_sortie)), &
-     &   "precipitation liquide",iso_tmp)
+      CALL put_field(pass,    "xtrain_f"//TRIM(outiso), "precipitation liquide",iso_tmp)
 
       iso_tmp(:)=xtsnow_fall(ixt,:)
-      CALL put_field(pass,"xtsnow_f"//striso_sortie(1:lnblnk(striso_sortie)), &
-     &    "precipitation solide",iso_tmp)
+      CALL put_field(pass,    "xtsnow_f"//TRIM(outiso), "precipitation solide",iso_tmp)
 
       iso_tmp_lonlev(:,:)=xt_ancien(ixt,:,:)
-      CALL put_field(pass,"XTANCIEN"//striso_sortie(1:lnblnk(striso_sortie)), &
-     &   "QANCIEN",iso_tmp_lonlev)
+      CALL put_field(pass,    "XTANCIEN"//TRIM(outiso), "QANCIEN",     iso_tmp_lonlev)
 
       iso_tmp_lonlev(:,:)=xtl_ancien(ixt,:,:)
-      CALL put_field(pass,"XTLANCIEN"//striso_sortie(1:lnblnk(striso_sortie)), &
-     &   "QLANCIEN",iso_tmp_lonlev)
+      CALL put_field(pass,   "XTLANCIEN"//TRIM(outiso), "QLANCIEN",    iso_tmp_lonlev)
 
       iso_tmp_lonlev(:,:)=xts_ancien(ixt,:,:)
-      CALL put_field(pass,"XTSANCIEN"//striso_sortie(1:lnblnk(striso_sortie)), &
-     &   "QSANCIEN",iso_tmp_lonlev)
+      CALL put_field(pass,   "XTSANCIEN"//TRIM(outiso), "QSANCIEN",    iso_tmp_lonlev)
 
       iso_tmp_lonlev(:,:)=wake_deltaxt(ixt,:,:)
-      CALL put_field(pass,"WAKE_DELTAXT"//striso_sortie(1:lnblnk(striso_sortie)), &
-     &   "WAKE_DELTAQ",iso_tmp_lonlev)
+      CALL put_field(pass,"WAKE_DELTAXT"//TRIM(outiso), "WAKE_DELTAQ", iso_tmp_lonlev)
 
       iso_tmp(:)=xtrun_off_lic_0(ixt,:)
-      CALL put_field(pass,"XTRUNOFFLIC0"//striso_sortie(1:lnblnk(striso_sortie)), &
-     &   "Runofflic0",iso_tmp)
+      CALL put_field(pass,"XTRUNOFFLIC0"//TRIM(outiso), "Runofflic0",  iso_tmp)
 
       iso_tmp_lonlev(:,:)=wake_deltaxt(ixt,:,:)
-      CALL put_field(pass,"WAKE_DELTAXT"//striso_sortie(1:lnblnk(striso_sortie)), &
-     &   "WAKE_DELTAXT",iso_tmp_lonlev)
+      CALL put_field(pass,"WAKE_DELTAXT"//TRIM(outiso), "WAKE_DELTAXT",iso_tmp_lonlev)
 
       ! variables seulement pour niso:
@@ -623 +611 @@
 
       iso_tmp(:)=xtsol(ixt,:)
-      CALL put_field(pass,"XTSOL"//striso_sortie(1:lnblnk(striso_sortie)), &
-     &   "Eau dans le sol (mm)",iso_tmp)
+      CALL put_field(pass,      "XTSOL"//TRIM(outiso), "Eau dans le sol (mm)",iso_tmp)
 
       iso_tmp(:)=Rland_ice(ixt,:)
-      CALL put_field(pass,"Rland_ice"//striso_sortie(1:lnblnk(striso_sortie)), &
-     &   "ratio land ice",iso_tmp)
+      CALL put_field(pass,  "Rland_ice"//TRIM(outiso), "ratio land ice",      iso_tmp)
 
       endif ! if (ixt.le.niso) then