Changeset 2242


Ignore:
Timestamp:
Mar 24, 2015, 9:08:43 AM (9 years ago)
Author:
Ehouarn Millour
Message:

Further reorganizing of the physics-dynamics interface.
Things related to dynamics grid and physics grid go in "dynlonlat_phylonlat".
Any physics phy* related stuff (e.g. iniphysiq, ce0l) goes in a phy* subdirectory of dynlonlat_phylonlat.
EM

Location:
LMDZ5/trunk
Files:
3 added
4 deleted
11 edited
4 copied
1 moved

Legend:

Unmodified
Added
Removed

  • LMDZ5/trunk/bld.cfg

    r2239 r2242  
    2525src::phys    %SRC_PATH/%PHYS
    2626src::dyn_phys %DYN_PHYS
     27src::dyn_phys_sub %DYN_PHYS_SUB
    2728src::sisvat  %SISVAT
    2829src::rrtm    %RRTM

  • LMDZ5/trunk/libf/phylmd/dyn1d/iniphysiq.F90

    r2239 r2242  
    1 link ../../dynlmdz_phylmd/iniphysiq.F90
     1link ../../dynlonlat_phylonlat/phylmd/iniphysiq.F90

  • LMDZ5/trunk/libf/phylmd/dyn1d/mod_grid_phy_lmdz.F90

    r2239 r2242  
    1 link ../../dynlmdz_phylmd/mod_grid_phy_lmdz.F90
     1link ../../dynlonlat_phylonlat/mod_grid_phy_lmdz.F90

  • LMDZ5/trunk/libf/phylmd/dyn1d/mod_phys_lmdz_mpi_data.F90

    r2239 r2242  
    1 link ../../dynlmdz_phylmd/mod_phys_lmdz_mpi_data.F90
     1link ../../dynlonlat_phylonlat/mod_phys_lmdz_mpi_data.F90

  • LMDZ5/trunk/libf/phylmd/dyn1d/mod_phys_lmdz_mpi_transfert.F90

    r2239 r2242  
    1 link ../../dynlmdz_phylmd/mod_phys_lmdz_mpi_transfert.F90
     1link ../../dynlonlat_phylonlat/mod_phys_lmdz_mpi_transfert.F90

  • LMDZ5/trunk/libf/phylmd/dyn1d/mod_phys_lmdz_omp_data.F90

    r2239 r2242  
    1 link ../../dynlmdz_phylmd/mod_phys_lmdz_omp_data.F90
     1link ../../dynlonlat_phylonlat/mod_phys_lmdz_omp_data.F90

  • LMDZ5/trunk/libf/phylmd/dyn1d/mod_phys_lmdz_omp_transfert.F90

    r2239 r2242  
    1 link ../../dynlmdz_phylmd/mod_phys_lmdz_omp_transfert.F90
     1link ../../dynlonlat_phylonlat/mod_phys_lmdz_omp_transfert.F90

  • LMDZ5/trunk/libf/phylmd/dyn1d/mod_phys_lmdz_para.F90

    r2239 r2242  
    1 link ../../dynlmdz_phylmd/mod_phys_lmdz_para.F90
     1link ../../dynlonlat_phylonlat/mod_phys_lmdz_para.F90

  • LMDZ5/trunk/libf/phylmd/dyn1d/mod_phys_lmdz_transfert_para.F90

    r2239 r2242  
    1 link ../../dynlmdz_phylmd/mod_phys_lmdz_transfert_para.F90
     1link ../../dynlonlat_phylonlat/mod_phys_lmdz_transfert_para.F90

  • LMDZ5/trunk/makelmdz

    r2239 r2242  
    501501   src_dirs="$src_dirs $filtre dyn3d_common dyn3d${FLAG_PARA}"
    502502   if [[ $physique != "nophys" ]] ; then
    503      src_dirs="$src_dirs dynlmdz_phy${physique}"
    504      libdyn_phy="-ldynlmdz_phy${physique}"
    505      LIBDYN_PHYS='$(LIBO)/libdynlmdz_phy'"${physique}"'.a'
    506      INCLUDE="$INCLUDE "'-I$(LIBF)/dynlmdz_phy'"${physique}"
     503     src_dirs="$src_dirs dynlonlat_phylonlat dynlonlat_phylonlat/phy${physique}"
     504     libdyn_phy="-ldynlonlat_phylonlat"
     505     LIBDYN_PHYS='$(LIBO)/libdynlonlat_phylonlat.a'
     506     INCLUDE="$INCLUDE "'-I$(LIBF)/dynlonlat_phylonlat'
     507     INCLUDE="$INCLUDE "'-I$(LIBF)/dynlonlat_phylonlat_'"${physique}"
    507508   fi
    508509   cd $LIBFGCM/grid
    … …  
    608609  dirmain=phy$physique
    609610  source_code=${code}.F90
    610 elif [[ -r $LMDGCM/libf/dynlmdz_phy$physique/${code}.F90 ]] ; then
    611   dirmain=dynlmdz_phy${physique}
     611elif [[ -r $LMDGCM/libf/dynlonlat_phylonlat/phy$physique/${code}.F90 ]] ; then
     612  dirmain="dynlonlat_phylonlat/phy${physique}"
    612613  source_code=${code}.F90
    613614elif [[ -r $LMDGCM/libf/phy$physique/dyn1d/${code}.F90 ]] ; then

  • LMDZ5/trunk/makelmdz_fcm

    r2239 r2242  
    4242FILTRE_PATH=$LMDGCM/.void_dir
    4343DYN_PHYS_PATH=$LMDGCM/.void_dir
     44DYN_PHYS_SUB_PATH=$LMDGCM/.void_dir
    4445RRTM_PATH=$LMDGCM/.void_dir
    4546SISVAT_PATH=$LMDGCM/.void_dir
    … …  
    235236   fi
    236237   # set the dyn/phys interface path
    237    DYN_PHYS_PATH="${LIBFGCM}/dynlmdz_phy${physique}"
     238   DYN_PHYS_PATH="${LIBFGCM}/dynlonlat_phylonlat"
     239   DYN_PHYS_SUB_PATH="${LIBFGCM}/dynlonlat_phylonlat/phy${physique}"
    238240fi
    239241
    … …  
    437439## (because key ones are included in 1D main program)
    438440  DYN_PHYS_PATH=$LMDGCM/.void_dir
     441  DYN_PHYS_SUB_PATH=$LMDGCM/.void_dir
    439442fi
    440443
    … …  
    540543echo "%PHYS          phy${physique}" >> $config_fcm
    541544echo "%DYN_PHYS      $DYN_PHYS_PATH" >> $config_fcm
     545echo "%DYN_PHYS_SUB  $DYN_PHYS_SUB_PATH" >> $config_fcm
    542546echo "%RRTM          $RRTM_PATH"     >> $config_fcm
    543547echo "%SISVAT        $SISVAT_PATH"   >> $config_fcm
    … …  
    561565fi
    562566
    563 
    564567rm -f $LIBOGCM/${arch}${SUFF_NAME}/.config/fcm.bld.lock
    565568./build_gcm ${fcm_path} -j $job $full
Note: See TracChangeset for help on using the changeset viewer.