Changeset 4800 for LMDZ6/branches/SETHET_DECOUPLE/libf

Timestamp:

Feb 2, 2024, 5:11:05 PM (8 months ago)

Author:

nfevrier

Message:

First save of N. Février's modifications

Location:

LMDZ6/branches/SETHET_DECOUPLE/libf

Files:

• dyn3dmem/dynredem_loc.F90 (modified) (2 diffs)
• phylmd/conf_phys_m.F90 (modified) (1 diff)
• phylmd/phys_output_mod.F90 (modified) (2 diffs)
• phylmd/phys_output_write_mod.F90 (modified) (4 diffs)
• phylmd/radlwsw_m.F90 (modified) (1 diff)

LMDZ6/branches/SETHET_DECOUPLE/libf/dyn3dmem/dynredem_loc.F90

@@ -11 +11 @@
   USE infotrac
   USE netcdf, ONLY: NF90_CREATE, NF90_DEF_DIM, NF90_INQ_VARID, NF90_GLOBAL,    &
-                    NF90_CLOSE,  NF90_PUT_ATT, NF90_UNLIMITED, NF90_CLOBBER
+                    NF90_CLOSE,  NF90_PUT_ATT, NF90_UNLIMITED, NF90_CLOBBER, &
+                    NF90_64BIT_OFFSET
   USE dynredem_mod, ONLY: cre_var, put_var, err, modname, fil
   USE comvert_mod, ONLY: ap,bp,aps,bps,presnivs,pseudoalt,pa,preff, &
@@ -110 +111 @@
 
 !--- File creation
-  CALL err(NF90_CREATE(fichnom,NF90_CLOBBER,nid))
+  CALL err(NF90_CREATE(fichnom,IOR(NF90_CLOBBER,NF90_64BIT_OFFSET),nid))
 
 !--- Some global attributes

LMDZ6/branches/SETHET_DECOUPLE/libf/phylmd/conf_phys_m.F90

@@ -2315 +2315 @@
     flag_aerosol=flag_aerosol_omp
     flag_aerosol_strat=flag_aerosol_strat_omp
-    flag_aer_feedback=flag_aer_feedback_omp
+    !flag_aer_feedback=flag_aer_feedback_omp
+    flag_aer_feedback=.FALSE. !Nicolas Février
     flag_bc_internal_mixture=flag_bc_internal_mixture_omp
     aer_type = aer_type_omp

LMDZ6/branches/SETHET_DECOUPLE/libf/phylmd/phys_output_mod.F90

@@ -501 +501 @@
                            tname(iiq),'Tracer '//ttext(iiq), "-",  &
                            (/ '', '', '', '', '', '', '', '', '', '' /))
-            o_dtr_vdf(iq-nqo) = ctrl_out((/ 4, 7, 7, 7, 10, 10, 11, 11, 11, 11 /), &
+            o_dtr_vdf(iq-nqo) = ctrl_out((/ 5, 5, 5, 5, 10, 10, 11, 11, 11, 11 /), &
                               'd'//trim(tname(iq))//'_vdf',  &
                               'Tendance tracer '//ttext(iiq), "-" , &
@@ -566 +566 @@
                                  (/ '', '', '', '', '', '', '', '', '', '' /))
 
-            o_dtr_dry(iq-nqo) = ctrl_out((/ 7, 7, 7, 7, 10, 10, 11, 11, 11, 11 /), &
+            o_dtr_dry(iq-nqo) = ctrl_out((/ 5, 5, 5, 5, 10, 10, 11, 11, 11, 11 /), &
                               'cum'//'d'//trim(tname(iq))//'_dry', &
                               'tracer tendency dry deposition'//ttext(iiq), "-", &

LMDZ6/branches/SETHET_DECOUPLE/libf/phylmd/phys_output_write_mod.F90

@@ -413 +413 @@
     ! Local
     INTEGER :: itau_w
-    INTEGER :: i, iinit, iinitend=1, iff, iq, iiq, nsrf, k, ll, naero
+    INTEGER :: i, iinit, iinitend=1, iff, iq, iiq, nsrf, k, ll, naero, j
     REAL, DIMENSION (klon) :: zx_tmp_fi2d, zpt_conv2d, wind100m
     REAL, DIMENSION (klon,klev) :: zx_tmp_fi3d, zpt_conv
@@ -446 +446 @@
     REAL,DIMENSION(klon,klev) :: z, dz
     REAL,DIMENSION(klon)      :: zrho, zt
+
+    INTEGER,DIMENSION(2) :: index_bc=[106,116]
 
     ! On calcul le nouveau tau:
@@ -2368 +2370 @@
              CALL histwrite_phy(o_dtr_uscav(iq-nqo),d_tr_uscav(:,:,iq-nqo))
             !--2D fields
-             CALL histwrite_phy(o_dtr_dry(iq-nqo), flux_tr_dry(:,iq-nqo))
+             !CALL histwrite_phy(o_dtr_dry(iq-nqo), flux_tr_dry(:,iq-nqo))
              zx_tmp_fi2d=0.
              IF (vars_defined) THEN
@@ -2378 +2380 @@
            ENDDO !--iq
          ENDIF   !--type_trac
+
+         ! Pour bilan
+         DO j=1,size(index_bc)
+             iq=index_bc(j)
+            ! WRITE(lunout,*) "WRITE_TEST_1"," / iq=",iq
+             CALL histwrite_phy(o_dtr_vdf(iq-nqo),d_tr_cl(:,:,iq-nqo))
+             !WRITE(lunout,*) "WRITE_TEST_2"
+         END DO
+         
 !
          IF (type_trac == 'co2i') THEN

LMDZ6/branches/SETHET_DECOUPLE/libf/phylmd/radlwsw_m.F90

@@ -873 +873 @@
          ZTOPLWAIAERO,ZSOLLWAIAERO, &
          ZLWADAERO, & !--NL
-         ok_ade, ok_aie, ok_volcan, flag_aerosol,flag_aerosol_strat, flag_aer_feedback) ! flags aerosols
+         !ok_ade, ok_aie, ok_volcan, flag_aerosol,flag_aerosol_strat, flag_aer_feedback) ! flags aerosols
+         ok_ade, ok_aie, ok_volcan, flag_aerosol,flag_aerosol_strat, .FALSE.) !Nicolas Février
             
 !        print *,'RADLWSW: apres RECMWF'