Changeset 428 for codes/icosagcm/trunk/src/etat0_academic.f90

Timestamp:

06/14/16 21:54:26 (8 years ago)

Author:

dubos

Message:

theta-related cleanup

File:

• codes/icosagcm/trunk/src/etat0_academic.f90 (modified) (8 diffs)

codes/icosagcm/trunk/src/etat0_academic.f90

@@ -1 +1 @@
 MODULE etat0_academic_mod
-
-
-
-
+  USE icosa
+  IMPLICIT NONE
+
+  PRIVATE
+  
+  PUBLIC :: etat0
+  
 CONTAINS
   
@@ -9 +12 @@
   USE icosa
   USE kinetic_mod
-  IMPLICIT NONE
     TYPE(t_field),POINTER,SAVE :: f_ps(:)
     TYPE(t_field),POINTER,SAVE :: f_phis(:)
@@ -21 +23 @@
     REAL(rstd),POINTER :: temp(:)
     INTEGER :: ind
-    
-    
+        
     CALL allocate_field(f_ps,field_t,type_real)
     CALL allocate_field(f_phis,field_t,type_real)
@@ -40 +41 @@
     
   END SUBROUTINE test_etat0_academic
-   
     
   SUBROUTINE etat0(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
   USE icosa
-  IMPLICIT NONE
     TYPE(t_field),POINTER :: f_ps(:)
     TYPE(t_field),POINTER :: f_phis(:)
@@ -56 +55 @@
     REAL(rstd),POINTER :: u(:,:)
     INTEGER :: ind
-    
+
+    PRINT *, 'etat0_academic needs an upgrade for 4D theta'
+    PRINT *, 'STOP in etat0_academic.f90/etat0'
+    STOP
+
     DO ind=1,ndomain
       IF (.NOT. assigned_domain(ind)) CYCLE
@@ -77 +80 @@
   USE geopotential_mod
   USE theta2theta_rhodz_mod
-  IMPLICIT NONE  
   REAL(rstd),INTENT(OUT) :: ps(iim*jjm)
   REAL(rstd),INTENT(OUT) :: phis(iim*jjm)
@@ -99 +101 @@
   REAL(rstd) :: fact(3*iim*jjm)
   REAL(rstd) :: ut(3*iim*jjm,llm)
-  
-  
+    
     DO l=1,llm
        zsig=ap(l)/preff+bp(l)
@@ -137 +138 @@
     CALL compute_pression(ps,p,1)     
 !$OMP BARRIER
-    CALL compute_exner(ps,p,pks,pk,1)  
-!$OMP BARRIER
-    CALL compute_geopotential(phis,pks,pk,theta,phi,1)
+    CALL compute_geopotential(phis,ps,theta,phi,1)