Ignore:
Timestamp:
Dec 14, 2015, 11:43:09 AM (9 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2298:2396 into testing branch

Location:
LMDZ5/branches/testing
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/makelmdz_fcm

    r2298 r2408  
    3434job=1
    3535full=''
     36libphy=false
    3637
    3738LMDGCM=`/bin/pwd`
     
    4344DYN_PHYS_PATH=$LMDGCM/.void_dir
    4445DYN_PHYS_SUB_PATH=$LMDGCM/.void_dir
     46PHY_COMMON_PATH=$LMDGCM/.void_dir
    4547RRTM_PATH=$LMDGCM/.void_dir
    4648SISVAT_PATH=$LMDGCM/.void_dir
     
    9698[-j n]                     : active parallel compiling on ntask
    9799[-full]                    : full recompiling
     100[-libphy]                  : only compile physics package (no dynamics or main program)
    98101[-fcm_path path]           : path to the fcm tool (default: tools/fcm/bin)
    99102[-ext_src path]            : path to an additional set of routines to compile with the model
     
    170173      "-ext_src")
    171174          EXT_SRC=$2 ; shift ; shift ;;
     175
    172176      "-j")
    173177          job=$2 ; shift ; shift ;;
     178
    174179      "-full")
    175180          full="-full" ; shift ;;
     181
     182      "-libphy")
     183          libphy="true" ; shift ;;
    176184
    177185      "-arch")
     
    182190  esac
    183191done
    184 
    185 if [[ $code = ce0l && $paramem = mem ]]
    186 then
    187     echo "There is no parallel version of ce0l at the moment."
    188     echo "Please compile the sequential version of the code to produce the" \
    189         "executable ce0l."
    190     exit 1
    191 fi
    192192
    193193###############################################################
     
    252252   CPP_KEY="$CPP_KEY CPP_EARTH"
    253253   fi
     254   # set physics common utilities path
     255   PHY_COMMON_PATH="${LIBFGCM}/phy_common"
    254256   # set the dyn/phys interface path
    255257   DYN_PHYS_PATH="${LIBFGCM}/dynlonlat_phylonlat"
     
    541543fi
    542544
     545if [[ $libphy == "true" ]]
     546then
     547  # special case where we compile only the physics
     548  DYN=$LMDGCM/.void_dir
     549  DYN_COMMON_PATH=$LMDGCM/.void_dir
     550  FILTRE_PATH=$LMDGCM/.void_dir
     551  DYN_PHYS_PATH=$LMDGCM/.void_dir
     552  DYN_PHYS_SUB_PATH=$LMDGCM/.void_dir
     553  #and there is no main program to generate
     554  code=""
     555  SUFF_NAME=""
     556else
     557  SUFF_NAME=${SUFF_NAME}.e
     558fi
     559
    543560cd $LMDGCM
    544561config_fcm="config.fcm"
     
    557574echo "%DYN           $DYN"           >> $config_fcm
    558575echo "%DYN_COMMON    $DYN_COMMON_PATH" >> $config_fcm
     576echo "%PHY_COMMON    $PHY_COMMON_PATH" >> $config_fcm
    559577echo "%FILTRE        $FILTRE_PATH"   >> $config_fcm
    560578echo "%PHYS          phy${physique}" >> $config_fcm
     
    588606rm -rf config
    589607ln -s $LIBOGCM/${arch}${SUFF_NAME}/.config config
    590 ln -s $LIBOGCM/${arch}${SUFF_NAME}/.config/tmp tmp_src
     608ln -s $LIBOGCM/${arch}${SUFF_NAME}/.config/ppsrc tmp_src
    591609
    592610
Note: See TracChangeset for help on using the changeset viewer.