Changeset 350 for codes/icosagcm/trunk/src/field.f90

Timestamp:

08/02/15 00:53:35 (9 years ago)

Author:

dubos

Message:

Move geopotential to timeloop, prepare for prognostic geopotential (NH)

File:

• codes/icosagcm/trunk/src/field.f90 (modified) (7 diffs)

codes/icosagcm/trunk/src/field.f90

@@ -1 +1 @@
 MODULE field_mod
   USE genmod
+  IMPLICIT NONE
   
   INTEGER,PARAMETER :: field_T=1
@@ -43 +44 @@
   END INTERFACE
 
+  PRIVATE :: allocate_field_
 
 CONTAINS
@@ -49 +51 @@
   USE domain_mod
   USE omp_para
-  IMPLICIT NONE
     TYPE(t_field),POINTER :: field(:)
+    INTEGER,INTENT(IN) :: field_type
+    INTEGER,INTENT(IN) :: data_type
+    INTEGER,OPTIONAL :: dim1,dim2
+    CHARACTER(*), OPTIONAL :: name
+!$OMP BARRIER
+!$OMP MASTER
+    ALLOCATE(field(ndomain))
+!$OMP END MASTER
+!$OMP BARRIER
+    CALL allocate_field_(field,field_type,data_type,dim1,dim2,name)
+  END SUBROUTINE allocate_field
+
+  SUBROUTINE allocate_fields(nfield,field,field_type,data_type,dim1,dim2,name)
+  USE domain_mod
+  USE omp_para
+    INTEGER,INTENT(IN) :: nfield
+    TYPE(t_field),POINTER :: field(:,:)
+    INTEGER,INTENT(IN) :: field_type
+    INTEGER,INTENT(IN) :: data_type
+    INTEGER,OPTIONAL :: dim1,dim2
+    CHARACTER(*), OPTIONAL :: name
+    INTEGER :: i
+!$OMP BARRIER
+!$OMP MASTER
+    ALLOCATE(field(ndomain,nfield))
+!$OMP END MASTER
+!$OMP BARRIER
+    DO i=1,nfield
+       CALL allocate_field_(field(:,i),field_type,data_type,dim1,dim2,name)
+    END DO
+  END SUBROUTINE allocate_fields
+
+  SUBROUTINE allocate_field_(field,field_type,data_type,dim1,dim2,name)
+  USE domain_mod
+  USE omp_para
+  IMPLICIT NONE
+    TYPE(t_field) :: field(:)
     INTEGER,INTENT(IN) :: field_type
     INTEGER,INTENT(IN) :: data_type
@@ -57 +95 @@
     INTEGER :: ind
     INTEGER :: ii_size,jj_size
-
-!$OMP BARRIER
-!$OMP MASTER
-    ALLOCATE(field(ndomain))
-!$OMP END MASTER
-!$OMP BARRIER
 
     DO ind=1,ndomain
@@ -115 +147 @@
 !$OMP BARRIER
    
-  END SUBROUTINE allocate_field
+ END SUBROUTINE allocate_field_
 
   SUBROUTINE allocate_field_glo(field,field_type,data_type,dim1,dim2,name)
@@ -181 +213 @@
 
   SUBROUTINE deallocate_field(field)
+    USE domain_mod
+    USE omp_para
+    IMPLICIT NONE
+    TYPE(t_field),POINTER :: field(:)
+    !$OMP BARRIER
+    CALL deallocate_field_(field)
+    !$OMP BARRIER
+    !$OMP MASTER
+    DEALLOCATE(field)
+    !$OMP END MASTER
+    !$OMP BARRIER
+  END SUBROUTINE deallocate_field
+  
+  SUBROUTINE deallocate_fields(field)
+    USE domain_mod
+    USE omp_para
+    IMPLICIT NONE
+    TYPE(t_field),POINTER :: field(:,:)
+    INTEGER :: i
+    !$OMP BARRIER
+    DO i=1,SIZE(field,2)
+       CALL deallocate_field_(field(:,i))
+    END DO
+    !$OMP BARRIER
+    !$OMP MASTER
+    DEALLOCATE(field)
+    !$OMP END MASTER
+    !$OMP BARRIER
+  END SUBROUTINE deallocate_fields
+
+  SUBROUTINE deallocate_field_(field)
   USE domain_mod
   USE omp_para
   IMPLICIT NONE
-    TYPE(t_field),POINTER :: field(:)
+    TYPE(t_field) :: field(:)
     INTEGER :: data_type
     INTEGER :: ind
-
-!$OMP BARRIER
     DO ind=1,ndomain
       IF (.NOT. assigned_domain(ind)  .OR. .NOT. is_omp_level_master) CYCLE
@@ -209 +270 @@
       
    ENDDO
-!$OMP BARRIER
-!$OMP MASTER
-   DEALLOCATE(field)
-!$OMP END MASTER
-!$OMP BARRIER
-       
-  END SUBROUTINE deallocate_field
+  END SUBROUTINE deallocate_field_
 
   SUBROUTINE deallocate_field_glo(field)