Changeset 3465 for LMDZ6/trunk/libf/phylmd/physiq_mod.F90

Timestamp:

Mar 14, 2019, 10:34:31 AM (5 years ago)

Author:

Laurent Fairhead

Message:

Further modifications for DYNAMICO/LMDZ convergence. These are based
on Yann's LMDZ6_V2 sources. Compiles on irene and converges with revision 3459
in a bucket configuration
YM/LF

File:

• LMDZ6/trunk/libf/phylmd/physiq_mod.F90 (modified) (7 diffs)

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -243 +243 @@
 #endif
     USE indice_sol_mod
-    USE phytrac_mod, ONLY : phytrac
+    USE phytrac_mod, ONLY : phytrac_init, phytrac
     USE carbon_cycle_mod, ONLY : infocfields_init, RCO2_glo, carbon_cycle_rad
 
@@ -1488 +1488 @@
        ENDIF
        ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-       IF (grid_type/=unstructured) CALL init_iophy_new(latitude_deg,longitude_deg)
+       CALL init_iophy_new(latitude_deg,longitude_deg)
 
           !===================================================================
@@ -1581 +1581 @@
        CALL init_readaerosolstrato(flag_aerosol_strat)  !! initialise aero strato from file for XIOS interpolation (unstructured_grid)
 
-       IF(read_climoz>=1 .AND. create_etat0_limit .AND. grid_type==unstructured) CALL regr_horiz_time_climoz(read_climoz,ok_daily_climoz)
-       CALL create_etat0_limit_unstruct
-       CALL phyetat0 ("startphy.nc",clesphy0,tabcntr0)
-       IF (grid_type==unstructured) CALL init_iophy_new(latitude_deg,longitude_deg)
-
-!jyg<
-       IF (klon_glo==1) THEN
-          IF (iflag_pbl > 1) THEN          
-              pbl_tke(:,:,is_ave) = 0.
-              DO nsrf=1,nbsrf
-                DO k = 1,klev+1
-                     pbl_tke(:,k,is_ave) = pbl_tke(:,k,is_ave) &
-                         +pctsrf(:,nsrf)*pbl_tke(:,k,nsrf)
-                ENDDO
-              ENDDO
-          ELSE   ! (iflag_pbl > 1)
-              pbl_tke(:,:,:) = 0.
-          ENDIF  ! (iflag_pbl > 1)
-        ELSE
-          pbl_tke(:,:,is_ave) = 0. !ym missing init : maybe must be initialized in the same way that for klon_glo==1 ??
-!>jyg
-       ENDIF
 #ifdef CPP_COSP
-
       IF (ok_cosp) THEN
-         CALL phys_cosp(itap,phys_tstep,freq_cosp, &
+        CALL phys_cosp(itap,phys_tstep,freq_cosp, &
                ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP, &
                ecrit_mth,ecrit_day,ecrit_hf, ok_all_xml, missing_val, &
@@ -1620 +1597 @@
       ENDIF
 #endif
-
-       !
-       ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+       !
+       !
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
        ! Nouvelle initialisation pour le rayonnement RRTM
-       ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+       !
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
        CALL iniradia(klon,klev,paprs(1,1:klev+1))
-
+       ! Initialisation des champs dans phytrac qui sont utilisés par phys_output_write
+       IF (iflag_phytrac == 1 ) THEN
+          CALL phytrac_init()
+        ENDIF
+
+       CALL phys_output_write(itap, pdtphys, paprs, pphis,                    &
+                              pplay, lmax_th, aerosol_couple,                 &
+                              ok_ade, ok_aie, ivap, iliq, isol, new_aod, ok_sync,&
+                              ptconv, read_climoz, clevSTD,                   &
+                              ptconvth, d_u, d_t, qx, d_qx, zmasse,           &
+                              flag_aerosol, flag_aerosol_strat, ok_cdnc)
 
 #ifdef CPP_XIOS
        IF (is_omp_master) CALL xios_update_calendar(1)
 #endif
-
+       IF(read_climoz>=1 .AND. create_etat0_limit) CALL regr_horiz_time_climoz(read_climoz,ok_daily_climoz)
+       CALL create_etat0_limit_unstruct
+       CALL phyetat0 ("startphy.nc",clesphy0,tabcntr0)
+
+!jyg<
+       IF (klon_glo==1) THEN
+          pbl_tke(:,:,is_ave) = 0.
+          DO nsrf=1,nbsrf
+            DO k = 1,klev+1
+                 pbl_tke(:,k,is_ave) = pbl_tke(:,k,is_ave) &
+                     +pctsrf(:,nsrf)*pbl_tke(:,k,nsrf)
+            ENDDO
+          ENDDO
+        ELSE
+          pbl_tke(:,:,is_ave) = 0. !ym missing init : maybe must be initialized in the same way that for klon_glo==1 ??
+!>jyg
+       ENDIF
        !IM begin
        print*,'physiq: clwcon rnebcon ratqs',clwcon(1,1),rnebcon(1,1) &
@@ -1778 +1782 @@
        tave = 'ave(X)'
        !IM cf. AM 081204 BEG
+       write(lunout,*)'AVANT HIST IFLAG_CON=',iflag_con
        !IM cf. AM 081204 END
        !
@@ -1783 +1788 @@
        !   Initialisation des sorties
        !=============================================================
-
-       CALL phys_output_write(itap, pdtphys, paprs, pphis,                    &
-                              pplay, lmax_th, aerosol_couple,                 &
-                              ok_ade, ok_aie, ivap, iliq, isol, new_aod, ok_sync,&
-                              ptconv, read_climoz, clevSTD,                   &
-                              ptconvth, d_u, d_t, qx, d_qx, zmasse,           &
-                              flag_aerosol, flag_aerosol_strat, ok_cdnc)
 
 #ifdef CPP_XIOS
@@ -1874 +1872 @@
 #endif
        ENDIF
+
        !$omp single
        IF (read_climoz >= 1) CALL open_climoz(ncid_climoz, press_cen_climoz,   &