Changeset 227


Ignore:
Timestamp:
Jul 15, 2011, 4:36:34 PM (13 years ago)
Author:
aslmd
Message:

MESOSCALE and LMDZ.MARS: corrected the bug with readtesassim, now the GCM routine can be used. changed name for slope routines to drop the meso_ prefix

Location:
trunk
Files:
6 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/LMDZ.MARS/README

    r226 r227  
    814814- Slight cosmetic changes to physiq.f and inifis.F
    815815  --- some of them e.g. to prepare convergence between meso_physiq and physiq
     816- Dropped the meso_ prefix from the slope routines
     817  (currently those are only used in the mesoscale model,
     818   but one could imagine using those in hi-res GCM runs)

  • trunk/LMDZ.MARS/libf/phymars/meso_inc/meso_inc_inifisini.F

    r226 r227  
    6868
    6969        !
    70         ! in meso_slope.h
     70        ! in slope.h
    7171        !
    7272        theta_sl(:)=wtheta(:)

  • trunk/LMDZ.MARS/libf/phymars/meso_inc/meso_inc_slope.F

    r226 r227  
    2626           if (sl_fl0 .lt. sl_di0) sl_di0=sl_fl0
    2727     !!!!!!!!!!!!!!!!!!!!!!!!!!
    28         CALL meso_param_slope( mu0(ig), declin, sl_ra, sl_lat,
     28        CALL param_slope( mu0(ig), declin, sl_ra, sl_lat,
    2929     &            sl_tau, sl_alb,
    3030     &            sl_the, sl_psi, sl_di0, sl_fl0, sl_flu)

  • trunk/LMDZ.MARS/libf/phymars/meso_inifis.F

    r226 r227  
    6565#include "datafile.h"
    6666#ifdef MESOSCALE
    67 #include "meso_slope.h"
     67#include "slope.h"
    6868#include "comsoil.h"     !!MESOSCALE -- needed to fill volcapa
    6969#include "meso_inc/meso_inc_inifisvar.F"

  • trunk/LMDZ.MARS/libf/phymars/meso_physiq.F

    r226 r227  
    136136
    137137#ifdef MESOSCALE
    138 #include "meso_slope.h"
     138#include "slope.h"
    139139#include "wrf_output_2d.h"
    140140#include "wrf_output_3d.h"

  • trunk/LMDZ.MARS/libf/phymars/param_slope.F90

    r226 r227  
    1 SUBROUTINE meso_param_slope( &
     1SUBROUTINE param_slope( &
    22  !
    33  ! INPUTS
    … …  
    218218!  print *, 'reflected component ', fref
    219219
    220 END SUBROUTINE meso_param_slope
     220END SUBROUTINE param_slope

  • trunk/MESOSCALE/LMD_MM_MARS/makemeso

    r226 r227  
    436436                       echo 3 | configure > log_compile 2> log_error
    437437                       sed -f mars.sed configure.wrf > yeah ; mv -f yeah configure.wrf
     438                       ### the following line is necessary because readtesassim has a line "use netcdf" in it!
     439                       sed s+"-L../mars_lmd/libo -llmd"+"-L../mars_lmd/libo -llmd $NETCDF/lib/libnetcdf.a"+g configure.wrf > yeah ; mv -f yeah configure.wrf
    438440                       sed s+"mpif90"+"${WHERE_MPI}/mpif90"+g configure.wrf | sed s+"mpicc"+"${WHERE_MPI}/mpicc"+g | sed s+"mpicc"+"mpicc -DMPI2_SUPPORT"+g > yeah
    439441                                #| sed s+"fastsse"+"fast"+g > yeah
    … …  
    582584  sed s/--xsize--/${physx}/g meso_inc/meso_dimphys.h_ref | sed s/--ysize--/${physy}/g | sed s/--physize--/${physize}/g | sed s/--zsize--/${physz}/g | sed s/--soilsize--/${soilsize}/g > dimphys.h
    583585  head -15 dimphys.h
    584      ###
    585586     ### TEST new new phys
    586587     if [[ "${phys}" == "newphys_" ]]
    587588     then
    588        #touch callkeys.h.meso 
    589        #  ln -sf meso_callkeys.h callkeys.h
    590        #touch dustlift.F.meso
    591        #  ln -sf meso_dustlift.F dustlift.F  ## attention avec "ancienne nouvelle physique"
    592        touch readtesassim.F90.meso
    593          ln -sf meso_readtesassim.F90 readtesassim.F90  ## attention idem
    594589       touch gr_fi_dyn.F.lien
    595          ln -sf ../dyn3d/gr_fi_dyn.F .  ## dommage, a corriger ## attention idem
    596      ###############################
     590         ln -sf ../dyn3d/gr_fi_dyn.F .  ## dommage, a corriger
    597591     ###############################
    598592\rm scatterers.h
Note: See TracChangeset for help on using the changeset viewer.