Changeset 6172

Timestamp:

Apr 17, 2026, 1:59:33 PM (2 weeks ago)

Author:

Sebastien Nguyen

Message:

extend ICOSA_LMDZ modifications for mpi parallelism to phylmdiso

Location:

ICOSA_LMDZ/src/phylmdiso

Files:

• icolmdz_etat0.f90 (modified) (3 diffs)
• icolmdz_initialize.f90 (added)
• icolmdz_mpipara.F90 (added)
• icolmdz_param_gravity_wave.f90 (modified) (5 diffs)
• interface_icosa_lmdz.F90 (modified) (9 diffs)

ICOSA_LMDZ/src/phylmdiso/icolmdz_etat0.f90

@@ -31 +31 @@
             CALL xios_set_field_attr("temp_db", field_ref="temp_db_legacy")
             CALL xios_set_field_attr("q_db", field_ref="q_db_legacy")
+            IF (using_xios3) CALL xios_set_axis_attr("lev_ecdyn", axis_ref="u_db_legacy::")
          ELSE IF (TRIM(etat0_lmdz) == "ERA5_forcing") THEN
             CALL xios_set_filegroup_attr("read_files_ERA5_forcing", enabled=.TRUE.)
@@ -41 +42 @@
             CALL xios_set_field_attr("temp_db", field_ref="temp_db_forcing")
             CALL xios_set_field_attr("q_db", field_ref="q_db_forcing")
+            IF (using_xios3) CALL xios_set_axis_attr("lev_ecdyn", axis_ref="u_db_forcing::")
          ELSE
         PRINT*,"Bad selector for variable <etat0_lmdz> ",TRIM(etat0_lmdz), " option are <legacy> (default), <ERA5_forcing>"
@@ -64 +66 @@
       USE omp_para
       USE tracer_icosa_mod
+      USE earth_const, ONLY : g
       IMPLICIT NONE
       TYPE(t_field), POINTER :: f_ps(:)

ICOSA_LMDZ/src/phylmdiso/icolmdz_param_gravity_wave.f90

@@ -9 +9 @@
   
   SUBROUTINE init_param_gravity_wave
-  USE getin_mod
-  USE xios_mod
+  USE getin_mod  ! from dynamico
+  USE xios_mod   ! from dynamico 
   IMPLICIT NONE
     CHARACTER(LEN=255) :: param_gw_method
@@ -133 +133 @@
   !from icosa_lmdz
   USE distrib_icosa_lmdz_mod
+  USE math_const, ONLY: Pi
   IMPLICIT NONE
     INTEGER :: ibegin, jbegin, ni, nj, ni_glo,nj_glo
@@ -401 +402 @@
     INTEGER :: i,j,ij
 
-    DO j=jj_begin,jj_end
-      DO i=ii_begin,ii_end
+    DO j=jj_begin-1,jj_end+1
+      DO i=ii_begin-1,ii_end+1
         ij=(j-1)*iim+i
         zstd(ij) = ztz(ij) - zmea(ij)*zmea(ij)
-        IF (zstd(ij)<0) zstd(ij)=0
+        IF (zstd(ij)<=0) zstd(ij)=0
         zstd(ij)=SQRT(zstd(ij))
       ENDDO
@@ -415 +416 @@
   SUBROUTINE compute_sigma_gamma_theta(zxtzx, zytzy, zxtzy, zsig, zgam, zthe)
   USE icosa
+  USE math_const, ONLY : Pi
   IMPLICIT NONE
     REAL(rstd),INTENT(IN)   :: zxtzx(iim*jjm)
@@ -487 +489 @@
   USE xios_mod
   USE icosa
+  USE math_const, ONLY : Pi
   IMPLICIT NONE
     REAL, ALLOCATABLE :: mask(:,:) , zmea(:,:), zpic(:,:), zval(:,:), ztz(:,:), zstd(:,:)

ICOSA_LMDZ/src/phylmdiso/interface_icosa_lmdz.F90

@@ -43 +43 @@
 
   SUBROUTINE pre_initialize_physics
-  USE etat0_plugin_mod
-  USE icolmdz_etat0, ONLY:  init_etat0_lmdz => init_etat0, etat0_lmdz => etat0
+  USE etat0_plugin_mod, ONLY : init_etat0_plugin, etat0_plugin
+  USE icolmdz_etat0, ONLY : init_etat0, etat0
   USE icolmdz_param_gravity_wave, ONLY: init_param_gravity_wave
   USE isotopes_mod, ONLY : using_iso
   IMPLICIT NONE
   !$OMP PARALLEL
-    
-    init_etat0_plugin => init_etat0_lmdz
-    etat0_plugin => etat0_lmdz
-
+    init_etat0_plugin => init_etat0
+    etat0_plugin => etat0
     CALL init_param_gravity_wave
   !$OMP END PARALLEL
@@ -214 +212 @@
   USE mpipara
   USE disvert_mod
-  USE earth_const, ONLY: scale_height
+  USE earth_const !, ONLY: scale_height
   USE xios_mod
   USE time_mod , init_time_icosa=> init_time 
@@ -233 +231 @@
    USE readTracFiles_mod, ONLY: delPhase
 !  USE phyaqua_mod, ONLY : iniaqua 
-   
+  USE phystokenc_mod, ONLY : init_phystokenc       !  use to generate mass flow files for offline mode 
   
   IMPLICIT NONE
@@ -270 +268 @@
   INTEGER :: nq
   INTEGER                       :: nqo, nbtr, nbtr_inca
-  CHARACTER(len=256)              :: type_trac
+  CHARACTER(len=256)            :: type_trac
   INTEGER,ALLOCATABLE           :: conv_flg(:) ! conv_flg(it)=0 : convection desactivated for tracer number it 
   INTEGER,ALLOCATABLE           :: pbl_flg(:)  ! pbl_flg(it)=0  : boundary layer diffusion desactivaded for tracer number it 
@@ -288 +286 @@
    CHARACTER(LEN=3)      :: descrq(30)            !--- Advection scheme description tags
    logical, save :: first = .TRUE. 
+
+   LOGICAL :: offline
+   INTEGER :: offline_time
 
 
@@ -475 +476 @@
     CALL init_time_lmdz(annee_ref, day_ref, day_ini, start_time, int(ndays), physics_timestep)
 
+
+    ! Init Offline mode 
+    offline = .FALSE.
+    CALL getin('offline',offline)
+
+    !  Choosing storage frequencies for offline mass flow files  
+    !  offline_time=12    2h=1day/12
+    !  offline_time=8     3h=1day/8
+    offline_time = 8
+    CALL getin('offline_time',offline_time)
+
+    ! Copy over "offline" settings
+    ! Flag and number of time steps for flux calculation and output
+    CALL init_phystokenc(offline,int(day_length/(offline_time*physics_timestep)))
+
+    
 !  Additional initializations for aquaplanets
 !    CALL getin("iflag_phys",iflag_phys)
@@ -540 +557 @@
   USE checksum_mod
   USE vorticity_mod
+  USE earth_const
   USE tracer_icosa_mod
   USE compute_transport_mod
@@ -767 +785 @@
         ENDDO
       ENDIF
-
     ENDDO
 
@@ -1261 +1278 @@
       REAL(rstd),INTENT(INOUT)  :: q(klon, klev ,nqtot)
       REAL(rstd),INTENT(IN) :: q_ave(klev, nqtot)
-      REAL(rstd),INTENT(IN) :: p(klon, klev)
+      REAL(rstd),INTENT(IN) :: p(klon, klev+1)
       REAL(rstd) :: deltap(klon, klev)
       INTEGER :: iq, iq_g