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

Timestamp:

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

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• libf/phylmd/phyredem.F90 (modified) (11 diffs)

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

@@ -19 +19 @@
                                 zval, rugoro, t_ancien, q_ancien,            &
                                 prw_ancien, prlw_ancien, prsw_ancien,        &
-                                ql_ancien, qs_ancien,  u_ancien,             &
+                                ql_ancien, qs_ancien, rneb_ancien, u_ancien, &
                                 v_ancien, clwcon, rnebcon, ratqs, pbl_tke,   &
                                 wake_delta_pbl_tke, zmax0, f0, sig1, w01,    &
@@ -35 +35 @@
   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
-  USE carbon_cycle_mod, ONLY : carbon_cycle_cpl, co2_send
+  USE infotrac_phy, ONLY: type_trac, types_trac, nqtot, tracers, nbtr
+  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
@@ -47 +47 @@
   include "dimsoil.h"
   include "clesphys.h"
-  include "thermcell.h"
+  include "alpale.h"
   include "compbl.h"
   !======================================================================
@@ -70 +70 @@
   CHARACTER (len=2) :: str2
   CHARACTER (len=256) :: nam, lnam
-  INTEGER           :: it, iiq, pass
+  INTEGER           :: it, iq, pass
 
   !======================================================================
@@ -108 +108 @@
 
   ! 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
@@ -140 +145 @@
 
     CALL put_field(pass,"FLIC", "fraction glace de terre", pctsrf(:, is_lic))
-
     ! 3. fraction ocean
 
@@ -240 +244 @@
     CALL put_field(pass,"QSANCIEN", "QSANCIEN", qs_ancien)
 
+    CALL put_field(pass,"RNEBANCIEN", "RNEBANCIEN", rneb_ancien)
+
     CALL put_field(pass,"PRWANCIEN", "PRWANCIEN", prw_ancien)
 
@@ -323 +329 @@
 
 
-    ! 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)                                                           ! jyg
-          CALL put_field(pass,"trs_"//tname(iiq), "", trs(:, it))
-       END DO
-    END IF
-
-    IF (type_trac == 'co2i' .OR. type_trac == 'inco') THEN
+    IF (ANY(types_trac == 'co2i') .OR. ANY(types_trac == 'inco')) THEN
        IF (carbon_cycle_cpl) THEN
           IF (.NOT. ALLOCATED(co2_send)) THEN
@@ -342 +338 @@
           CALL put_field(pass,"co2_send", "co2_ppm for coupling", co2_send)
        END IF
+
+    ! trs from traclmdz_mod
+    ELSE IF (type_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
 
@@ -387 +393 @@
     IF (pass==1) CALL enddef_restartphy
     IF (pass==2) CALL close_restartphy
- ENDDO
+  ENDDO ! DO pass=1,2   ! pass=1 netcdf definition ; pass=2 netcdf write
   
   !$OMP BARRIER
@@ -398 +404 @@
 
   IMPLICIT NONE
-  INTEGER, INTENT(IN)            :: pass
+  INTEGER, INTENT(IN)           :: pass
   CHARACTER(LEN=*),  INTENT(IN) :: nam, lnam
   REAL,              INTENT(IN) :: field(:,:)