Changeset 1590 for trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys

Timestamp:

Aug 30, 2016, 3:04:29 PM (9 years ago)

Author:

aslmd

Message:

moved interface for outputs from module_lmd_driver to update_outputs_physiq_mod. updated the nophysics case by adding a case dynphy_wrf_void_lmd_new which will serve as a template for a physiq interface

Location:

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys

Files:

• dynphy_wrf_mars_lmd_new/update_outputs_physiq_mod.F (modified) (1 diff)
• dynphy_wrf_void_lmd_new (added)
• dynphy_wrf_void_lmd_new/callphysiq_mod.F (added)
• dynphy_wrf_void_lmd_new/iniphysiq_mod.F (added)
• dynphy_wrf_void_lmd_new/update_inputs_physiq_mod.F (added)
• dynphy_wrf_void_lmd_new/update_outputs_physiq_mod.F (added)
• module_lmd_driver.F.new (modified) (9 diffs)

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/dynphy_wrf_mars_lmd_new/update_outputs_physiq_mod.F

@@ -153 +153 @@
 END SUBROUTINE update_outputs_physiq_turb
 
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+SUBROUTINE update_outputs_physiq_diag( &
+            ims,ime,jms,jme,kms,kme,&
+            ips,ipe,jps,jpe,kps,kpe,&
+            SWDOWNZ,TAU_DUST,QSURFDUST,&
+            MTOT,ICETOT,TAU_ICE,&
+            HR_SW,HR_LW,&
+            RDUST,VMR_ICE,RICE)
+
+   USE comm_wrf !! to get fields to be written from physiq
+
+   INTEGER, INTENT(IN) :: ims,ime,jms,jme,kms,kme
+   INTEGER, INTENT(IN) :: ips,ipe,jps,jpe,kps,kpe
+   REAL, DIMENSION( ims:ime, jms:jme ), INTENT(INOUT) :: &
+     SWDOWNZ,TAU_DUST,QSURFDUST,&
+     MTOT,ICETOT,TAU_ICE
+   REAL, DIMENSION( ims:ime, kms:kme, jms:jme ), INTENT(INOUT ) :: &
+     HR_SW,HR_LW,RDUST,VMR_ICE,RICE
+   INTEGER :: i,j,subs
+
+   DO j = jps,jpe
+   DO i = ips,ipe
+
+     !-----------------------------------!
+     ! 1D subscript for physics "cursor" !
+     !-----------------------------------!
+     subs = (j-jps)*(ipe-ips+1)+(i-ips+1)
+
+     !! get diagnostics from physics
+     SWDOWNZ(i,j) = comm_SWDOWNZ(subs)
+     TAU_DUST(i,j) = comm_TAU_DUST(subs)
+     QSURFDUST(i,j) = comm_QSURFDUST(subs)
+     MTOT(i,j) = comm_MTOT(subs)
+     ICETOT(i,j) = comm_ICETOT(subs)
+     TAU_ICE(i,j) = comm_TAU_ICE(subs)
+     HR_SW(i,kps:kpe,j) = comm_HR_SW(subs,kps:kpe)
+     HR_LW(i,kps:kpe,j) = comm_HR_LW(subs,kps:kpe)
+     RDUST(i,kps:kpe,j) = comm_RDUST(subs,kps:kpe)
+     VMR_ICE(i,kps:kpe,j) = comm_VMR_ICE(subs,kps:kpe)
+     RICE(i,kps:kpe,j) = comm_RICE(subs,kps:kpe)
+
+   ENDDO
+   ENDDO
+
+   CALL deallocate_comm_wrf
+
+END SUBROUTINE update_outputs_physiq_diag
+
 END MODULE update_outputs_physiq_mod
 

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F.new

@@ -40 +40 @@
         isfflx, diff_opt, km_opt, &
         HISTORY_INTERVAL, &
-! sert a rien ce NOPHYS. il le faudrait sur tout.
-#ifndef NOPHYS
         HR_SW,HR_LW,SWDOWNZ,&
         TAU_DUST,RDUST,QSURFDUST,&
@@ -47 +45 @@
         HFMAX,ZMAX,&
         USTM,HFX,&
-#endif
         SLPX,SLPY,RESTART)
 ! NB: module_lmd_driver_output1.inc : output arguments generated from Registry
@@ -60 +57 @@
    USE module_model_constants
    USE module_wrf_error
-#ifndef NOPHYS
+   !!!!!!!! interface modules
    USE update_inputs_physiq_mod !! to set inputs for physiq
    USE update_outputs_physiq_mod !! to get outputs from physiq
-   USE comm_wrf !! to get fields to be written from physiq
    USE iniphysiq_mod !! to get iniphysiq subroutine
    USE callphysiq_mod !! to call the LMD physics
-#endif
+   !!!!!!!! interface modules
 
 !==================================================================
@@ -414 +410 @@
 !----------!
 ! inputs ...
-#ifndef NOPHYS
-CALL allocate_comm_wrf(ngrid,nlayer)
-#endif
 ALLOCATE(pplev(ngrid,nlayer+1))  !!!!!
 ALLOCATE(pplay(ngrid,nlayer))    !!!!!
@@ -447 +440 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-#ifndef NOPHYS
 !! INITIALIZE AND ALLOCATE EVERYTHING !! here, only firstcall
 allocation_firstcall: IF (firstcall .EQV. .true.) THEN
@@ -470 +462 @@
                      1./reradius,g,r_d,cp,1)
 ENDIF allocation_firstcall
-#endif
 
 !!*****************************!!
@@ -657 +648 @@
 pdt(:,:)=0.
 pdq(:,:,:)=0.
-#ifndef NOPHYS
 print *, '** ',planet_type,'** CALL TO LMD PHYSICS'
 !!!
@@ -676 +666 @@
                        pdu,pdv,pdt,pdq,pdpsrf)
 !!!
-#endif
 
 !! specific scenario. necessary to add the right amount of dust.
@@ -745 +734 @@
             M_Q2,M_WSTAR,&
             HFMAX,ZMAX,USTM,HFX)
-
-DO j = jps,jpe
-DO i = ips,ipe
-
-  subs = (j-jps)*(ipe-ips+1)+(i-ips+1)
-
-  !! output only (cf comm_wrf)
-  SWDOWNZ(i,j) = comm_SWDOWNZ(subs)
-  TAU_DUST(i,j) = comm_TAU_DUST(subs)
-  QSURFDUST(i,j) = comm_QSURFDUST(subs)
-  MTOT(i,j) = comm_MTOT(subs)
-  ICETOT(i,j) = comm_ICETOT(subs)
-  TAU_ICE(i,j) = comm_TAU_ICE(subs)
-  HR_SW(i,kps:kpe,j) = comm_HR_SW(subs,kps:kpe)
-  HR_LW(i,kps:kpe,j) = comm_HR_LW(subs,kps:kpe)
-  RDUST(i,kps:kpe,j) = comm_RDUST(subs,kps:kpe)
-  VMR_ICE(i,kps:kpe,j) = comm_VMR_ICE(subs,kps:kpe)
-  RICE(i,kps:kpe,j) = comm_RICE(subs,kps:kpe)
-
-ENDDO
-ENDDO
-
-CALL deallocate_comm_wrf
-
+!!!
+CALL update_outputs_physiq_diag( &
+            ims,ime,jms,jme,kms,kme,&
+            ips,ipe,jps,jpe,kps,kpe,&
+            SWDOWNZ,TAU_DUST,QSURFDUST,&
+            MTOT,ICETOT,TAU_ICE,&
+            HR_SW,HR_LW,&
+            RDUST,VMR_ICE,RICE)
+!!!
 ENDIF call_physics