Changeset 86 for trunk/mars/libf/phymars


Ignore:
Timestamp:
Mar 3, 2011, 12:38:49 PM (14 years ago)
Author:
aslmd
Message:

*
mars + LMD_MM_MARS * Precompilation flag MESOSCALE for better transparency

* in shared phymars between GCM and mesoscale model

*

M 85 mars/libf/phymars/meso_physiq.F
M 85 mars/libf/phymars/meso_inifis.F
Added a pre-compilation flag MESOSCALE so that the LMDZ.MARS GCM
will compile without stating errors because of mesoscale routines.

M 85 mars/libf/phymars/newcondens.F
M 85 mars/libf/phymars/testphys1d.F
M 85 mars/libf/phymars/dustlift.F
D 85 mars/libf/phymars/meso_testphys1d.F
D 85 mars/libf/phymars/meso_dustlift.F
D 85 mars/libf/phymars/meso_newcondens.F
Now, this MESOSCALE precompilation flag can be used to lower
the number of meso_* routines when adaptations for mesoscale
applications are not very extended.
--> Three meso_* routines were deleted and changes are
now impacted under the MESOSCALE flag in the original GCM routines
--> Completely transparent for GCM compilation since it is devoid
of the -DMESOSCALE option
--> Very good for syncing because changes in dustlift, newcondens
will be directly available in the mesoscale model

M 84 mesoscale/LMD_MM_MARS/makemeso
Changed meso_testphys1d in testphys1d

M 84 mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_pgf
M 84 mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_mpifort
M 84 mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_ifort
M 84 mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_g95
M 84 mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_mpi
Added the option -DMESOSCALE in these scripts

*
LMD_MM_MARS * Various minor changes related to water cycle and plotting routines

* Also included the GW test case

*

A 0 mesoscale/LMDZ.MARS.new/myGCM/DEFS_JB/callphys.def.orig
M 84 mesoscale/NOTES.txt
D 84 mesoscale/LMD_MM_MARS/SRC/ARWpost/idl
M 84 mesoscale/LMD_MM_MARS/SRC/WRFV2/Registry/Registry.EM
M 84 mesoscale/LMD_MM_MARS/SIMU/gnome_launch.meso
M 85 mesoscale/PLOT/MINIMAL/map_latlon.pro
D 85 mesoscale/PLOT/SPEC/LES/getget.pro
M 85 mesoscale/PLOT/SPEC/MAP/map_uvt.pro
A + - mesoscale/PLOT/SPEC/getget.pro
A 0 mesoscale/PLOT/RESERVE/obsolete
A 0 mesoscale/TESTS/TESTGW.tar.gz
M 84 000-USERS

Location:
trunk/mars/libf/phymars
Files:
3 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/mars/libf/phymars/dustlift.F

    r38 r86  
    1       SUBROUTINE dustlift(ngrid,nlay,nq,rho,pcdh_true,pcdh,co2ice,
     1      SUBROUTINE dustlift(ngrid,nlay,nq,rho,
     2     $                  pcdh_true,pcdh,co2ice,
    23     $                  dqslift)
    34      IMPLICIT NONE
    … …  
    4445      DATA stress_seuil/0.0225/   ! stress seuil soulevement (N.m2)
    4546
     47#ifdef MESOSCALE
     48!!!! AS: In the mesoscale model we'd like to easily set
     49!!!! AS: ... stress for lifting
     50!!!! AS: you have to compile with -DMESOSCALE to do so
     51      REAL alpha
     52      INTEGER ierr
     53        OPEN(99,file='stress.def',status='old',form='formatted'
     54     .   ,iostat=ierr)
     55        !!! no file => default values
     56        IF(ierr.EQ.0) THEN
     57          READ(99,*) stress_seuil
     58          READ(99,*) alpha
     59          write(*,*) 'USER-DEFINED threshold: ', stress_seuil, alpha
     60          CLOSE(99)
     61          alpha_lift(1:nq) = alpha
     62        ENDIF
     63#endif
    4664
    4765c     ---------------------------------

  • trunk/mars/libf/phymars/meso_inifis.F

    r47 r86  
    106106      CHARACTER ch1*12
    107107      CHARACTER ch80*80
     108
     109#ifdef MESOSCALE
    108110
    109111!      logical chem, h2o
    … …  
    807809!
    808810!      RETURN
     811
     812#endif
     813
    809814      END

  • trunk/mars/libf/phymars/meso_physiq.F

    r83 r86  
    1010     $            wisoil,wdsoil,
    1111     $            wecritphys,
     12#ifdef MESOSCALE
    1213     $            output_tab2d, output_tab3d,
     14#endif
    1315     $            flag_LES)
    1416
    … …  
    152154#include "netcdf.inc"
    153155
     156!!!!**** SPECIFIC TO MESOSCALE
     157#ifdef MESOSCALE
    154158#include "meso_slope.h"
    155159#include "wrf_output_2d.h"
    156160#include "wrf_output_3d.h"
     161#endif
    157162
    158163#include "advtrac.h"   !!! this is necessary for tracers (in dyn3d)
    … …  
    172177      REAL zh(ngridmx,nlayermx)      ! potential temperature (K)
    173178      LOGICAL firstcall,lastcall
    174 c ****WRF
     179!!! ****WRF WRF specific to mesoscale
    175180      INTEGER wday_ini
    176181      REAL wtsurf(ngridmx)  ! input only ay firstcall - output
    … …  
    183188      REAL wq2(ngridmx,nlayermx+1)
    184189      REAL wecritphys
     190#ifdef MESOSCALE
    185191      REAL output_tab2d(ngridmx,n2d)
    186192      REAL output_tab3d(ngridmx,nlayer,n3d)
     193#endif
    187194      REAL sl_ls, sl_lct, sl_lat, sl_tau, sl_alb, sl_the, sl_psi
    188195      REAL sl_fl0, sl_flu
    … …  
    196203      integer iloop
    197204      INTEGER tracerset    !!! this corresponds to config%mars
    198 c ****WRF
     205!!! ****WRF WRF specific to mesoscale
    199206      REAL pday
    200207      REAL ptime
    … …  
    353360
    354361c=======================================================================
     362#ifdef MESOSCALE
    355363
    356364c 1. Initialisation:
    … …  
    10361044
    10371045      IF (callcond) THEN
    1038          CALL meso_newcondens(ngrid,nlayer,nq,ptimestep,
     1046         CALL newcondens(ngrid,nlayer,nq,ptimestep,
    10391047     $              capcal,pplay,pplev,tsurf,pt,
    10401048     $              pphi,pdt,pdu,pdv,zdtsurf,pu,pv,pq,pdq,
    … …  
    18901898      icount=icount+1
    18911899      write(*,*) 'now, back to the dynamical core...'
     1900#endif
    18921901      RETURN
    18931902      END

  • trunk/mars/libf/phymars/newcondens.F

    r38 r86  
    590590             zqm(nlayer+1,iq)= zq(nlayer,iq)
    591591            enddo
    592  
     592
     593#ifdef MESOSCALE
     594!!!! AS: This part must be commented in the mesoscale model
     595!!!! AS: ... to avoid instabilities.
     596!!!! AS: you have to compile with -DMESOSCALE to do so
     597#else 
    593598c           Tendencies on T, U, V, Q
    594599c           """"""""""""""""""""""""
    … …  
    614619
    615620            END DO
     621#endif
    616622
    617623c           Tendencies on Q

  • trunk/mars/libf/phymars/testphys1d.F

    r38 r86  
    408408
    409409!Mars possible matter with dtphys in input and include!!!
     410#ifdef MESOSCALE
     411      CALL meso_inifis(1,llm,day0,daysec,dtphys,
     412#else
    410413      CALL inifis(1,llm,day0,daysec,dtphys,
     414#endif
    411415     .            lati,long,area,rad,g,r,cpp)
    412416c   Initialisation pour prendre en compte les vents en 1-D
    … …  
    591595c       appel de la physique
    592596c       --------------------
    593 
     597#ifdef MESOSCALE
     598      CALL meso_physiq (1,llm,nqmx,
     599#else
    594600      CALL physiq (1,llm,nqmx,
     601#endif
    595602     ,     firstcall,lastcall,
    596603     ,     day,time,dtphys,
Note: See TracChangeset for help on using the changeset viewer.