Changeset 899 for codes/icosagcm/trunk/src/initial

Timestamp:

06/13/19 16:45:41 (5 years ago)

Author:

adurocher

Message:

trunk : Fixed GCC warnings

Fixed iso c bindings
fixed warnings with -Wall -Wno-aliasing -Wno-unused -Wno-unused-dummy-argument -Wno-maybe-uninitialized -Wno-tabs warnings
Removed all unused variables (-Wunused-variable)
vector%dot_product is now dot_product_3d to avoid compilation warning "dot_product shadows intrinsic" with GCC

Location:

codes/icosagcm/trunk/src/initial

Files:

• etat0.f90 (modified) (4 diffs)
• etat0_academic.f90 (modified) (2 diffs)
• etat0_dcmip1.f90 (modified) (4 diffs)
• etat0_dcmip2.f90 (modified) (1 diff)
• etat0_dcmip2016_baroclinic_wave.f90 (modified) (2 diffs)
• etat0_dcmip3.f90 (modified) (3 diffs)
• etat0_dcmip4.f90 (modified) (1 diff)
• etat0_heldsz.f90 (modified) (5 diffs)
• etat0_venus.f90 (modified) (2 diffs)

codes/icosagcm/trunk/src/initial/etat0.f90

@@ -66 +66 @@
 
   SUBROUTINE etat0(f_ps,f_mass,f_phis,f_theta_rhodz,f_u, f_geopot,f_w, f_q)
-    USE mpipara, ONLY : is_mpi_root
     USE disvert_mod
     ! Generic interface
@@ -96 +95 @@
     
     REAL(rstd),POINTER :: ps(:), mass(:,:)
-    LOGICAL :: autoinit_mass, autoinit_geopot, collocated
-    INTEGER :: ind,i,j,ij,l
+    LOGICAL :: autoinit_mass, collocated
+    INTEGER :: ind
 
     ! most etat0 routines set ps and not mass
@@ -248 +247 @@
 
     REAL(rstd) :: p(iim*jjm,llm+1)
-    REAL(rstd) :: cppd,Rd, mass, p_ij, q_ij,r_ij, chi,nu, entropy, theta
+    REAL(rstd) :: cppd,Rd, mass, p_ij, chi,nu, entropy, theta
     INTEGER :: i,j,ij,l
 
@@ -323 +322 @@
     REAL(rstd) :: q_e(3*iim*jjm,llm,nqtot)
 
-    INTEGER :: l,i,j,ij
+    INTEGER :: l,ij
     REAL :: p_ik, v_ik, mass_ik
     LOGICAL :: autoinit_mass, autoinit_NH

codes/icosagcm/trunk/src/initial/etat0_academic.f90

@@ -19 +19 @@
     TYPE(t_field),POINTER,SAVE :: f_Ki(:)
     TYPE(t_field),POINTER,SAVE :: f_temp(:)
-  
-    REAL(rstd),POINTER :: Ki(:,:)
-    REAL(rstd),POINTER :: temp(:)
-    INTEGER :: ind
         
     CALL allocate_field(f_ps,field_t,type_real)
@@ -92 +88 @@
   REAL(rstd) :: ddsin
   REAL(rstd) :: thetarappel
-  REAL(rstd) :: lon,lat
+  REAL(rstd) :: lat
   REAL(rstd) :: p(iim*jjm,llm+1)
-  REAL(rstd) :: alpha(iim*jjm,llm),beta(iim*jjm,llm)
-  REAL(rstd) :: delta
-  REAL(rstd) :: pks(iim*jjm),pk(iim*jjm,llm)
   REAL(rstd) :: phi(iim*jjm,llm)
   REAL(rstd) :: x  

codes/icosagcm/trunk/src/initial/etat0_dcmip1.f90

@@ -15 +15 @@
 !$OMP THREADPRIVATE(lon0)
   REAL(rstd), SAVE  :: lat0=0.0
-!$OMP THREADPRIVATE(lat0)
-  REAL(rstd), SAVE  :: alpha=0.0
-!$OMP THREADPRIVATE(alpha)
+  !$OMP THREADPRIVATE(lat0)
   REAL(rstd), SAVE  :: R0 
 !$OMP THREADPRIVATE(R0)
-  REAL(rstd), SAVE  :: lat1=0.
-!$OMP THREADPRIVATE(lat1)
-  REAL(rstd), SAVE  :: lat2=0.
-!$OMP THREADPRIVATE(lat2)
-  REAL(rstd), SAVE  :: lon1=pi/6
-!$OMP THREADPRIVATE(lon1)
-  REAL(rstd), SAVE  :: lon2=-pi/6
-!$OMP THREADPRIVATE(lon2)
   REAL(rstd), SAVE  :: latc1=0.
 !$OMP THREADPRIVATE(latc1)
@@ -113 +103 @@
   REAL(rstd) :: pr
   !  REAL(rstd) :: lon, lat
-  INTEGER :: n,l
+  INTEGER :: l
   
   DO l=1, llm+1
@@ -158 +148 @@
     SUBROUTINE cosine_bell_1(hx)
     REAL(rstd) :: hx(ngrid,llm)
-    REAL(rstd) :: rr1,rr2   
+    REAL(rstd) :: rr1 
     INTEGER :: n,l
     DO l=ll_begin,ll_end 
@@ -241 +231 @@
       REAL(rstd)::hx(ngrid,llm) 
       REAL(rstd),PARAMETER:: zz1=2000.,zz2=5000.,zz0=0.5*(zz1+zz2)
-      INTEGER :: n,l
+      INTEGER :: l
       
       DO l=ll_begin,ll_end

codes/icosagcm/trunk/src/initial/etat0_dcmip2.f90

@@ -60 +60 @@
     REAL(rstd), INTENT(IN) :: hyam, hybm, lon, lat
     REAL(rstd), INTENT(OUT) :: psj,phisj,tempj,ulonj,ulatj
-    REAL :: dummy
-    dummy=0.
+    REAL :: dummy_p, dummy_z, dummy_w, dummy_rho, dummy_q
+    dummy_p=0;dummy_z=0;dummy_w=0;dummy_rho=0;dummy_q=0
     SELECT CASE (testcase)
     CASE(mountain)
-       CALL test2_steady_state_mountain(lon,lat,dummy,dummy,0,.TRUE.,hyam,hybm, &
-            ulonj,ulatj,dummy,tempj,phisj,psj,dummy,dummy)
+       CALL test2_steady_state_mountain(lon,lat,dummy_p,dummy_z,0,.TRUE.,hyam,hybm, &
+            ulonj,ulatj,dummy_w,tempj,phisj,psj,dummy_rho,dummy_q)
     CASE(schaer_noshear)
-       CALL test2_schaer_mountain(lon,lat,dummy,dummy,0,.TRUE.,hyam,hybm,0,&
-            ulonj,ulatj,dummy,tempj,phisj,psj,dummy,dummy)
+       CALL test2_schaer_mountain(lon,lat,dummy_p,dummy_z,0,.TRUE.,hyam,hybm,0,&
+            ulonj,ulatj,dummy_w,tempj,phisj,psj,dummy_rho,dummy_q)
     CASE(schaer_shear)
-       CALL test2_schaer_mountain(lon,lat,dummy,dummy,0,.TRUE.,hyam,hybm,1, &
-            ulonj,ulatj,dummy,tempj,phisj,psj,dummy,dummy)
+       CALL test2_schaer_mountain(lon,lat,dummy_p,dummy_z,0,.TRUE.,hyam,hybm,1, &
+            ulonj,ulatj,dummy_w,tempj,phisj,psj,dummy_rho,dummy_q)
     END SELECT
   END SUBROUTINE comp_all

codes/icosagcm/trunk/src/initial/etat0_dcmip2016_baroclinic_wave.f90

@@ -2 +2 @@
   USE icosa
   IMPLICIT NONE
-  PRIVATE
- 
-  INTEGER,SAVE :: testcase
-  !$OMP THREADPRIVATE(testcase)  
+  PRIVATE 
   
   INTEGER :: perturbation
@@ -18 +15 @@
     USE tracer_mod
     IMPLICIT NONE
-    LOGICAL :: is_moist
     CHARACTER(LEN=255) :: str_perturbation
     

codes/icosagcm/trunk/src/initial/etat0_dcmip3.f90

@@ -22 +22 @@
     REAL(rstd), INTENT(OUT) :: q(ngrid,llm,nqtot)
     REAL(rstd),PARAMETER :: Peq=1e5        ! Reference surface pressure at the equator (hPa)
-    REAL(rstd) :: dummy, pp, zz
+    REAL(rstd) :: dummy_z, dummy_u, dummy_v, dummy_w, dummy_t, dummy_phis, dummy_ps, dummy_rho, dummy_q
+    REAL(rstd) :: pp, zz
     INTEGER :: l,ij
+    dummy_z=0;dummy_u=0;dummy_v=0;dummy_w=0;dummy_t=0;dummy_phis=0;dummy_ps=0;dummy_rho=0;dummy_q=0;
     pp=peq
     DO ij=1,ngrid
-       CALL test3_gravity_wave(scale_factor, lon(ij),lat(ij),pp,dummy,0, &
-            dummy,dummy,dummy,dummy,phis(ij),ps(ij),dummy,dummy)
+       CALL test3_gravity_wave(scale_factor, lon(ij),lat(ij),pp,dummy_z,0, &
+            dummy_u,dummy_v,dummy_w,dummy_t,phis(ij),ps(ij),dummy_rho,dummy_q)
     END DO
     DO l=ll_begin,ll_endp1
@@ -33 +35 @@
           pp = ap(l) + bp(l)*ps(ij) ! half-layer pressure
           CALL test3_gravity_wave(scale_factor, lon(ij),lat(ij),pp,zz,0, &
-               dummy,dummy,dummy,dummy,dummy,dummy,dummy,dummy)
+               dummy_u,dummy_v,dummy_w,dummy_t,dummy_phis,dummy_ps,dummy_rho,dummy_q)
           geopot(ij,l) = g*zz ! initialize geopotential for NH
        END DO
@@ -40 +42 @@
        DO ij=1,ngrid
           pp = .5*(ap(l)+ap(l+1)) + .5*(bp(l)+bp(l+1))*ps(ij) ! full-layer pressure
-          CALL test3_gravity_wave(scale_factor, lon(ij),lat(ij),pp,dummy,0, &
-               ulon(ij,l),ulat(ij,l),dummy,Temp(ij,l),dummy,dummy,dummy,dummy)
+          CALL test3_gravity_wave(scale_factor, lon(ij),lat(ij),pp,dummy_z,0, &
+               ulon(ij,l),ulat(ij,l),dummy_w,Temp(ij,l),dummy_phis,dummy_ps,dummy_rho,dummy_q)
        END DO
        q(:,l,:)=0.

codes/icosagcm/trunk/src/initial/etat0_dcmip4.f90

@@ -52 +52 @@
     INTEGER :: l,ij
     REAL(rstd) :: etal, etavl, etas, etavs, sinlat, coslat, &
-         Y, Tave, T, phis_ave, vort, r2, utot, &
+         Y, Tave, T, phis_ave, vort, utot, &
          dthetaodeta_ave, dthetaodeta, dthetaodlat, duodeta, K, r
     

codes/icosagcm/trunk/src/initial/etat0_heldsz.f90

@@ -8 +8 @@
   TYPE(t_field),POINTER :: f_theta(:)
 
-  REAL(rstd),ALLOCATABLE,SAVE :: knewt_t(:),kfrict(:)
+  REAL(rstd),ALLOCATABLE :: knewt_t(:),kfrict(:)
 !$OMP THREADPRIVATE(knewt_t,kfrict)
-  LOGICAL, SAVE :: done=.FALSE.
+  LOGICAL :: done=.FALSE.
 !$OMP THREADPRIVATE(done)
 
-  REAL(rstd),SAVE :: p0,teta0,ttp,delt_y,delt_z,eps
+  REAL(rstd) :: p0,teta0,ttp,delt_y,delt_z,eps
 !$OMP THREADPRIVATE(p0,teta0,ttp,delt_y,delt_z,eps)
 
-  REAL(rstd),SAVE :: knewt_g, k_f,k_c_a,k_c_s
+  REAL(rstd) :: knewt_g, k_f,k_c_a,k_c_s
 !$OMP THREADPRIVATE(knewt_g, k_f,k_c_a,k_c_s)
 
@@ -31 +31 @@
     TYPE(t_field),POINTER :: f_q(:)
     TYPE(t_field),POINTER :: f_Ki(:)
-
-    REAL(rstd),POINTER :: Ki(:,:)
-    INTEGER :: ind
 
     CALL allocate_field(f_ps,field_t,type_real)
@@ -104 +101 @@
   SUBROUTINE init_Teq
     USE disvert_mod, ONLY : ap,bp
-    REAL(rstd),POINTER :: clat(:) 
     REAL(rstd),POINTER :: theta_eq(:,:) 
     REAL(rstd) :: zsig
@@ -165 +161 @@
     REAL(rstd),INTENT(OUT) :: theta_eq(iim*jjm,llm) 
 
-    REAL(rstd) :: r, zsig, ddsin, tetastrat, tetajl
+    REAL(rstd) :: zsig, ddsin, tetastrat, tetajl
     INTEGER :: i,j,l,ij
 
@@ -213 +209 @@
     REAL(rstd),POINTER :: theta_eq(:,:)
     REAL(rstd),POINTER :: theta(:,:)
-    REAL(rstd),POINTER :: clat(:)
     INTEGER::ind
 

codes/icosagcm/trunk/src/initial/etat0_venus.f90

@@ -102 +102 @@
     REAL(rstd),POINTER :: phis(:)
     REAL(rstd),POINTER :: u(:,:)
-    REAL(rstd),POINTER :: q(:,:,:)
-    REAL(rstd) :: lat(iim*jjm)        ! latitude                    
-    REAL(rstd) :: pplay(iim*jjm, llm) ! pressure at full layers
+    REAL(rstd),POINTER :: q(:,:,:)                  
     INTEGER :: ind
 
@@ -143 +141 @@
     
     real(rstd) ::  lon,lat, pplay, ztemp,zdt,fact
-    logical, save ::  firstcall
     integer :: i,j,ij, l,ll