Changeset 1767 for trunk

Timestamp:

Aug 25, 2017, 2:06:32 AM (7 years ago)

Author:

aslmd

Message:

LES. corrected module_initialize_les so that it works again on Mars, while hopefully keeping it in version suitable for Venus and prescribed. The latter is to be checked, but the former gives similar results to 1438 on an InSight? test case. Adopted logp interpolation for Mars (does not change a lot, only to something like 5th digit

File:

• trunk/MESOSCALE/LMD_MM_MARS/SRC/LES/modif_mars/module_initialize_les.F (modified) (16 diffs)

trunk/MESOSCALE/LMD_MM_MARS/SRC/LES/modif_mars/module_initialize_les.F

@@ -126 +126 @@
       !INTEGER :: hypsometric_opt = 2 ! Wee et al. 2012 correction
 
+      LOGICAL :: logp = .true. ! use logp to interpolate (and not p)
 
 #ifdef DM_PARALLEL
 #    include <data_calls.inc>
 #endif
+
 
    SELECT CASE ( model_data_order )
@@ -171 +173 @@
    END SELECT
 
-
-   !stretch_grid = .false.
-!  FOR LES, set stretch to false
-   stretch_grid = .true.
+   IF (planet == "mars") THEN
+     stretch_grid = .false.
+     !! FOR LES, set stretch to false
+   ELSE
+     stretch_grid = .true. !! VENUS
+   ENDIF
    delt = 3.
 !   z_scale = .50
@@ -242 +246 @@
    grid%step_number = 0
 
-!! set up the grid
-!
+! set up the grid
+
    IF (stretch_grid) THEN ! exponential stretch for eta (nearly constant dz)
      DO k=1, kde
@@ -249 +253 @@
                                 (1.-exp(-1./z_scale))
      ENDDO
-   ELSE
-!
-!!!!MARS
-!grid%znw(1)=1.000
-!grid%znw(2)=0.9995 !5m
-!grid%znw(3)=0.9980 !20m
-!grid%znw(4)=0.9950 !55m
-!DO k=5, kde
-!   grid%znw(k) = grid%znw(4) * ( 1. - float(k-4)/float(kde-4) )
-!ENDDO
-!!!!!MARS
-!!!
-!!     DO k=1, kde
-!!      grid%znw(k) = 1. - float(k-1)/float(kde-1)
-!!     ENDDO
-!
-!   ENDIF
-
-!!MARS
-!!MARS
-  open(unit=12,file='levels',form='formatted',status='old')
-  rewind(12)
-  DO k=1, kde
-  read(12,*) grid%znw(k)
-  write(6,*) 'read level ', k,grid%znw(k)
-  ENDDO
-  close(12)
-!!MARS
-!!MARS
-     ENDIF
+   ENDIF
+   !ELSE
+   !  !DO k=1, kde
+   !  ! grid%znw(k) = 1. - float(k-1)/float(kde-1)
+   !  !ENDDO
+
+
+   IF (planet == "mars") THEN
+     !!!MARS
+     grid%znw(1)=1.000
+     grid%znw(2)=0.9995 !5m
+     grid%znw(3)=0.9980 !20m
+     grid%znw(4)=0.9950 !55m
+     DO k=5, kde
+       grid%znw(k) = grid%znw(4) * ( 1. - float(k-4)/float(kde-4) )
+     ENDDO
+!!!MARS
+!!!MARS
+!  open(unit=12,file='levels',form='formatted',status='old')
+!  rewind(12)
+!  DO k=1, kde
+!  read(12,*) grid%znw(k)
+!  write(6,*) 'read level ', k,grid%znw(k)
+!  ENDDO
+!  close(12)
+!!!MARS
+!!!MARS
+   ENDIF
+
 
    DO k=1, kde-1
@@ -422 +425 @@
   ENDDO
 
+  IF (.not.logp) THEN
+    write(6,*) 'interpolate in p'
+  ELSE
+    write(6,*) 'interpolate in logp'
+  ENDIF
+
   DO J = jts, jte
   DO I = its, ite
@@ -434 +443 @@
       p_level = grid%znu(k)*(p_surf - grid%p_top) + grid%p_top
       grid%pb(i,k,j) = p_level
+     IF (.not.logp) THEN
+      grid%t_init(i,k,j) = interp_0( theta, p_in, p_level, nl_in ) - t0
+     ELSE
       grid%t_init(i,k,j) = interp_0_log( theta, p_in, p_level, nl_in ) - t0
+     ENDIF
       grid%alb(i,k,j) = (r_d/p1000mb)*(grid%t_init(i,k,j)+t0)*(grid%pb(i,k,j)/p1000mb)**cvpm
     ENDDO
@@ -489 +502 @@
 
       p_level = grid%znu(k)*(pd_surf - grid%p_top) + grid%p_top
-
+     IF (.not.logp) THEN
+      moist(i,k,j,P_QV) = interp_0( qv, pd_in, p_level, nl_in )
+      grid%t_1(i,k,j)          = interp_0( theta, pd_in, p_level, nl_in ) - t0
+     ELSE
       moist(i,k,j,P_QV) = interp_0_log( qv, pd_in, p_level, nl_in )
       grid%t_1(i,k,j)          = interp_0_log( theta, pd_in, p_level, nl_in ) - t0
+     ENDIF
       grid%t_2(i,k,j)          = grid%t_1(i,k,j)
       
@@ -693 +710 @@
     DO K = 1, kte-1
       p_level = grid%znu(k)*(p_surf - grid%p_top) + grid%p_top
+     IF (.not.logp) THEN
+      grid%v_1(i,k,j) = interp_0( v, p_in, p_level, nl_in )
+     ELSE
       grid%v_1(i,k,j) = interp_0_log( v, p_in, p_level, nl_in )
+     ENDIF
       grid%v_2(i,k,j) = grid%v_1(i,k,j)
     ENDDO
@@ -717 +738 @@
     DO K = 1, kte-1
       p_level = grid%znu(k)*(p_surf - grid%p_top) + grid%p_top
+     IF (.not.logp) THEN
+      grid%u_1(i,k,j) = interp_0( u, p_in, p_level, nl_in )
+     ELSE
       grid%u_1(i,k,j) = interp_0_log( u, p_in, p_level, nl_in )
+     ENDIF
       grid%u_2(i,k,j) = grid%u_1(i,k,j)
     ENDDO
@@ -846 +871 @@
       DO k=1,kte-1
          p_level = grid%znu(k)*(pd_surf - grid%p_top) + grid%p_top
+        IF (.not.logp) THEN
+         scalar(its:ite,k,jts:jte,2) = interp_0( qv, pd_in, p_level, nl_in )
+        ELSE
          scalar(its:ite,k,jts:jte,2) = interp_0_log( qv, pd_in, p_level, nl_in )
+        ENDIF
          scalar(its:ite,k,jts:jte,3) = 0.
            !! water ice is set to 0 (was put into water vapor when building prof from MCD)
@@ -861 +890 @@
       DO k=1,kte-1
          p_level = grid%znu(k)*(pd_surf - grid%p_top) + grid%p_top
+        IF (.not.logp) THEN
+         scalar(its:ite,k,jts:jte,4) = interp_0( profdustq, pd_in, p_level,nl_in )
+         scalar(its:ite,k,jts:jte,5) = interp_0( profdustn, pd_in, p_level,nl_in )
+        ELSE
          scalar(its:ite,k,jts:jte,4) = interp_0_log( profdustq, pd_in, p_level, nl_in )
          scalar(its:ite,k,jts:jte,5) = interp_0_log( profdustn, pd_in, p_level, nl_in )
+        ENDIF
       ENDDO
       print *, "DUST Q", scalar(its,:,jts,4)
@@ -875 +909 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   IF (planet .ne. "mars") THEN
     call read_dust(profdustq,profdustn,nl_in)
     DO k=1,kte!-1
@@ -888 +923 @@
        !print*,k,grid%m_q2(1,k,1)
     ENDDO
+   ENDIF
 
     IF (planet.eq."prescribed") Then
@@ -917 +953 @@
       ENDDO
       close(unit=20)
-    ENDIF
 
     open(unit=21,file="altitude.txt",action="write")
@@ -926 +961 @@
     ENDDO
     close(unit=21)
+    ENDIF
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -1002 +1038 @@
       real qvf, qvf1, dz
 
-      LOGICAL :: direct_from_file = .true.
+      LOGICAL :: direct_from_file
+
+      IF (planet == "mars") THEN
+        direct_from_file = .false.
+      ELSE
+        direct_from_file = .true.
+      ENDIF
 
 !  first, read the sounding