Changeset 4640

Timestamp:

Jul 24, 2023, 4:50:57 PM (10 months ago)

Author:

acozic

Message:

add a flag for the dms cycle between ocean and atmosphere
remove cpp key CPLOCNINCA activated by option cplocninca
remove compilation option cplocninca

Location:

LMDZ6/trunk/libf/phylmd

Files:

• chemistry_cycle_mod.F90 (added)
• conf_phys_m.F90 (modified) (6 diffs)
• cpl_mod.F90 (modified) (3 diffs)
• oasis.F90 (modified) (7 diffs)

LMDZ6/trunk/libf/phylmd/conf_phys_m.F90

@@ -29 +29 @@
     USE carbon_cycle_mod,  ONLY: read_fco2_ocean_cor,var_fco2_ocean_cor
     USE carbon_cycle_mod,  ONLY: read_fco2_land_cor,var_fco2_land_cor
+    USE chemistry_cycle_mod, ONLY: dms_cycle_cpl
     USE mod_grid_phy_lmdz, ONLY: klon_glo
     USE print_control_mod, ONLY: lunout
     use config_ocean_skin_m, only: config_ocean_skin
     USE phys_state_var_mod, ONLY: phys_tstep
+    USE infotrac_phy, ONLY: type_trac
 
     INCLUDE "conema3.h"
@@ -233 +235 @@
     LOGICAL, SAVE :: carbon_cycle_cpl_omp
     LOGICAL, SAVE :: carbon_cycle_rad_omp
+    LOGICAL, SAVE :: dms_cycle_cpl_omp
     INTEGER, SAVE :: level_coupling_esm_omp
     LOGICAL, SAVE :: read_fco2_ocean_cor_omp
@@ -2240 +2243 @@
     CALL getin('level_coupling_esm',level_coupling_esm_omp)
 
+
+    dms_cycle_cpl_omp=.FALSE.
+    CALL getin('dms_cycle_cpl',dms_cycle_cpl_omp)
+    !
+    !Config Key  = dms_cycle_cpl
+    !Config Desc = receive dms from pisces via oasis
+    !Config Def  = .FALSE.
+    !Config Help = can be activated only if lmdz use inca for the atmospheric chemistry 
+
+    
     !$OMP END MASTER
     !$OMP BARRIER
@@ -2514 +2527 @@
     read_fco2_land_cor = read_fco2_land_cor_omp
     var_fco2_land_cor = var_fco2_land_cor_omp
+    dms_cycle_cpl = dms_cycle_cpl_omp
 
     ! Test of coherence between type_ocean and version_ocean
@@ -2633 +2647 @@
     ENDIF
 
+
+    ! Test on chemistry cycle 
+    IF ((type_trac .ne. "inca" .AND. type_trac .ne. "inco") .AND. dms_cycle_cpl ) THEN 
+       CALL abort_physic('conf_phys', 'dms_cycle_cpl has to be TRUE only with INCA coupling model',1)
+    ENDIF
+    
     ! ORCHIDEE must be activated for ifl_pbltree=1
     IF (.NOT. ok_veget .AND. ifl_pbltree==1) THEN
@@ -2844 +2864 @@
     WRITE(lunout,*) ' read_fco2_land_cor = ', read_fco2_land_cor
     WRITE(lunout,*) ' var_fco2_land_cor = ', var_fco2_land_cor
+    WRITE(lunout,*) ' dms_cycle_cpl = ', dms_cycle_cpl
     WRITE(lunout,*) ' iflag_tsurf_inlandsis = ', iflag_tsurf_inlandsis
     WRITE(lunout,*) ' iflag_temp_inlandsis = ', iflag_temp_inlandsis

LMDZ6/trunk/libf/phylmd/cpl_mod.F90

@@ -377 +377 @@
             0,zjulian,dtime,nhoridcs,nidcs) 
 ! no vertical axis
-       DO jf=1,maxrecv
+       DO jf=1,maxrecv_phys
          IF (inforecv(i)%action) THEN
              CALL histdef(nidcs,inforecv(i)%name ,inforecv(i)%name , &
@@ -433 +433 @@
     CHARACTER(len = 80)                     :: abort_message
     REAL, DIMENSION(klon)                   :: read_sic1D
-    REAL, DIMENSION(nbp_lon,jj_nb,maxrecv)      :: tab_read_flds
+    REAL, DIMENSION(nbp_lon,jj_nb,maxrecv_phys)      :: tab_read_flds
     REAL, DIMENSION(klon,nbsrf)             :: pctsrf_old
     REAL, DIMENSION(klon_mpi)               :: rlon_mpi, rlat_mpi
@@ -462 +462 @@
           ndexcs(:) = 0
           itau_w = itau_phy + itime + start_time * day_step_phy
-          DO i = 1, maxrecv
+          DO i = 1, maxrecv_phys
             IF (inforecv(i)%action) THEN
                 CALL histwrite(nidcs,inforecv(i)%name,itau_w,tab_read_flds(:,:,i),nbp_lon*(nbp_lat),ndexcs)

LMDZ6/trunk/libf/phylmd/oasis.F90

@@ -24 +24 @@
   USE mod_prism_get_proto
   USE mod_prism_put_proto
-#endif
-#ifdef CPP_CPLOCNINCA
-  USE incaoasis, ONLY : inforcv
 #endif
 #endif
@@ -77 +74 @@
   INTEGER, PARAMETER :: idr_curenz = 7
   INTEGER, PARAMETER :: idr_oceco2 = 8
-
+  ! bulk salinity of the surface layer of the ocean, in ppt
   INTEGER, PARAMETER :: idr_sss = 9
-  ! bulk salinity of the surface layer of the ocean, in ppt
-
-  INTEGER, PARAMETER :: maxrecv    = 9  ! Maximum number of fields to receive
-  
-#ifdef CPP_CPLOCNINCA
-  INTEGER, PARAMETER :: idr_ocedms = 1
-  INTEGER, PARAMETER :: maxrcv = 1
-#endif
+  INTEGER, PARAMETER :: idr_ocedms = 10
+
+  INTEGER, PARAMETER :: maxrecv      = 10     ! Maximum number of fields to receive
+  INTEGER, PARAMETER :: maxrecv_phys = 9      ! Maximum number of fields to receive in physiq (without fields received in INCA model )
+                                              ! will be changed in next version - INCA fields will be received in LMDZ (like for ORCHIDEE fields)
+                                              ! and then send by routine in INCA model 
+  
 
   TYPE, PUBLIC ::   FLD_CPL            ! Type for coupling field information
@@ -118 +114 @@
     USE carbon_cycle_mod, ONLY : carbon_cycle_cpl
     USE wxios, ONLY : wxios_context_init 
+    USE chemistry_cycle_mod, ONLY : dms_cycle_cpl
     USE lmdz_xios  
     USE print_control_mod, ONLY: lunout
@@ -265 +262 @@
        inforecv(idr_oceco2)%action = .TRUE. ; inforecv(idr_oceco2)%name = 'SICO2FLX'
    ENDIF
-#ifdef CPP_CPLOCNINCA
-       inforcv(idr_ocedms)%action = .TRUE. ; inforcv(idr_ocedms)%name = 'SIDMSFLX'
-#endif
+   IF (dms_cycle_cpl) THEN 
+      inforecv(idr_ocedms)%action = .TRUE. ; inforecv(idr_ocedms)%name = 'SIDMSFLX'
+   ENDIF
+ 
 
 !************************************************************************************
@@ -353 +351 @@
     END DO
 
-! Now, if also coupling CPL with INCA, initialize here fields to be exchanged.
-#ifdef CPP_CPLOCNINCA
-    DO jf=1,maxrcv 
-       IF (inforcv(jf)%action) THEN
-          CALL prism_def_var_proto(inforcv(jf)%nid, inforcv(jf)%name, il_part_id, &
-               il_var_nodims, PRISM_In, il_var_actual_shape, il_var_type, &
-               ierror)
-          IF (ierror .NE. PRISM_Ok) THEN
-             WRITE(lunout,*) 'inicma : Problem with prism_def_var_proto for field : ',&
-                  inforcv(jf)%name
-             abort_message=' Problem in call to prism_def_var_proto for fields to receive'
-             CALL abort_physic(modname,abort_message,1)
-          ENDIF
-       ENDIF
-    END DO
+
+#ifdef INCA
+    IF (dms_cycle_cpl) THEN
+       CALL init_inca_oasis(inforecv(idr_ocedms))
+    ENDIF
 #endif
  
@@ -424 +412 @@
 ! Output arguments
 !************************************************************************************
-    REAL, DIMENSION(nbp_lon, jj_nb,maxrecv), INTENT(OUT) :: tab_get
+    REAL, DIMENSION(nbp_lon, jj_nb,maxrecv_phys), INTENT(OUT) :: tab_get
 
 ! Local variables
@@ -446 +434 @@
     ENDIF
     
-    DO i = 1, maxrecv
+    DO i = 1, maxrecv_phys
       IF (inforecv(i)%action .AND. inforecv(i)%nid .NE. -1) THEN
           field(:) = -99999.