Changeset 993 for codes

Timestamp:

11/15/19 11:03:17 (5 years ago)

Author:

rpennel

Message:

devel : temporary hack to use both cellset and read_metric

Location:

codes/icosagcm/devel/src

Files:

• icosa_init.f90 (modified) (1 diff)
• output/set_bounds.f90 (modified) (3 diffs)
• sphere/compute_geometry.f90 (modified) (2 diffs)

codes/icosagcm/devel/src/icosa_init.f90

@@ -45 +45 @@
   !$OMP PARALLEL  
     CALL switch_omp_no_distrib_level
+
+    ! RPNL 2019/11 Temp hack to use read_metric and devel cellset structure
+    CALL allocate_geometry
+    CALL compute_geometry
+
     CALL read_metric
     CALL compute_geometry

codes/icosagcm/devel/src/output/set_bounds.f90

@@ -32 +32 @@
     cells%ncell = n
     
-    ! now set bounds
-    ALLOCATE(cells%ij(n), cells%lon(n), cells%lat(n), cells%ind_glo(n))
-    ALLOCATE(cells%bnds_lon(0:5,n), cells%bnds_lat(0:5,n))
+    IF ( .NOT. ALLOCATED(cells%ij) ) THEN 
+        ! now set bounds
+        ALLOCATE(cells%ij(n), cells%lon(n), cells%lat(n), cells%ind_glo(n))
+        ALLOCATE(cells%bnds_lon(0:5,n), cells%bnds_lat(0:5,n))
+    END IF
 
     n=0
@@ -74 +76 @@
     cells%ncell = n
 
-    ! now set bounds
-    ALLOCATE(cells%ind_glo(n)) ! not set but must be allocated
-    ALLOCATE(cells%ij(n), cells%lon(n), cells%lat(n))
-    ALLOCATE(cells%bnds_lon(0:2,n), cells%bnds_lat(0:2,n))
+    IF ( .NOT. ALLOCATED( cells%ind_glo ) ) THEN 
+        ! now set bounds
+        ALLOCATE(cells%ind_glo(n)) ! not set but must be allocated
+        ALLOCATE(cells%ij(n), cells%lon(n), cells%lat(n))
+        ALLOCATE(cells%bnds_lon(0:2,n), cells%bnds_lat(0:2,n))
+    END IF
 
     n=0
@@ -138 +142 @@
     cells%ncell = n
 
-    ! now set bounds
-    ALLOCATE(cells%ij(n), cells%lon(n), cells%lat(n), cells%ind_glo(n))
-    ALLOCATE(cells%sgn(n)) ! flip sign when reading/writing
-    ALLOCATE(cells%bnds_lon(2,n), cells%bnds_lat(2,n))
+    IF ( .NOT. ALLOCATED( cells%ij ) ) THEN 
+        ! now set bounds
+        ALLOCATE(cells%ij(n), cells%lon(n), cells%lat(n), cells%ind_glo(n))
+        ALLOCATE(cells%sgn(n)) ! flip sign when reading/writing
+        ALLOCATE(cells%bnds_lon(2,n), cells%bnds_lat(2,n))
+    END IF 
 
     CALL swap_dimensions(ind)

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

@@ -123 +123 @@
     CALL update_circumcenters
 
-    DO ind=1,ndomain
-      IF (.NOT. assigned_domain(ind)  .OR. .NOT. is_omp_level_master ) CYCLE
-      d=>domain(ind)
-      CALL swap_dimensions(ind)
-      CALL swap_geometry(ind)
-      DO j=jj_begin,jj_end
-        DO i=ii_begin,ii_end
-          n=(j-1)*iim+i
-          DO k=0,5
-            x1(:) = xyz_v(n+z_pos(k+1),:)
-            x2(:) = d%vertex(:,k,i,j) 
-            IF (norm(x1-x2)>1e-10) THEN
-              PRINT*,"vertex diff ",ind,i,j,k
-              PRINT*,x1
-              PRINT*,x2
-            ENDIF
-          ENDDO
-        ENDDO
-      ENDDO
-    ENDDO
+!ym you get discrepency if you try to read metric from file, vertex are not saved in file
+!    DO ind=1,ndomain
+!      IF (.NOT. assigned_domain(ind)  .OR. .NOT. is_omp_level_master ) CYCLE
+!      d=>domain(ind)
+!      CALL swap_dimensions(ind)
+!      CALL swap_geometry(ind)
+!      DO j=jj_begin,jj_end
+!        DO i=ii_begin,ii_end
+!          n=(j-1)*iim+i
+!          DO k=0,5
+!            x1(:) = xyz_v(n+z_pos(k+1),:)
+!            x2(:) = d%vertex(:,k,i,j) 
+!            IF (norm(x1-x2)>1e-10) THEN
+!              PRINT*,"vertex diff ",ind,i,j,k
+!              PRINT*,x1
+!              PRINT*,x2
+!            ENDIF
+!          ENDDO
+!        ENDDO
+!      ENDDO
+!   ENDDO
     
     
@@ -539 +540 @@
     USE init_unstructured_mod, ONLY : read_local_mesh
     USE set_bounds_mod, ONLY : set_bounds
-    CALL allocate_geometry
+
+!        CALL allocate_geometry 
 
     SELECT CASE(grid_type)