Ignore:
Timestamp:
May 5, 2014, 11:38:51 AM (11 years ago)
Author:
aslmd
Message:

MESOSCALE. A necessary complement commit to r1234 where a upgraded interface making use of modules was proposed. Completed the new formulation for module_lmd_driver for newphys with improved interface with both ini/bdy conditions and physical parameterizations. Changed the Registry accordingly. Finished changes about I/O with the LMD physics (see LMDZ.MARS/README). Made all those changes compatible for old interface, and LES runs (checked with test cases), as well as old input files. Changed makemeso to account for full flexibility on changin nx ny ntracers nproc with newphys. Cleaned the now obsolete bits of code used in LMD physics shared with the GCM. ----- Everything is now ready to properly code both restart runs and nesting for mesoscale runs with new physics.

Location:
trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r1212 r1236  
    2929        num_3d_s,SCALAR, &
    3030        MARS_MODE, &
    31         MARS_ALB,MARS_TI,MARS_CICE,MARS_EMISS, &
    32         MARS_WICE, &
    33         MARS_TSOIL, &
    34         MARS_Q2, &
    35         MARS_TSURF, &
    36 #ifdef NEWPHYS
    37         MARS_FLUXRAD, &
    38         MARS_WSTAR, &
    39         MARS_ISOIL, &
    40         MARS_DSOIL, &
    41         MARS_Z0, &
     31        M_ALBEDO,M_TI,M_CO2ICE,M_EMISS, &
     32        M_H2OICE, &
     33        M_TSOIL, &
     34        M_Q2, &
     35        M_TSURF, &
     36#ifdef NEWPHYS
     37        M_FLUXRAD, &
     38        M_WSTAR, &
     39        M_ISOIL, &
     40        M_DSOIL, &
     41        M_Z0, &
    4242        CST_Z0, &
    4343#endif
    44         MARS_GW, &
     44        M_GW, &
    4545        NUM_SOIL_LAYERS, &
    4646        CST_AL, &
    … …  
    4949        diff_opt, &
    5050        km_opt, &
    51         UAVE, USTD, &
    52         VAVE, VSTD, &
    53         WAVE, WSTD, &
    54         TAVE, TSTD, &
    5551        HISTORY_INTERVAL, &
    5652#ifndef NOPHYS
    … …  
    119115     MSFT,MSFU,MSFV, &
    120116     XLAT,XLONG,HT,  &
    121      MARS_ALB,MARS_TI,MARS_EMISS, &
     117     M_ALBEDO,M_TI,M_EMISS, &
    122118     SLPX,SLPY
    123119REAL, DIMENSION( ims:ime, jms:jme ), INTENT(INOUT   )  :: &
    124      MARS_CICE,MARS_WICE, &
    125      MARS_TSURF
     120     M_CO2ICE,M_H2OICE, &
     121     M_TSURF
    126122! 3D arrays
    127123REAL, DIMENSION( ims:ime, kms:kme, jms:jme ), INTENT(IN ) :: &
    128124     dz8w,p8w,p,exner,t,t8w,rho,u,v,w,z,th
    129125REAL, DIMENSION( ims:ime, kms:kme+1, jms:jme ), INTENT(INOUT ) :: &
    130      MARS_Q2
     126     M_Q2
    131127!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    132 REAL, DIMENSION( ims:ime, kms:kme, jms:jme ), INTENT(INOUT ) :: &
    133      UAVE, USTD, VAVE, VSTD, WAVE, WSTD, TAVE, TSTD
    134128INTEGER, INTENT(IN   ) :: HISTORY_INTERVAL
    135129!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    136130REAL, DIMENSION( ims:ime, NUM_SOIL_LAYERS, jms:jme ), INTENT(INOUT )  :: &
    137      MARS_TSOIL
     131     M_TSOIL
    138132#ifdef NEWPHYS
    139133REAL, INTENT(IN  ) :: CST_Z0
    140134REAL, DIMENSION( ims:ime, NUM_SOIL_LAYERS, jms:jme ), INTENT(IN   )  :: &
    141      MARS_ISOIL, MARS_DSOIL         
     135     M_ISOIL, M_DSOIL         
    142136REAL, DIMENSION( ims:ime, jms:jme ), INTENT(IN   )  :: &
    143      MARS_Z0
     137     M_Z0
    144138REAL, DIMENSION( ims:ime, jms:jme ), INTENT(INOUT   )  :: &
    145      MARS_FLUXRAD,MARS_WSTAR
     139     M_FLUXRAD,M_WSTAR
    146140#endif
    147141REAL, DIMENSION( ims:ime, 5, jms:jme ), INTENT(IN   )  :: &
    148      MARS_GW
     142     M_GW
    149143! 4D arrays
    150144INTEGER, INTENT(IN ) :: num_3d_s
    … …  
    924918!-----------------------------------------!
    925919IF (JULYR .ne. 9999) THEN
    926  zmea_val=MARS_GW(i,1,j)
    927  zstd_val=MARS_GW(i,2,j)
    928  zsig_val=MARS_GW(i,3,j)
    929  zgam_val=MARS_GW(i,4,j)
    930  zthe_val=MARS_GW(i,5,j)
     920 zmea_val=M_GW(i,1,j)
     921 zstd_val=M_GW(i,2,j)
     922 zsig_val=M_GW(i,3,j)
     923 zgam_val=M_GW(i,4,j)
     924 zthe_val=M_GW(i,5,j)
    931925ELSE
    932926 IF ( (i == ips) .AND. (j == jps) ) PRINT *,'** Mars ** IDEALIZED SIMULATION GWdrag OFF'
    … …  
    943937IF (JULYR .ne. 9999) THEN
    944938 IF (CST_AL == 0) THEN
    945  albedodat_val=MARS_ALB(i,j)
     939 albedodat_val=M_ALBEDO(i,j)
    946940 ELSE
    947941 albedodat_val=CST_AL
    … …  
    949943 ENDIF
    950944 IF (CST_TI == 0) THEN
    951  inertiedat_val=MARS_TI(i,j)
     945 inertiedat_val=M_TI(i,j)
    952946 ELSE
    953947 inertiedat_val=CST_TI
    … …  
    967961IF (JULYR .ne. 9999) THEN
    968962 IF (CST_Z0 == 0) THEN
    969    z0_val = MARS_Z0(i,j)
     963   z0_val = M_Z0(i,j)
    970964 ELSE
    971965   z0_val = CST_Z0
    … …  
    999993! Ground temperature, emissivity, CO2 ice cover !
    1000994!-----------------------------------------------!
    1001 IF (.not. restart) THEN
    1002    tsurf_val=tsk(i,j) ! because tsk is not updated in lmd_driver, the stored value in restart is at t, not t+dt
    1003                       ! note to aslmd: i dont know why we dont update tsk, so I use MARS_TSURF to be conservative
    1004 ELSE
    1005    tsurf_val=MARS_TSURF(i,j)
    1006 ENDIF
    1007 emis_val=MARS_EMISS(i,j)
    1008 co2ice_val=MARS_CICE(i,j)
     995IF (M_TSURF(i,j) .gt. 0.) THEN
     996  tsurf_val=M_TSURF(i,j)
     997ELSE
     998  tsurf_val=TSK(i,j) ! retro-compatibility
     999ENDIF
     1000emis_val=M_EMISS(i,j)
     1001co2ice_val=M_CO2ICE(i,j)
    10091002
    10101003!------------------------!
    … …  
    10121005!------------------------!
    10131006IF (JULYR .ne. 9999) THEN
    1014   IF (MARS_TSOIL(i,1,j) .gt. 0.) THEN
    1015    tsoil_val(:)=MARS_TSOIL(i,:,j)
     1007  IF (M_TSOIL(i,1,j) .gt. 0.) THEN
     1008   tsoil_val(:)=M_TSOIL(i,:,j)
    10161009  ELSE
    10171010   tsoil_val = tsoil_val*0. + tsurf_val
    10181011  ENDIF
    10191012#ifdef NEWPHYS
    1020   isoil_val(:)=MARS_ISOIL(i,:,j)
    1021   dsoil_val(:)=MARS_DSOIL(i,:,j)
     1013  isoil_val(:)=M_ISOIL(i,:,j)
     1014  dsoil_val(:)=M_DSOIL(i,:,j)
    10221015#endif
    10231016ELSE
    … …  
    10281021   ELSE
    10291022     !this is a restart run. We must not set tsoil to tsurf in the init.
    1030      !tsoil was saved in physiq.F under the name MARS_TSOIL in the restart file
     1023     !tsoil was saved in physiq.F under the name M_TSOIL in the restart file
    10311024     !(see Registry)
    1032      tsoil_val(k)=MARS_TSOIL(i,k,j)
     1025     tsoil_val(k)=M_TSOIL(i,k,j)
    10331026   ENDIF
    10341027
    … …  
    10551048    CASE(1)
    10561049    qsurf_val(1)=0.
    1057     qsurf_val(2)=MARS_WICE(i,j)    !! logique avec wtnom(2) = 'h2o_ice' defini ci-dessus
     1050    qsurf_val(2)=M_H2OICE(i,j)    !! logique avec wtnom(2) = 'h2o_ice' defini ci-dessus
    10581051                                   !! ----- retrocompatible ancienne physique
    10591052                                   !! ----- [H2O ice is last tracer in qsurf in LMD physics]
    … …  
    10661059    CASE(11)
    10671060    qsurf_val(1)=0.
    1068     qsurf_val(2)=MARS_WICE(i,j)    !! logique avec wtnom(2) = 'h2o_ice' defini ci-dessus
     1061    qsurf_val(2)=M_H2OICE(i,j)    !! logique avec wtnom(2) = 'h2o_ice' defini ci-dessus
    10691062    qsurf_val(3)=0.                !! not coupled with lifting for the moment [non remobilise]
    10701063    qsurf_val(4)=0.
    10711064    CASE(12)   
    10721065    qsurf_val(1)=0.
    1073     qsurf_val(2)=MARS_WICE(i,j)    !! logique avec wtnom(2) = 'h2o_ice' defini ci-dessus
     1066    qsurf_val(2)=M_H2OICE(i,j)    !! logique avec wtnom(2) = 'h2o_ice' defini ci-dessus
    10741067    qsurf_val(3)=0.                !! not coupled with lifting for the moment [non remobilise]
    10751068    qsurf_val(4)=0.
    … …  
    11561149#endif
    11571150ELSE
    1158    q2_val(:)=MARS_Q2(i,:,j)
    1159 #ifdef NEWPHYS
    1160    fluxrad_val=MARS_FLUXRAD(i,j)
    1161    wstar_val=MARS_WSTAR(i,j)
     1151   q2_val(:)=M_Q2(i,:,j)
     1152#ifdef NEWPHYS
     1153   fluxrad_val=M_FLUXRAD(i,j)
     1154   wstar_val=M_WSTAR(i,j)
    11621155#endif
    11631156ENDIF
    … …  
    15241517#ifndef NORESTART
    15251518#ifdef SPECIAL_NEST_SAVE
    1526 MARS_TSOIL(i,:,j)=save_tsoil_restart(subs,:,id)
    1527 MARS_CICE(i,j)=save_co2ice_restart(subs,id)
    1528 MARS_Q2(i,kps:kpe+1,j)=save_q2_restart(subs,:,id)
     1519M_TSOIL(i,:,j)=save_tsoil_restart(subs,:,id)
     1520M_CO2ICE(i,j)=save_co2ice_restart(subs,id)
     1521M_Q2(i,kps:kpe+1,j)=save_q2_restart(subs,:,id)
    15291522SELECT CASE (MARS_MODE)
    15301523   CASE (1,11,12)
    1531      MARS_WICE(i,j)=save_qsurf_restart(subs,2,id)  !! see above Tracer at surface
     1524     M_H2OICE(i,j)=save_qsurf_restart(subs,2,id)  !! see above Tracer at surface
    15321525END SELECT
    1533 MARS_TSURF(i,j)=save_tsurf_restart(subs,id)
    1534 #ifdef NEWPHYS
    1535 MARS_WSTAR(i,j)=save_wstar_restart(subs,id)
    1536 MARS_FLUXRAD(i,j)=save_fluxrad_restart(subs,id)
     1526M_TSURF(i,j)=save_tsurf_restart(subs,id)
     1527#ifdef NEWPHYS
     1528M_WSTAR(i,j)=save_wstar_restart(subs,id)
     1529M_FLUXRAD(i,j)=save_fluxrad_restart(subs,id)
    15371530#endif
    15381531#else
    1539 MARS_TSOIL(i,:,j)=save_tsoil_restart(subs,:)
    1540 MARS_CICE(i,j)=save_co2ice_restart(subs)
    1541 MARS_Q2(i,kps:kpe+1,j)=save_q2_restart(subs,:)
     1532M_TSOIL(i,:,j)=save_tsoil_restart(subs,:)
     1533M_CO2ICE(i,j)=save_co2ice_restart(subs)
     1534M_Q2(i,kps:kpe+1,j)=save_q2_restart(subs,:)
    15421535SELECT CASE (MARS_MODE)
    15431536   CASE (1,11,12)
    1544      MARS_WICE(i,j)=save_qsurf_restart(subs,2)  !! see above Tracer at surface
     1537     M_H2OICE(i,j)=save_qsurf_restart(subs,2)  !! see above Tracer at surface
    15451538END SELECT
    1546 MARS_TSURF(i,j)=save_tsurf_restart(subs)
    1547 #ifdef NEWPHYS
    1548 MARS_WSTAR(i,j)=save_wstar_restart(subs)
    1549 MARS_FLUXRAD(i,j)=save_fluxrad_restart(subs)
     1539M_TSURF(i,j)=save_tsurf_restart(subs)
     1540#ifdef NEWPHYS
     1541M_WSTAR(i,j)=save_wstar_restart(subs)
     1542M_FLUXRAD(i,j)=save_fluxrad_restart(subs)
    15501543#endif
    15511544#endif

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

    r1234 r1236  
    3030        num_3d_s,SCALAR, &
    3131        MARS_MODE, &
    32         MARS_ALB,MARS_TI,MARS_CICE,MARS_EMISS, &
    33         MARS_WICE, &
    34         MARS_TSOIL, &
    35         MARS_Q2, &
    36         MARS_TSURF, &
    37         MARS_FLUXRAD, &
    38         MARS_WSTAR, &
    39         MARS_ISOIL, &
    40         MARS_DSOIL, &
    41         MARS_Z0, &
    42         CST_Z0, &
    43         MARS_GW, &
     32        M_ALBEDO,M_TI,M_CO2ICE,M_EMISS, &
     33        M_H2OICE,M_TSOIL,M_Q2,M_TSURF, &
     34        M_FLUXRAD,M_WSTAR,M_ISOIL,M_DSOIL,&
     35        M_Z0, CST_Z0, M_GW, &
    4436        NUM_SOIL_LAYERS, &
    45         CST_AL, &
    46         CST_TI, &
    47         isfflx, &
    48         diff_opt, &
    49         km_opt, &
    50         UAVE, USTD, &
    51         VAVE, VSTD, &
    52         WAVE, WSTD, &
    53         TAVE, TSTD, &
     37        CST_AL, CST_TI, &
     38        isfflx, diff_opt, km_opt, &
    5439        HISTORY_INTERVAL, &
     40! sert a rien ce NOPHYS. il le faudrait sur tout.
    5541#ifndef NOPHYS
    56 #include "module_lmd_driver_output1.inc"
     42        HR_SW,HR_LW,SWDOWNZ,&
     43        TAU_DUST,RDUST,QSURFDUST,&
     44        MTOT,ICETOT,VMR_ICE,TAU_ICE,RICE,&
     45        HFMAX,ZMAX,&
     46        USTM,HFX,&
    5747#endif
    5848        SLPX,SLPY,RESTART)
    … …  
    8373                        peri_day,obliquit,emin_turb, &
    8474                        lmixmin
    85    use turb_mod, only: q2,wstar,hfmax_th
     75   use turb_mod, only: q2,wstar,ustar,sensibFlux,&
     76                       hfmax_th,zmax_th,turb_resolved
    8677   use dimradmars_mod, only: fluxrad
    8778   use tracer_mod, only: noms
    8879   use comcstfi_h, only: omeg,mugaz
    8980   use comgeomfi_h, only: ini_fillgeom
     81   USE comm_wrf
    9082#endif
    9183
    … …  
    9385  IMPLICIT NONE
    9486!==================================================================
    95 
    96 !==================================================================
    97 ! COMMON
    98 !==================================================================
    99 
    100 #ifndef NOPHYS
    101 !
    102 ! INCLUDE AUTOMATIQUEMENT GENERE A PARTIR DU REGISTRY
    103 !
    104 include "../mars_lmd/libf/phymars/wrf_output_2d.h"
    105 include "../mars_lmd/libf/phymars/wrf_output_3d.h"
    106 #endif
    10787
    10888!==================================================================
    … …  
    124104REAL, INTENT(IN  ) :: CST_AL, CST_TI
    125105REAL, INTENT(IN  ) :: PTOP
     106INTEGER, INTENT(IN   ) :: HISTORY_INTERVAL
    126107! 2D arrays         
    127 REAL, DIMENSION( ims:ime, jms:jme ), INTENT(IN   )  :: &
     108REAL, DIMENSION( ims:ime, jms:jme ), INTENT(INOUT)  :: &
    128109     MSFT,MSFU,MSFV, &
    129110     XLAT,XLONG,HT,  &
    130      MARS_ALB,MARS_TI,MARS_EMISS, &
    131      SLPX,SLPY
    132 REAL, DIMENSION( ims:ime, jms:jme ), INTENT(INOUT   )  :: &
    133      MARS_CICE,MARS_WICE, &
    134      MARS_TSURF
     111     M_ALBEDO,M_TI,M_EMISS, &
     112     SLPX,SLPY, &
     113     M_CO2ICE,M_H2OICE, &
     114     M_TSURF, M_Z0, &
     115     M_FLUXRAD,M_WSTAR, &
     116     PSFC,TSK
     117REAL, DIMENSION( ims:ime, jms:jme ), INTENT(OUT) :: &
     118     SWDOWNZ,&
     119     TAU_DUST,QSURFDUST,&
     120     MTOT,ICETOT,TAU_ICE,&
     121     HFMAX,ZMAX,&
     122     USTM,HFX
    135123! 3D arrays
    136124REAL, DIMENSION( ims:ime, kms:kme, jms:jme ), INTENT(IN ) :: &
    137125     dz8w,p8w,p,exner,t,t8w,rho,u,v,w,z,th
     126REAL, DIMENSION( ims:ime, kms:kme, jms:jme ), INTENT(OUT ) :: &
     127     RTHBLTEN,RUBLTEN,RVBLTEN, &
     128     HR_SW,HR_LW,RDUST,VMR_ICE,RICE
    138129REAL, DIMENSION( ims:ime, kms:kme+1, jms:jme ), INTENT(INOUT ) :: &
    139      MARS_Q2
    140 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    141 REAL, DIMENSION( ims:ime, kms:kme, jms:jme ), INTENT(INOUT ) :: &
    142      UAVE, USTD, VAVE, VSTD, WAVE, WSTD, TAVE, TSTD
    143 INTEGER, INTENT(IN   ) :: HISTORY_INTERVAL
    144 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     130     M_Q2
    145131REAL, DIMENSION( ims:ime, NUM_SOIL_LAYERS, jms:jme ), INTENT(INOUT )  :: &
    146      MARS_TSOIL
     132     M_TSOIL,M_ISOIL, M_DSOIL
    147133REAL, INTENT(IN  ) :: CST_Z0
    148 REAL, DIMENSION( ims:ime, NUM_SOIL_LAYERS, jms:jme ), INTENT(IN   )  :: &
    149      MARS_ISOIL, MARS_DSOIL         
    150 REAL, DIMENSION( ims:ime, jms:jme ), INTENT(IN   )  :: &
    151      MARS_Z0
    152 REAL, DIMENSION( ims:ime, jms:jme ), INTENT(INOUT   )  :: &
    153      MARS_FLUXRAD,MARS_WSTAR
    154134REAL, DIMENSION( ims:ime, 5, jms:jme ), INTENT(IN   )  :: &
    155      MARS_GW
     135     M_GW
    156136! 4D arrays
    157137INTEGER, INTENT(IN ) :: num_3d_s
    … …  
    160140! Logical
    161141LOGICAL, INTENT(IN ) :: restart
    162 
    163 !-------------------------------------------
    164 ! OUTPUT VARIABLES
    165 !-------------------------------------------
    166 !
    167 ! Generated from Registry
    168 !
    169 ! default definitions :
    170 ! 2D : TSK, PSFC
    171 ! 3D : RTHBLTEN,RUBLTEN,RVBLTEN
    172 #ifndef NOPHYS
    173 #include "module_lmd_driver_output2.inc"
    174    REAL, DIMENSION(:,:), ALLOCATABLE :: output_tab2d
    175    REAL, DIMENSION(:,:,:), ALLOCATABLE :: output_tab3d
    176 #else
    177    REAL, DIMENSION( ims:ime, jms:jme ), INTENT(INOUT)  :: PSFC,TSK
    178    REAL, DIMENSION( ims:ime, kms:kme, jms:jme ), INTENT(OUT)  :: RTHBLTEN,RUBLTEN,RVBLTEN
    179 #endif
    180 !-------------------------------------------
    181 ! OUTPUT VARIABLES
    182 !-------------------------------------------
    183 
    184142
    185143!-------------------------------------------   
    … …  
    201159   REAL :: aire_val,lat_val,lon_val
    202160   REAL :: phisfi_val,albedodat_val,inertiedat_val
    203    REAL :: tsurf_val,co2ice_val,emis_val
    204161   REAL :: zmea_val,zstd_val,zsig_val,zgam_val,zthe_val
    205162   REAL :: theta_val, psi_val
    … …  
    230187   INTEGER :: test
    231188   REAL :: wappel_phys
    232    LOGICAL :: flag_LES
    233189   LOGICAL, SAVE :: flag_first_restart
    234190!**************************************************
    … …  
    270226
    271227IF (JULYR .ne. 9999) THEN
    272     flag_LES = .false.  ! "True" LES is not available in this version
     228    turb_resolved = .false.  ! "True" LES is not available in this version
    273229    PRINT *, '*** REAL-CASE SIMULATION ***'
    274230ELSE
    … …  
    278234          PRINT *, '*** diff_opt = 2 *** km_opt = 2'
    279235          PRINT *, '*** forcing is isfflx = ',isfflx
    280           flag_LES = .true.
     236          turb_resolved = .true.
    281237          !! SPECIAL LES
    282238     ELSE
    … …  
    284240          PRINT *, '*** diff_opt = ',diff_opt
    285241          PRINT *, '*** km_opt = ',km_opt
    286           flag_LES = .false.
     242          turb_resolved = .false.
    287243          !! IDEALIZED, no LES
    288244          !! cependant, ne veut-on pas pouvoir
    … …  
    302258jte = j_end(num_tiles)
    303259!!
    304 IF (flag_LES .eqv. .false.) THEN
     260IF (turb_resolved .eqv. .false.) THEN
    305261 relax=0
    306262 sponge_top=0               ! another value than 0 triggers instabilities 
    … …  
    311267jps=jts
    312268jpe=jte
    313 IF (flag_LES .eqv. .false.) THEN
     269IF (turb_resolved .eqv. .false.) THEN
    314270 IF (ips .eq. ids)   ips=its+relax !! IF tests necesary for parallel runs
    315271 IF (ipe .eq. ide-1) ipe=ite-relax
    … …  
    318274ENDIF
    319275kps=kts         !! start at surface
    320 IF (flag_LES .eqv. .false.) THEN
     276IF (turb_resolved .eqv. .false.) THEN
    321277 kpe=kte-sponge_top
    322278ELSE
    … …  
    492448! inputs ...
    493449#ifndef NOPHYS
    494 ALLOCATE(output_tab2d(ngrid,n2d))
    495 ALLOCATE(output_tab3d(ngrid,nlayer,n3d))
     450CALL allocate_comm_wrf(ngrid,nlayer)
    496451#endif
    497452ALLOCATE(q2_val(nlayer+1))
    … …  
    841796IF (JULYR .ne. 9999) THEN
    842797 IF (CST_AL == 0) THEN
    843  albedodat_val=MARS_ALB(i,j)
     798 albedodat_val=M_ALBEDO(i,j)
    844799 ELSE
    845800 albedodat_val=CST_AL
    … …  
    855810!-----------------------------------------!
    856811IF (JULYR .ne. 9999) THEN
    857  zmea_val=MARS_GW(i,1,j)
    858  zstd_val=MARS_GW(i,2,j)
    859  zsig_val=MARS_GW(i,3,j)
    860  zgam_val=MARS_GW(i,4,j)
    861  zthe_val=MARS_GW(i,5,j)
     812 zmea_val=M_GW(i,1,j)
     813 zstd_val=M_GW(i,2,j)
     814 zsig_val=M_GW(i,3,j)
     815 zgam_val=M_GW(i,4,j)
     816 zthe_val=M_GW(i,5,j)
    862817ELSE
    863818 IF ( (i == ips) .AND. (j == jps) ) PRINT *,'** Mars ** IDEALIZED SIMULATION GWdrag OFF'
    … …  
    880835IF (JULYR .ne. 9999) THEN
    881836 IF (CST_Z0 == 0) THEN
    882    z0_val = MARS_Z0(i,j)
     837   z0_val = M_Z0(i,j)
    883838 ELSE
    884839   z0_val = CST_Z0
    … …  
    905860! Ground temperature, emissivity, CO2 ice cover !
    906861!-----------------------------------------------!
    907 IF (.not. restart) THEN
    908    tsurf_val=tsk(i,j) ! because tsk is not updated in lmd_driver, the stored value in restart is at t, not t+dt
    909                       ! note to aslmd: i dont know why we dont update tsk, so I use MARS_TSURF to be conservative
    910 ELSE
    911    tsurf_val=MARS_TSURF(i,j)
    912 ENDIF
    913 tsurf(subs) = tsurf_val
    914 emis(subs) = MARS_EMISS(i,j)
    915 co2ice(subs) = MARS_CICE(i,j)
     862tsurf(subs) = M_TSURF(i,j)
     863emis(subs) = M_EMISS(i,j)
     864co2ice(subs) = M_CO2ICE(i,j)
    916865!-------------------!
    917866! Tracer at surface !
    … …  
    920869SELECT CASE (MARS_MODE)
    921870    CASE(1)
    922     qsurf_val(2)=MARS_WICE(i,j)    !! logique avec noms(2) = 'h2o_ice' defini ci-dessus
     871    qsurf_val(2)=M_H2OICE(i,j)    !! logique avec noms(2) = 'h2o_ice' defini ci-dessus
    923872                                   !! ----- retrocompatible ancienne physique
    924873                                   !! ----- [H2O ice is last tracer in qsurf in LMD physics]
    … …  
    929878    qsurf_val(2)=q_prof(1,2)     
    930879    CASE(11)
    931     qsurf_val(2)=MARS_WICE(i,j)    !! logique avec noms(2) = 'h2o_ice' defini ci-dessus
     880    qsurf_val(2)=M_H2OICE(i,j)    !! logique avec noms(2) = 'h2o_ice' defini ci-dessus
    932881    qsurf_val(3)=0.                !! not coupled with lifting for the moment [non remobilise]
    933882    CASE(12)
    934     qsurf_val(2)=MARS_WICE(i,j)    !! logique avec noms(2) = 'h2o_ice' defini ci-dessus
     883    qsurf_val(2)=M_H2OICE(i,j)    !! logique avec noms(2) = 'h2o_ice' defini ci-dessus
    935884    qsurf_val(3)=0.                !! not coupled with lifting for the moment [non remobilise]
    936885END SELECT
    … …  
    945894IF (JULYR .ne. 9999) THEN
    946895 IF (CST_TI == 0) THEN
    947  inertiedat_val=MARS_TI(i,j)
     896 inertiedat_val=M_TI(i,j)
    948897 ELSE
    949898 inertiedat_val=CST_TI
    … …  
    957906!--pb de dimensions???!!???
    958907IF (JULYR .ne. 9999) THEN
    959   isoil_val(:)=MARS_ISOIL(i,:,j)
    960   dsoil_val(:)=MARS_DSOIL(i,:,j)
     908  isoil_val(:)=M_ISOIL(i,:,j)
     909  dsoil_val(:)=M_DSOIL(i,:,j)
    961910ELSE
    962911   IF ( nsoil .lt. 18 ) THEN
    … …  
    986935! Deep soil temperatures !
    987936!------------------------!
    988 IF (JULYR .ne. 9999) THEN
    989   IF (MARS_TSOIL(i,1,j) .gt. 0.) THEN
    990    tsoil_val(:)=MARS_TSOIL(i,:,j)
    991   ELSE
    992    tsoil_val = tsoil_val*0. + tsurf_val
    993   ENDIF
    994 ELSE
    995   IF ( (i == ips) .AND. (j == jps) ) PRINT *,'** Mars ** IDEALIZED SIMULATION tsoil is set to tsurf'
     937IF (M_TSOIL(i,1,j) .gt. 0. .and. JULYR .ne. 9999) THEN
     938  tsoil_val(:)=M_TSOIL(i,:,j)
     939ELSE
     940  IF ( (i == ips) .AND. (j == jps) ) PRINT *,'** Mars ** no tsoil. set it to tsurf.'
    996941  do k=1,nsoil
    997    IF (.not.restart) THEN
    998      tsoil_val(k) = tsurf_val
    999    ELSE
    1000      !this is a restart run. We must not set tsoil to tsurf in the init.
    1001      !tsoil was saved in physiq.F under the name MARS_TSOIL in the restart file
    1002      !(see Registry)
    1003      tsoil_val(k)=MARS_TSOIL(i,k,j)
    1004    ENDIF
     942   tsoil_val(k) = M_TSURF(i,j)
    1005943  enddo
    1006944ENDIF
    … …  
    1014952   wstar_val=0.
    1015953ELSE
    1016    q2_val(:)=MARS_Q2(i,:,j)
    1017    wstar_val=MARS_WSTAR(i,j)
     954   q2_val(:)=M_Q2(i,:,j)
     955   wstar_val=M_WSTAR(i,j)
    1018956ENDIF
    1019957q2(subs,:) = q2_val(:)
    … …  
    1026964   fluxrad_val=0.
    1027965ELSE
    1028    fluxrad_val=MARS_FLUXRAD(i,j)
     966   fluxrad_val=M_FLUXRAD(i,j)
    1029967ENDIF
    1030968fluxrad(subs) = fluxrad_val
    … …  
    11071045             firstcall,lastcall,pday,ptime,ptimestep, &
    11081046             pplev,pplay,pphi,pu,pv,pt,pq,pw,         &
    1109              pdu,pdv,pdt,pdq,pdpsrf,tracerdyn,        &
    1110              output_tab2d,output_tab3d,flag_LES)
     1047             pdu,pdv,pdt,pdq,pdpsrf,tracerdyn)
    11111048#endif
     1049print *, '** Mars ** CALL TO LMD PHYSICS DONE'
    11121050DEALLOCATE(pplev)
    11131051DEALLOCATE(pplay)
    … …  
    11181056DEALLOCATE(pw)
    11191057DEALLOCATE(pq)
    1120 
    1121 !-------------------------------!
    1122 ! PHYSIQ OUTPUT IN THE WRF FILE !
    1123 !-------------------------------!
    1124 #ifndef NOPHYS
    1125 DO j = jps,jpe
    1126 DO i = ips,ipe
    1127 subs = (j-jps)*(ipe-ips+1)+(i-ips+1)
    1128 #include "module_lmd_driver_output3.inc" 
    1129        !  ^-- generated from Registry
    1130 ENDDO
    1131 ENDDO
    1132 DEALLOCATE(output_tab2d)
    1133 DEALLOCATE(output_tab3d)
    1134 #endif
    11351058
    11361059!---------------------------------------------------------------------------------!
    … …  
    11501073dq_save(:,:,:)=pdq(:,:,:)
    11511074#endif
     1075
     1076!! OUTPUT OUTPUT OUTPUT
     1077DO j = jps,jpe
     1078DO i = ips,ipe
     1079
     1080  subs = (j-jps)*(ipe-ips+1)+(i-ips+1)
     1081
     1082  !-------------------------------------------------------!
     1083  ! Save key variables for restart and output and nesting ! 
     1084  !-------------------------------------------------------!
     1085  M_TSOIL(i,:,j) = tsoil(subs,:)
     1086  M_CO2ICE(i,j) = co2ice(subs)
     1087  M_Q2(i,kps:kpe+1,j) = q2(subs,:)
     1088  M_TSURF(i,j) = tsurf(subs)
     1089  M_WSTAR(i,j) = wstar(subs)
     1090  M_FLUXRAD(i,j) = fluxrad(subs)
     1091  SELECT CASE (MARS_MODE)
     1092   CASE (1,11,12)
     1093     M_H2OICE(i,j) = qsurf(subs,2)  !! see above Tracer at surface
     1094  END SELECT
     1095
     1096  !! output only (arrays already in phys modules)
     1097  HFMAX(i,j) = HFMAX_TH(subs)
     1098  ZMAX(i,j) = ZMAX_TH(subs)
     1099  USTM(i,j) = ustar(subs)
     1100  HFX(i,j) = sensibFlux(subs)
     1101
     1102  !! output only (cf comm_wrf)
     1103  SWDOWNZ(i,j) = comm_SWDOWNZ(subs)
     1104  TAU_DUST(i,j) = comm_TAU_DUST(subs)
     1105  QSURFDUST(i,j) = comm_QSURFDUST(subs)
     1106  MTOT(i,j) = comm_MTOT(subs)
     1107  ICETOT(i,j) = comm_ICETOT(subs)
     1108  TAU_ICE(i,j) = comm_TAU_ICE(subs)
     1109  HR_SW(i,kps:kpe,j) = comm_HR_SW(subs,kps:kpe)
     1110  HR_LW(i,kps:kpe,j) = comm_HR_LW(subs,kps:kpe)
     1111  RDUST(i,kps:kpe,j) = comm_RDUST(subs,kps:kpe)
     1112  VMR_ICE(i,kps:kpe,j) = comm_VMR_ICE(subs,kps:kpe)
     1113  RICE(i,kps:kpe,j) = comm_RICE(subs,kps:kpe)
     1114
     1115ENDDO
     1116ENDDO
     1117
     1118CALL deallocate_comm_wrf
     1119
    11521120ENDIF call_physics
    11531121
    … …  
    12061174  END SELECT
    12071175   
    1208   !------------------------------------!
    1209   ! Save key variables for restart ! 
    1210   !------------------------------------!
    1211   MARS_TSOIL(i,:,j) = tsoil(subs,:)
    1212   MARS_CICE(i,j) = co2ice(subs)
    1213   MARS_Q2(i,kps:kpe+1,j) = q2(subs,:)
    1214   MARS_TSURF(i,j) = tsurf(subs)
    1215   MARS_WSTAR(i,j) = wstar(subs)
    1216   MARS_FLUXRAD(i,j) = fluxrad(subs)
    1217   SELECT CASE (MARS_MODE)
    1218    CASE (1,11,12)
    1219      MARS_WICE(i,j) = qsurf(subs,2)  !! see above Tracer at surface
    1220   END SELECT
    1221 
    12221176ENDDO
    12231177ENDDO
Note: See TracChangeset for help on using the changeset viewer.