Changeset 913 for codes/icosagcm/devel/src/diagnostics/check_conserve.f90

Timestamp:

06/17/19 17:38:58 (5 years ago)

Author:

dubos

Message:

devel : compute_pression for unstructured mesh

File:

• codes/icosagcm/devel/src/diagnostics/check_conserve.f90 (modified) (6 diffs)

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

@@ -1 +1 @@
 MODULE check_conserve_mod
   USE icosa 
+  USE compute_pression_mod, ONLY : pression
   IMPLICIT NONE 
-
   PRIVATE
   
@@ -52 +52 @@
 
   SUBROUTINE check_conserve(f_ps,f_dps,f_ue,f_theta_rhodz,f_phis,it) 
-  USE pression_mod
   USE vorticity_mod
   USE caldyn_gcm_mod
@@ -129 +128 @@
 
        IF(check_type == check_detailed) THEN
-          !ang_mass = AAM_mass-AAM_mass_old 
-          !WRITE(*,'(A,3E12.4)') 'AAM_mass sanity check', SUM(AAM_mass_source), ang_mass, SUM(AAM_mass_source)-ang_mass
-          !ang_vel = AAM_vel-AAM_vel_old 
-          !WRITE(*,'(A,3E12.4)') 'AAM_vel  sanity check', SUM(AAM_vel_source), ang_vel, SUM(AAM_vel_source)-ang_vel
           WRITE(*,'(A,6E14.6)') 'AAM_mass : time,old,new,dissip,dyn,phys', dt*it, AAM_mass_old, AAM_mass, &
                AAM_mass_source(AAM_dissip), AAM_mass_source(AAM_dyn), AAM_mass_source(AAM_phys)
@@ -158 +153 @@
 
   SUBROUTINE check_conserve_detailed(it,tag, f_ps,f_dps,f_ue,f_theta_rhodz,f_phis) 
-    USE pression_mod
     USE vorticity_mod
     USE caldyn_gcm_mod
@@ -196 +190 @@
           ! ang_XXX = value of total AAM_XXX now
           ! AAM_XXX_source(tag) = source of AAA_XXX due to tag=dissip,dyn,phys
-          !WRITE(*,'(A,3E12.2)') 'AAM_mass', tag, ang_mass, AAM_mass, ang_mass-AAM_mass ! FIXME
-          !WRITE(*,'(A,3E12.2)') 'AAM_vel ', tag, ang_vel, AAM_vel, ang_vel-AAM_vel ! FIXME
           AAM_mass_source(tag) = AAM_mass_source(tag) + ang_mass - AAM_mass
           AAM_vel_source(tag) = AAM_vel_source(tag) + ang_vel - AAM_vel
@@ -276 +268 @@
   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 pression_mod
   USE vorticity_mod
     TYPE(t_field), POINTER :: f_ue(:)