Changeset 267 for codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/advect_tracer.f90

Timestamp:

08/05/14 16:00:09 (10 years ago)

Author:

ymipsl

Message:

Synchronize trunk and Saturn branch.
Merge modification from trunk branch to Saturn branch.

YM

File:

• codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/advect_tracer.f90 (modified) (6 diffs)

codes/icosagcm/branches/SATURN_DYNAMICO/ICOSAGCM/src/advect_tracer.f90

@@ -8 +8 @@
   TYPE(t_field),SAVE,POINTER :: f_gradq3d(:)
   TYPE(t_field),SAVE,POINTER :: f_cc(:)  ! starting point of backward-trajectory (Miura approach)
-  TYPE(t_field),SAVE,POINTER :: f_one_over_sqrt_leng(:)
+  TYPE(t_field),SAVE,POINTER :: f_sqrt_leng(:)
 
   TYPE(t_message),SAVE :: req_u, req_cc, req_wfluxt, req_q, req_rhodz, req_gradq3d
@@ -28 +28 @@
     REAL(rstd),POINTER :: tangent(:,:)
     REAL(rstd),POINTER :: normal(:,:)
-    REAL(rstd),POINTER :: one_over_sqrt_leng(:)
+    REAL(rstd),POINTER :: sqrt_leng(:)
     INTEGER :: ind
 
@@ -35 +35 @@
     CALL allocate_field(f_gradq3d,field_t,type_real,llm,3, name='gradq3d')
     CALL allocate_field(f_cc,field_u,type_real,llm,3, name='cc')
-    CALL allocate_field(f_one_over_sqrt_leng,field_t,type_real, name='one_over_sqrt_leng')
+    CALL allocate_field(f_sqrt_leng,field_t,type_real, name='sqrt_leng')
     CALL allocate_field(f_dzqw, field_t, type_real, llm, name='dzqw')
     CALL allocate_field(f_adzqw, field_t, type_real, llm, name='adzqw')
@@ -47 +47 @@
        normal=f_normal(ind)
        tangent=f_tangent(ind)
-       one_over_sqrt_leng=f_one_over_sqrt_leng(ind)
-       CALL init_advect(normal,tangent,one_over_sqrt_leng)
+       sqrt_leng=f_sqrt_leng(ind)
+       CALL init_advect(normal,tangent,sqrt_leng)
     END DO
 
@@ -66 +66 @@
     TYPE(t_field),POINTER :: f_rhodz(:)    ! mass field at beginning of macro time step
 
-    REAL(rstd),POINTER :: q(:,:,:), normal(:,:), tangent(:,:), one_over_sqrt_leng(:), gradq3d(:,:,:), cc(:,:,:)
+    REAL(rstd),POINTER :: q(:,:,:), normal(:,:), tangent(:,:), sqrt_leng(:), gradq3d(:,:,:), cc(:,:,:)
     REAL(rstd),POINTER :: hfluxt(:,:), wfluxt(:,:)
     REAL(rstd),POINTER :: rhodz(:,:), u(:,:) 
@@ -145 +145 @@
           q       = f_q(ind)
           gradq3d = f_gradq3d(ind)
-          one_over_sqrt_leng=f_one_over_sqrt_leng(ind)
-          CALL compute_gradq3d(q(:,:,k),one_over_sqrt_leng,gradq3d,xyz_i,xyz_v)
+          sqrt_leng=f_sqrt_leng(ind)
+          CALL compute_gradq3d(q(:,:,k),sqrt_leng,gradq3d,xyz_i,xyz_v)
        END DO