Changeset 868

Timestamp:

05/16/19 23:52:50 (5 years ago)

Author:

dubos

Message:

devel : temporary deactivation of some features for unstructured mesh driver

Location:

codes/icosagcm/devel/src

Files:

• diagnostics/check_conserve.f90 (modified) (2 diffs)
• diagnostics/observable.f90 (modified) (2 diffs)
• output/write_etat0.f90 (modified) (2 diffs)
• parallel/transfert_mpi.f90 (modified) (6 diffs)

codes/icosagcm/devel/src/diagnostics/check_conserve.f90

@@ -56 +56 @@
   USE caldyn_gcm_mod
   USE exner_mod 
-!  USE mpipara, ONLY : is_mpi_master, comm_icosa
   USE omp_para, ONLY : is_master
+  USE grid_param
     TYPE(t_field),POINTER :: f_ps(:)
     TYPE(t_field),POINTER :: f_dps(:)
@@ -69 +69 @@
     REAL(rstd) :: mtot, angtot, rmsdpdt
     REAL(rstd) :: etot, stot, ang_mass, ang_vel, ang_velp, ang_velm, rmsvtot, ztot
+
+    IF(grid_type == grid_unst) RETURN ! FIXME
 
     CALL transfert_request(f_ue,req_e1_vect)

codes/icosagcm/devel/src/diagnostics/observable.f90

@@ -48 +48 @@
     USE omega_mod
     USE kinetic_mod
-
+    USE grid_param
     LOGICAL, INTENT(IN) :: init
     INTEGER :: l
@@ -57 +57 @@
     TYPE(t_field),POINTER :: f_phis(:), f_ps(:), f_mass(:), f_geopot(:), f_theta_rhodz(:), f_u(:), f_W(:), f_q(:)
 !    IF (is_master) PRINT *,'CALL write_output_fields_basic'
+
+    IF(grid_type==grid_unst) RETURN ! FIXME
 
     CALL transfert_request(f_ps,req_i1)

codes/icosagcm/devel/src/output/write_etat0.f90

@@ -12 +12 @@
   USE xios_mod
   USE caldyn_vars_mod
+  USE grid_param
   IMPLICIT NONE
     INTEGER,INTENT(IN)    :: it
@@ -28 +29 @@
     INTEGER :: ind
     
-    
+    IF(grid_type == grid_unst) RETURN
+
     CALL allocate_field(f_ulon,field_t,type_real,llm,name='ulon')
     CALL allocate_field(f_ulat,field_t,type_real,llm,name='ulat')

codes/icosagcm/devel/src/parallel/transfert_mpi.f90

@@ -1142 +1142 @@
   USE omp_para
   USE trace
+  USE grid_param
   IMPLICIT NONE
     TYPE(t_field),POINTER :: field(:)
@@ -1166 +1167 @@
 
 !    CALL trace_start("send_message_mpi")
+
+    IF(grid_type == grid_unst) RETURN
 
     CALL enter_profile(id_mpi)
@@ -1552 +1555 @@
   USE omp_para
   USE trace
+  USE grid_param
   IMPLICIT NONE
     TYPE(t_message) :: message
@@ -1571 +1575 @@
     INTEGER :: dim3,dim4,d3,d4,lbegin,lend
     INTEGER :: offset
+
+    IF(grid_type == grid_unst) RETURN
 
     message%open=.FALSE.
@@ -1722 +1728 @@
   SUBROUTINE transfert_request_mpi(field,request)
   USE field_mod
+  USE grid_param
   IMPLICIT NONE
     TYPE(t_field),POINTER :: field(:)
@@ -1728 +1735 @@
     TYPE(t_message),SAVE :: message
    
-   
+    IF(grid_type == grid_unst) RETURN
+
     CALL init_message_mpi(field,request, message)
     CALL transfert_message_mpi(field,message)