Changeset 906 for codes/icosagcm/devel/src/diagnostics/observable.f90

Timestamp:

06/14/19 01:17:50 (5 years ago)

Author:

dubos

Message:

devel : compute_rhodz for unstructured mesh

File:

• codes/icosagcm/devel/src/diagnostics/observable.f90 (modified) (8 diffs)

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

@@ -58 +58 @@
 !    IF (is_master) PRINT *,'CALL write_output_fields_basic'
 
-    IF(grid_type==grid_unst) RETURN ! FIXME
-
     CALL transfert_request(f_ps,req_i1)
     
@@ -102 +100 @@
 
     IF(init) THEN
+       CALL output_field("p_init",f_pmid)
+       CALL output_field("ps_init",f_ps)
+       CALL output_field("mass_init",f_mass)
+       CALL output_field("geopot_init",f_geopot)
+       CALL output_field("q_init",f_q)
+
        CALL output_field("temp_init",f_buf_i)
     ELSE
+       CALL output_field("p",f_pmid)
+       CALL output_field("ps",f_ps)
+       CALL output_field("mass",f_mass)
+       CALL output_field("geopot",f_geopot)
+       CALL output_field("q",f_q)
+
        CALL output_field("temp",f_buf_i)
        CALL vertical_interp(f_pmid,f_buf_i,f_buf_s,85000.)
@@ -113 +123 @@
     END IF
     
+    IF(grid_type == grid_unst) RETURN
+
     CALL progonostic_vel_to_horiz(f_geopot, f_ps, f_mass, f_u, f_W, f_buf_uh, f_buf_i)
     CALL transfert_request(f_buf_uh,req_e1_vect) 
@@ -120 +132 @@
        CALL output_field("ulon_init",f_buf_ulon)
        CALL output_field("ulat_init",f_buf_ulat)
-       CALL output_field("p_init",f_pmid)
-       CALL output_field("ps_init",f_ps)
-       CALL output_field("mass_init",f_mass)
-       CALL output_field("geopot_init",f_geopot)
-       CALL output_field("q_init",f_q)
        IF(is_master) PRINT *, 'Done writing initial condition ...'
     ELSE
@@ -130 +137 @@
        CALL output_field("ulon",f_buf_ulon)
        CALL output_field("ulat",f_buf_ulat)
-       CALL output_field("p",f_pmid)
-       CALL output_field("ps",f_ps)
-       CALL output_field("mass",f_mass)
-       CALL output_field("geopot",f_geopot)
-       CALL output_field("q",f_q)
 
        !       CALL output_field("exner",f_pk)
@@ -211 +213 @@
 
   SUBROUTINE progonostic_vel_to_horiz(f_geopot, f_ps, f_rhodz, f_u, f_W, f_uh, f_uz)
-    USE disvert_mod
+    USE disvert_mod, ONLY : caldyn_eta, eta_mass
+    USE compute_diagnostics_mod, ONLY : compute_rhodz
     TYPE(t_field), POINTER :: f_geopot(:), f_ps(:), f_rhodz(:), &
          f_u(:), f_W(:), f_uz(:), &  ! IN
@@ -294 +297 @@
     USE pression_mod
     IMPLICIT NONE
-    TYPE(t_field), POINTER :: f_pmid(:)           ! IN
+    TYPE(t_field), POINTER :: f_pmid(:)         ! IN
     TYPE(t_field), POINTER :: f_q(:)            ! IN
     TYPE(t_field), POINTER :: f_temp(:)         ! INOUT
@@ -329 +332 @@
           p_ik = pmid(ij,l)
           theta_ik = temp(ij,l)
-          qv = q(ij,l,1) ! water vaper mixing ratio = mv/md
+          qv = q(ij,l,1) ! water vapor mixing ratio = mv/md
           SELECT CASE(caldyn_thermo)
           CASE(thermo_theta)