Changeset 1052

Timestamp:

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

Author:

dubos

Message:

devel : diagnose divergence and vorticity

Location:

codes/icosagcm/devel

Files:

• arch/arch-X64_IRENE.env (modified) (1 diff)
• src/base/init_grid_param.f90 (modified) (4 diffs)
• src/base/init_grid_param.j90 (modified) (2 diffs)
• src/diagnostics/check_conserve.f90 (modified) (3 diffs)
• src/diagnostics/compute_diagnostics.f90 (modified) (2 diffs)
• src/diagnostics/compute_divergence.F90 (added)
• src/diagnostics/compute_vorticity.F90 (added)
• src/diagnostics/observable.f90 (modified) (3 diffs)
• src/kernels_hex/compute_divergence.k90 (added)
• src/kernels_hex/compute_vorticity.k90 (added)
• src/kernels_hex_master/compute_divergence.k90 (added)
• src/kernels_hex_master/compute_vorticity.k90 (added)
• src/kernels_unst/compute_divergence.k90 (added)
• src/kernels_unst/compute_vorticity.k90 (added)
• src/unstructured/unstructured.h90 (modified) (1 diff)
• xml/field_def_dynamico.xml (modified) (3 diffs)
• xml/file_def_dynamico_native.xml (modified) (1 diff)

codes/icosagcm/devel/arch/arch-X64_IRENE.env

@@ -1 @@
-# module c++/gnu is needed to link with XIOS
-# module feature/openmpi/mpi_compiler/intel is made necessary by c++/gnu
-
-module purge
-module load feature/openmpi/mpi_compiler/intel
-module load c++/gnu/7.3.0
-module load intel/17.0.6.256
-module load mpi/openmpi/2.0.4
+module unload netcdf-c netcdf-fortran hdf5 flavor perl hdf5 boost blitz mpi gnu
+#module purge
 module load flavor/hdf5/parallel
 module load netcdf-fortran/4.4.4
-module load mkl/17.0.6.256
 module load hdf5/1.8.20
+
+# module gnu is needed to link with XIOS
+# module feature/openmpi/mpi_compiler/intel is made necessary by gnu
+module load gnu
+module load feature/bridge/heterogenous_mpmd
+
 module load parmetis/4.0.3

codes/icosagcm/devel/src/base/init_grid_param.f90

@@ -55 +55 @@
     USE compute_pression_mod
     USE compute_temperature_mod
+    USE compute_vorticity_mod
+    USE compute_divergence_mod
     USE vertical_interp_mod
     
@@ -68 +70 @@
     compute_pression_mid => compute_pression_mid_hex
     compute_temperature => compute_temperature_hex
+    compute_vorticity => compute_vorticity_hex
+    compute_divergence => compute_divergence_hex
     compute_hydrostatic_pressure => compute_hydrostatic_pressure_hex
     compute_vertical_interp => compute_vertical_interp_hex
@@ -83 +87 @@
     USE compute_pression_mod
     USE compute_temperature_mod
+    USE compute_vorticity_mod
+    USE compute_divergence_mod
     USE vertical_interp_mod
     
@@ -96 +102 @@
     compute_pression_mid => compute_pression_mid_unst
     compute_temperature => compute_temperature_unst
+    compute_vorticity => compute_vorticity_unst
+    compute_divergence => compute_divergence_unst
     compute_hydrostatic_pressure => compute_hydrostatic_pressure_unst
     compute_vertical_interp => compute_vertical_interp_unst

codes/icosagcm/devel/src/base/init_grid_param.j90

@@ -50 +50 @@
   END SUBROUTINE  init_grid_param
 
-{%- set diags=('rhodz','pression','pression_mid','temperature','hydrostatic_pressure','vertical_interp',
+{%- set diags=('rhodz','pression','pression_mid','temperature','vorticity','divergence', 'hydrostatic_pressure','vertical_interp', 
 'pvort_only','theta','geopot','caldyn_fast','caldyn_slow_hydro','caldyn_coriolis') %}
 {% for grid in 'hex','unst' %}
@@ -58 +58 @@
     USE compute_pression_mod
     USE compute_temperature_mod
+    USE compute_vorticity_mod
+    USE compute_divergence_mod
     USE vertical_interp_mod
     

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
     

codes/icosagcm/devel/src/unstructured/unstructured.h90

@@ -37 +37 @@
 #define SIGNS sign1,sign2,sign3,sign4,sign5,sign6
 #define EDGE_ENDS ij_up1,ij_up2,ij_up3,ij_up4,ij_up5,ij_up6,ij_down1,ij_down2,ij_down3,ij_down4,ij_down5,ij_down6
-#define LENGTHS le_de1,le_de2,le_de3,le_de4,le_de5,le_de6
+#define LENGTHS1 le_de1,le_de2,le_de3,le_de4,le_de5,le_de6
+#define LENGTHS2 de1,de2,de3,de4,de5,de6
+#define LENGTHS3 le1,le2,le3,le4,le5,le6
 #define DECLARE_INDICES INTEGER INDICES1,INDICES2
-#define DECLARE_EDGES NUM SIGNS,LENGTHS ; INTEGER EDGES, EDGE_ENDS
+#define DECLARE_EDGES NUM SIGNS,LENGTHS1,LENGTHS2,LENGTHS3 ; INTEGER EDGES, EDGE_ENDS
 #define DECLARE_VERTICES INTEGER VERTICES
 

codes/icosagcm/devel/xml/field_def_dynamico.xml

@@ -28 +28 @@
       <field_group axis_ref="lev"> 
         <field id="mass" />
+        <field id="div" />
         <field id="p" />
         <field id="dmass"/>
@@ -82 +83 @@
         
         <field id="mass_init" />
+        <field id="div_init" />
         <field id="p_init" />
         <field id="theta_init" />
@@ -123 +125 @@
     <field_group domain_ref="v" axis_ref="lev">
       <field id="vort" />
+      <field id="vort_init" />
       <field id="pv" />
     </field_group>

codes/icosagcm/devel/xml/file_def_dynamico_native.xml

@@ -27 +27 @@
       <field field_ref="p"  name="P"        standard_name="air_pressure" long_name="Pressure"     unit="Pa"/>
       <field field_ref="temp"  name="T"        standard_name="air_temperature" long_name="Temperature"     unit="K"/>
+      <field field_ref="vort" />
+      <field field_ref="div" />
 <!--
       <field field_ref="q1"  name="Q"        standard_name="specific_humidity"  long_name="Specific humidity"          unit="kg/kg"/>