Changeset 2225 for trunk/LMDZ.MARS/libf

Timestamp:

Jan 24, 2020, 3:25:31 PM (5 years ago)

Author:

emillour

Message:

Mars GCM:
Further cleanup of nonorographic gravity waves drag parametrization east_gwstress
and west_gwstress need be initialized and are better as module variables.
EM

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• nonoro_gwd_ran_mod.F90 (modified) (6 diffs)
• physiq_mod.F (modified) (2 diffs)

trunk/LMDZ.MARS/libf/phymars/nonoro_gwd_ran_mod.F90

@@ -5 +5 @@
 REAL,allocatable,save :: du_nonoro_gwd(:,:) ! Zonal wind tendency due to GWD 
 REAL,allocatable,save :: dv_nonoro_gwd(:,:) ! Meridional wind tendency due to GWD
+REAL,ALLOCATABLE,SAVE :: east_gwstress(:,:) ! Profile of eastward stress
+REAL,ALLOCATABLE,SAVE :: west_gwstress(:,:) ! Profile of westward stress
 
 CONTAINS
@@ -10 +12 @@
       SUBROUTINE NONORO_GWD_RAN(ngrid,nlayer,DTIME, pp,  &
                   zmax_therm, pt, pu, pv, pdt, pdu, pdv, &
-                  zustr,zvstr,d_t, d_u, d_v, &
-                  east_gwstress, west_gwstress)
+                  zustr,zvstr,d_t, d_u, d_v)
 
     !--------------------------------------------------------------------------------
@@ -64 +65 @@
     ! 0.2 OUTPUTS
     REAL, intent(out):: zustr(ngrid), zvstr(ngrid) ! Surface Stresses
-    REAL, intent(inout):: d_t(ngrid, nlayer)        ! Tendency on Temp.
-    REAL, intent(inout):: d_u(ngrid, nlayer), d_v(ngrid, nlayer) ! tendency on winds
-    REAL, intent(inout):: east_gwstress(ngrid, nlayer) ! Profile of eastward stress
-    REAL, intent(inout):: west_gwstress(ngrid, nlayer) ! Profile of westward stress
+    REAL, intent(out):: d_t(ngrid, nlayer)        ! Tendency on Temp.
+    REAL, intent(out):: d_u(ngrid, nlayer), d_v(ngrid, nlayer) ! tendency on winds
 
     ! O.3 INTERNAL ARRAYS
@@ -506 +505 @@
   END SUBROUTINE NONORO_GWD_RAN
 
-! ===================================================================
-! Subroutines used to write variables of memory in start files       
-! ===================================================================
+! ========================================================
+! Subroutines used to allocate/deallocate module variables       
+! ========================================================
 
   SUBROUTINE ini_nonoro_gwd_ran(ngrid,nlayer)
@@ -519 +518 @@
          allocate(du_nonoro_gwd(ngrid,nlayer))
          allocate(dv_nonoro_gwd(ngrid,nlayer))
+         allocate(east_gwstress(ngrid,nlayer))
+         east_gwstress(:,:)=0
+         allocate(west_gwstress(ngrid,nlayer))
+         west_gwstress(:,:)=0
 
   END SUBROUTINE ini_nonoro_gwd_ran
@@ -528 +531 @@
          if (allocated(du_nonoro_gwd)) deallocate(du_nonoro_gwd)
          if (allocated(dv_nonoro_gwd)) deallocate(dv_nonoro_gwd)
+         if (allocated(east_gwstress)) deallocate(east_gwstress)
+         if (allocated(west_gwstress)) deallocate(west_gwstress)
 
   END SUBROUTINE end_nonoro_gwd_ran

trunk/LMDZ.MARS/libf/phymars/physiq_mod.F

@@ -436 +436 @@
       REAL d_u_hin(ngrid,nlayer), d_v_hin(ngrid,nlayer)
       REAL d_t_hin(ngrid,nlayer)
-      REAL east_gwstress(ngrid,nlayer)
-      REAL west_gwstress(ngrid,nlayer)
 c  Diagnostics 2D of gw_nonoro
       REAL zustrhi(ngrid), zvstrhi(ngrid)
@@ -1407 +1405 @@
      &               pdt, pdu, pdv,
      &               zustrhi,zvstrhi,
-     &               d_t_hin, d_u_hin, d_v_hin, 
-     &               east_gwstress, west_gwstress)
+     &               d_t_hin, d_u_hin, d_v_hin)
 
 !  Update tendencies