Changeset 1052 for codes/icosagcm/devel/src/diagnostics

Timestamp:

09/23/20 16:00:58 (4 years ago)

Author:

dubos

Message:

devel : diagnose divergence and vorticity

Location:

codes/icosagcm/devel/src/diagnostics

Files:

• check_conserve.f90 (modified) (3 diffs)
• compute_diagnostics.f90 (modified) (2 diffs)
• compute_divergence.F90 (added)
• compute_vorticity.F90 (added)
• observable.f90 (modified) (3 diffs)

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

@@ -52 +52 @@
 
   SUBROUTINE check_conserve(f_ps,f_dps,f_ue,f_theta_rhodz,f_phis,it) 
-  USE vorticity_mod
+  USE compute_vorticity_mod
   USE caldyn_gcm_mod
   USE exner_mod 
@@ -153 +153 @@
 
   SUBROUTINE check_conserve_detailed(it,tag, f_ps,f_dps,f_ue,f_theta_rhodz,f_phis) 
-    USE vorticity_mod
     USE caldyn_gcm_mod
     USE exner_mod 
-!    USE mpipara, ONLY : is_mpi_root, comm_icosa
     USE omp_para, ONLY : is_master
     INTEGER, INTENT(IN) :: tag
@@ -268 +266 @@
   SUBROUTINE check_energy(f_ue,f_theta_rhodz,f_phis, etot, &
                       stot, AAM_mass_tot, AAM_vel_tot, AAM_velp_tot, AAM_velm_tot, rmsvtot)  
-  USE vorticity_mod
     TYPE(t_field), POINTER :: f_ue(:)
     TYPE(t_field), POINTER :: f_theta_rhodz(:)

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

@@ -27 +27 @@
     END SUBROUTINE comp_temperature
 
+    SUBROUTINE comp_vorticity(ue, vort)
+      IMPORT
+      REAL(rstd),INTENT(IN)  :: ue(:,:)
+      REAL(rstd),INTENT(OUT) :: vort(:,:)
+    END SUBROUTINE comp_vorticity
+
+    SUBROUTINE comp_divergence(ue, div)
+      IMPORT
+      REAL(rstd),INTENT(IN)  :: ue(:,:)
+      REAL(rstd),INTENT(OUT) :: div(:,:)
+    END SUBROUTINE comp_divergence
+
     SUBROUTINE comp_hydro_press(rhodz, theta_rhodz, ps, p)
       IMPORT
@@ -48 +60 @@
   PROCEDURE(comp_pression),    POINTER, SAVE :: compute_pression => NULL(), compute_pression_mid => NULL()
   PROCEDURE(comp_temperature), POINTER, SAVE :: compute_temperature => NULL()
+  PROCEDURE(comp_vorticity),   POINTER, SAVE :: compute_vorticity => NULL()
+  PROCEDURE(comp_divergence),  POINTER, SAVE :: compute_divergence => NULL()
   PROCEDURE(comp_hydro_press), POINTER, SAVE :: compute_hydrostatic_pressure => NULL()
   PROCEDURE(comp_vert_interp), POINTER, SAVE :: compute_vertical_interp => NULL()
 
-  PUBLIC :: compute_rhodz, compute_pression, compute_pression_mid, compute_temperature, compute_hydrostatic_pressure, &
-       compute_vertical_interp
+  PUBLIC :: compute_rhodz, compute_pression, compute_pression_mid, compute_temperature, &
+       compute_vorticity, compute_divergence, compute_hydrostatic_pressure, compute_vertical_interp
 
 END MODULE compute_diagnostics_mod

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

@@ -46 +46 @@
     USE compute_temperature_mod
     USE compute_velocity_mod
+    USE compute_vorticity_mod
+    USE compute_divergence_mod
     USE vertical_interp_mod
     USE theta2theta_rhodz_mod
@@ -109 +111 @@
 
        CALL output_field("temp_init",f_buf_i)
+       CALL output_field("vort_init",f_buf_v)
     ELSE
        CALL output_field("p",f_pmid)
@@ -123 +126 @@
        CALL vertical_interp(f_pmid,f_buf_i,f_buf_s,preff)
        CALL output_field("SST",f_buf_s)       
+    END IF
+
+    CALL vorticity(f_u, f_buf_v)
+    CALL divergence(f_u, f_buf_i)
+    IF(init) THEN
+       CALL output_field("vort_init",f_buf_v)
+       CALL output_field("div_init",f_buf_i)
+    ELSE
+       CALL output_field("vort",f_buf_v)
+       CALL output_field("div",f_buf_i)
     END IF