Changeset 880 for codes/icosagcm/devel/src/sphere/compute_geometry.f90

Timestamp:

06/04/19 18:30:08 (5 years ago)

Author:

dubos

Message:

devel : store cell bounds once, use them for XIOS later

File:

• codes/icosagcm/devel/src/sphere/compute_geometry.f90 (modified) (11 diffs)

codes/icosagcm/devel/src/sphere/compute_geometry.f90

@@ -1 +1 @@
 MODULE compute_geometry_mod
   USE geometry
+  USE dimensions
+
+  USE domain_mod, ONLY : t_domain, t_cellset, &
+       domain, ndomain, assigned_domain, &
+       domain_glo, ndomain_glo, domloc_glo_ind, swap_needed
+  USE omp_para, ONLY : is_omp_level_master, is_master
+  USE transfert_mod, ONLY : req_i0, req_i1, t_message, transfert_request, transfert_message, init_message
+
+  USE spherical_geom_mod, ONLY : xyz2lonlat, circumcenter, &
+       compute_centroid, centroid, &
+       surf_triangle, dist_cart, div_arc_bis, &
+       schmidt_transform
+  USE vector, ONLY : norm, cross_product2
+
   IMPLICIT NONE
   PRIVATE
@@ -10 +24 @@
 
   SUBROUTINE update_circumcenters 
-    USE domain_mod
-    USE dimensions
-    USE spherical_geom_mod
-    USE vector
-    USE transfert_mod
-    USE omp_para
-
-    IMPLICIT NONE
+
     REAL(rstd) :: x1(3),x2(3)
     REAL(rstd) :: vect(3,6)
@@ -36 +43 @@
     
     DO ind=1,ndomain
-      IF (.NOT. assigned_domain(ind) .OR. .NOT. is_omp_level_master) CYCLE
+
       CALL swap_dimensions(ind)
       CALL swap_geometry(ind)
@@ -55 +62 @@
 
   SUBROUTINE remap_schmidt_loc
-    USE spherical_geom_mod
     USE getin_mod
-    USE omp_para
-    USE domain_mod
-    USE dimensions
-    IMPLICIT NONE
     INTEGER :: ind,i,j,n
     REAL(rstd) :: schmidt_factor, schmidt_lon, schmidt_lat
@@ -91 +93 @@
 
   SUBROUTINE optimize_geometry
-  USE metric
-  USE spherical_geom_mod
-  USE domain_mod
-  USE dimensions
-  USE transfert_mod
-  USE vector
   USE getin_mod
-  USE omp_para
-  IMPLICIT NONE
     INTEGER :: nb_it=0
     TYPE(t_domain),POINTER :: d
@@ -193 +187 @@
     ! copy position of generators and vertices back into domain(:)%xyz/vertex
     ! so that XIOS/create_header_gen gets the right values
-    USE omp_para
-    USE dimensions
-    USE domain_mod 
-    USE transfert_mpi_mod
+    USE transfert_mpi_mod, ONLY : gather_field, bcast_field
 
     INTEGER :: ind,i,j,k,n
@@ -253 +244 @@
   SUBROUTINE set_geometry
   USE metric
-  USE vector
-  USE spherical_geom_mod
-  USE domain_mod
-  USE dimensions
-  USE transfert_mod
-  USE getin_mod
-  USE omp_para
-  IMPLICIT NONE
 
     REAL(rstd) :: surf(6)
@@ -279 +262 @@
     CALL remap_schmidt_loc
     CALL update_circumcenters
-    ! copy position of generators and vertices back into domain(:)%xyz/vertex
-    ! so that XIOS gets the right values
-    CALL update_domain
 
     DO ind=1,ndomain
@@ -527 +507 @@
  
   END SUBROUTINE set_geometry
-  
+
   SUBROUTINE compute_wee(n,pos,w)
-  IMPLICIT NONE
     INTEGER,INTENT(IN) :: n
     INTEGER,INTENT(IN) :: pos
@@ -555 +534 @@
    END SUBROUTINE compute_wee
             
-
   
   SUBROUTINE compute_geometry
     USE grid_param
-    USE domain_mod, ONLY : swap_needed
     USE init_unstructured_mod, ONLY : read_local_mesh
-    IMPLICIT NONE
-
+    USE set_bounds_mod, ONLY : set_bounds
     CALL allocate_geometry
 
@@ -568 +544 @@
     CASE(grid_ico)
        CALL set_geometry
+       ! copy position of generators and vertices back into domain_glo(:)%xyz/vertex
+       ! so that write_field gets the right values
+       CALL update_domain
+       CALL set_bounds(domain_glo, .TRUE.)
+       CALL set_bounds(domain, .FALSE.)
     CASE(grid_unst)
        swap_needed=.FALSE.