Changeset 863 for codes/icosagcm/devel/src/unstructured/init_unstructured.f90

Timestamp:

05/09/19 01:37:55 (5 years ago)

Author:

dubos

Message:

devel : split read_dump_partition into open_local_mesh_file and read_local_mesh

File:

• codes/icosagcm/devel/src/unstructured/init_unstructured.f90 (modified) (7 diffs)

codes/icosagcm/devel/src/unstructured/init_unstructured.f90

@@ -2 +2 @@
   USE mpipara, ONLY : is_mpi_master
   USE data_unstructured_mod
+  USE geometry, ONLY : de
   IMPLICIT NONE
   SAVE
@@ -10 +11 @@
   INTEGER, ALLOCATABLE :: Idata_read1(:),Idata_read2(:,:),Idata_read3(:,:,:)
 
-  PUBLIC :: read_dump_partition
+  CHARACTER(LEN=*),PARAMETER :: meshfile="input/mesh_information.nc"
+  INTEGER :: id_nc ! NetCDF id of mesh file open by open_local_mesh_file
+
+  PUBLIC :: open_local_mesh_file, read_local_mesh
 
 CONTAINS
@@ -92 +96 @@
 
 
-  SUBROUTINE read_dump_partition
-    use netcdf_mod
-    USE ioipsl
-    USE field_mod
-    USE geometry, ONLY : lon_i, lat_i, lon_e, lat_e, ep_e
-    IMPLICIT NONE
-
-    !!-------------Declare local variables-------------------
-    CHARACTER(LEN=*),PARAMETER :: f="input/mesh_information.nc"
-    INTEGER :: id_nc, ierr, status, descriptionLength, ij
+  SUBROUTINE open_local_mesh_file
+    USE netcdf_mod
     CHARACTER(LEN= 80) :: description
-    REAL(rstd), ALLOCATABLE :: angle_e(:)
-    REAL(rstd) :: clon, slon, clat, slat, & ! COS/SIN of lon/lat
-         elon(3), elat(3) ! lon/lat unit vectors
-    print *,"------------------ READING FILE " , f, "----------------------- "
+    INTEGER :: ierr, status, descriptionLength
+
+    PRINT *,"------------------ READING FILE " , meshfile, "----------------------- "
     !open and read the input file
-    ierr = nf90_open(f, NF90_NOWRITE, id_nc)
+    ierr = nf90_open(meshfile, NF90_NOWRITE, id_nc)
     if (ierr /= nf90_noerr) then
       print *, trim(nf90_strerror(ierr))
@@ -114 +109 @@
     end if
 
-    status = nf90_inquire_attribute(id_nc, nf90_global, "description", len =descriptionLength)
+    status = nf90_inquire_attribute(id_nc, nf90_global, "description", len=descriptionLength)
     IF(status /= 0 .or. len(description) < descriptionLength) THEN
         print *, "Not enough space to put NetCDF attribute values."
@@ -124 +119 @@
     print *,"Data file description :",description
 
+    CALL read_from_gridfile(id_nc, 'integer', 'primal_deg')
+    primal_num = SIZE(Idata_read1)
+    CALL read_from_gridfile(id_nc, 'integer', 'dual_deg')
+    dual_num = SIZE(Idata_read1)
+    CALL read_from_gridfile(id_nc, 'integer', 'trisk_deg')
+    edge_num = SIZE(Idata_read1)
+  END SUBROUTINE open_local_mesh_file
+
+
+  SUBROUTINE read_local_mesh
+    USE field_mod
+    USE geometry, ONLY : lon_i, lat_i, lon_e, lat_e, ep_e
+    IMPLICIT NONE
+    INTEGER :: ij
+    REAL(rstd), ALLOCATABLE :: angle_e(:)
+    REAL(rstd) :: clon, slon, clat, slat, & ! COS/SIN of lon/lat
+         elon(3), elat(3) ! lon/lat unit vectors
+    
     !status = nf90_get_att(id_nc, nf90_global, "primal_num", primal_num)
     !status = nf90_get_att(id_nc, nf90_global, "dual_num", dual_num)
@@ -161 +174 @@
     CALL read_from_gridfile(id_nc, 'float', 'le_de')
     ALLOCATE(le_de, source = Ddata_read1)
+    CALL read_from_gridfile(id_nc, 'float', 'le')
+    ALLOCATE(le, source = Ddata_read1)
+    CALL read_from_gridfile(id_nc, 'float', 'de')
+    ALLOCATE(de, source = Ddata_read1)
     CALL read_from_gridfile(id_nc, 'float', 'Riv2')
     ALLOCATE(Riv2, source = Ddata_read2)
@@ -204 +221 @@
     
     DEALLOCATE(angle_e)
-  END SUBROUTINE read_dump_partition
-
-  SUBROUTINE init_grid_type
-    USE grid_param, ONLY : grid_type, grid_unst, grid_ico   
-    USE getin_mod, ONLY : getin
-    CHARACTER(len=255) :: grid_type_var
-    grid_type_var='icosahedral'
-    CALL getin("grid_type",grid_type_var)
-    SELECT CASE(grid_type_var)
-    CASE('unstructured')
-       grid_type = grid_unst
-!       is_omp_level_master=.TRUE.
-!       omp_level_size=1
-       CALL read_dump_partition
-       IF (is_mpi_master) PRINT *,'Using unstructured grid type'
-    CASE DEFAULT
-       grid_type = grid_ico
-       IF (is_mpi_master) PRINT *,'Using default grid type'
-    END SELECT  
-  END SUBROUTINE init_grid_type
+  END SUBROUTINE read_local_mesh
 
 END MODULE init_unstructured_mod