Ignore:
Timestamp:
05/16/23 16:24:04 (13 months ago)
Author:
jgipsl
Message:

Change in organisation to make it possible to have ORCHIDEE version 2_2 and version trunk(also called version 4) in the same modipsl :

  • sources are now stored in modeles/ORCHIDEE_2_2 for default settings
  • default compilation, modeles/ORCHIDEE_2_2 will be compiled => modification in mod.def is needed
  • compilation with option -orch4 compiles folder modeles/ORCHIDEE_trunk
  • executables containing ORCHIDEE has suffix orch22 for default version or orch4 for the trunk version.
  • experiment set up changes for the name of the executable and the path to xml files in the ORCHIDEE_2_2 or ORCHIDEE_trunk. An experiment set up can only be used with the version of ORCHIDEE which it is prepared for. Currently all experiments are done for ORCHIDEE_2_2 except one in ICOLMDZOR which is suffiexed by orchv4
Location:
CONFIG/UNIFORM/v7/IPSLCM7
Files:
19 edited
1 moved

Legend:

Unmodified
Added
Removed

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZ/aquaplanet/CREATE_aquaplanet/config.card

    r5850 r6462  
    4848[Executable] 
    4949#D- For each component: Real name of executable, Name of executable in the run directory  
    50 ICO= (icosa_lmdz_${OptMode}.exe, icosa_lmdz.exe, 31MPI) 
     50ICO= (icosa_lmdz_orch22_${OptMode}.exe, icosa_lmdz.exe, 31MPI) 
    5151ATM= ("","") 
    5252IOS= ("","") 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZ/aquaplanet/climAQUA_360d/config.card

    r5850 r6462  
    4848[Executable] 
    4949#D- For each component: Real name of executable, Name of executable in the run directory  
    50 ICO= (icosa_lmdz_${OptMode}.exe, icosa_lmdz.exe, 40MPI,4OMP) 
     50ICO= (icosa_lmdz_orch22_${OptMode}.exe, icosa_lmdz.exe, 40MPI,4OMP) 
    5151ATM= ("","") 
    5252IOS= (xios_server_${OptMode}.exe, xios.x, 1MPI) 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZ/clim_noleap/config.card

    r5850 r6462  
    5050#D-- Executable - 
    5151[Executable] 
    52 ICO= (icosa_lmdz_${OptMode}.exe, icosa_lmdz.exe, 40MPI) 
     52ICO= (icosa_lmdz_orch22_${OptMode}.exe, icosa_lmdz.exe, 40MPI) 
    5353ATM= ("","") 
    5454IOS= (xios_server_${OptMode}.exe, xios.x, 1MPI) 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZOR/clim_noleap/COMP/orchidee.card

    r6417 r6462  
    4949 
    5050[ParametersFiles] 
    51 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .)   ,\ 
     51List=   (${SUBMIT_DIR}/PARAM/orchidee.def_v22, orchidee.def)   ,\ 
    5252        (${SUBMIT_DIR}/PARAM/file_def_orchidee.xml, .)  ,\ 
    53         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_input_orchidee.xml, .) ,\ 
    54         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_routing_orchidee.xml, .)   ,\ 
    55         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    56         (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     53        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/context_input_orchidee.xml, .) ,\ 
     54        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/context_routing_orchidee.xml, .)   ,\ 
     55        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/context_orchidee.xml, .)   ,\ 
     56        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/field_def_orchidee.xml, .) 
    5757 
    5858[RestartFiles] 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZOR/clim_noleap/config.card

    r6417 r6462  
    5252#D-- Executable - 
    5353[Executable] 
    54 ICO= (icosa_lmdz_${OptMode}.exe, icosa_lmdz.exe, 80MPI, 4OMP) 
     54ICO= (icosa_lmdz_orch22_${OptMode}.exe, icosa_lmdz.exe, 80MPI, 4OMP) 
    5555ATM= ("","") 
    5656SRF= ("", "") 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZOR/clim_noleap_ORCHv4/COMP/orchidee.card

    r6406 r6462  
    5555List=   (${SUBMIT_DIR}/PARAM/orchidee.def_v4, orchidee.def)   ,\ 
    5656        (${SUBMIT_DIR}/PARAM/orchidee_pft.def_${DefSuffix}_v4, orchidee_pft.def) ,\ 
    57         (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\ 
    58         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_input_orchidee.xml, .) ,\ 
    59         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    60         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_routing_orchidee.xml, .)   ,\ 
    61         (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     57        (${MODIPSL}/modeles/ORCHIDEE_trunk/src_xml/file_def_orchidee.xml, .)  ,\ 
     58        (${MODIPSL}/modeles/ORCHIDEE_trunk/src_xml/context_input_orchidee.xml, .) ,\ 
     59        (${MODIPSL}/modeles/ORCHIDEE_trunk/src_xml/context_orchidee.xml, .)   ,\ 
     60        (${MODIPSL}/modeles/ORCHIDEE_trunk/src_xml/context_routing_orchidee.xml, .)   ,\ 
     61        (${MODIPSL}/modeles/ORCHIDEE_trunk/src_xml/field_def_orchidee.xml, .) 
    6262 
    6363[RestartFiles] 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZOR/clim_noleap_ORCHv4/config.card

    r6406 r6462  
    5252#D-- Executable - 
    5353[Executable] 
    54 ICO= (icosa_lmdz_${OptMode}.exe, icosa_lmdz.exe, 80MPI, 4OMP) 
     54ICO= (icosa_lmdz_orch4_${OptMode}.exe, icosa_lmdz.exe, 80MPI, 4OMP) 
    5555ATM= ("","") 
    5656SRF= ("", "") 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZOR/highresmip/COMP/orchidee.card

    r4610 r6462  
    4545 
    4646[ParametersFiles] 
    47 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .)   ,\ 
    48         (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\ 
    49         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_input_orchidee.xml, .) ,\ 
    50         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_routing_orchidee.xml, .)   ,\ 
    51         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    52         (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     47List=   (${SUBMIT_DIR}/PARAM/orchidee.def_v22, orchidee.def)   ,\ 
     48        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/file_def_orchidee.xml, .)  ,\ 
     49        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/context_input_orchidee.xml, .) ,\ 
     50        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/context_routing_orchidee.xml, .)   ,\ 
     51        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/context_orchidee.xml, .)   ,\ 
     52        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/field_def_orchidee.xml, .) 
    5353 
    5454[RestartFiles] 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZOR/highresmip/config.card

    r5850 r6462  
    5252#D-- Executable - 
    5353[Executable] 
    54 ICO= (icosa_lmdz_${OptMode}.exe, icosa_lmdz.exe, 160MPI, 4OMP) 
     54ICO= (icosa_lmdz_orch22_${OptMode}.exe, icosa_lmdz.exe, 160MPI, 4OMP) 
    5555ATM= ("","") 
    5656SRF= ("", "") 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZOR/highresmip_CMIP6/COMP/orchidee.card

    r4617 r6462  
    4545 
    4646[ParametersFiles] 
    47 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .),\ 
     47List=   (${SUBMIT_DIR}/PARAM/orchidee.def_v22, orchidee.def),\ 
    4848    (${SUBMIT_DIR}/PARAM/ping_orchidee.xml, .),\ 
    49         (${MODIPSL}/modeles/ORCHIDEE/src_xml/file_def_orchidee.xml, .)  ,\ 
    50         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_input_orchidee.xml, .) ,\ 
    51         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_routing_orchidee.xml, .)   ,\ 
    52         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    53         (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     49        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/file_def_orchidee.xml, .)  ,\ 
     50        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/context_input_orchidee.xml, .) ,\ 
     51        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/context_routing_orchidee.xml, .)   ,\ 
     52        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/context_orchidee.xml, .)   ,\ 
     53        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/field_def_orchidee.xml, .) 
    5454 
    5555[RestartFiles] 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/ICOLMDZOR/highresmip_CMIP6/config.card

    r5850 r6462  
    5454#D-- Executable - 
    5555[Executable] 
    56 ICO= (icosa_lmdz_${OptMode}.exe, icosa_lmdz.exe, 160MPI, 4OMP) 
     56ICO= (icosa_lmdz_orch22_${OptMode}.exe, icosa_lmdz.exe, 160MPI, 4OMP) 
    5757ATM= ("","") 
    5858SRF= ("", "") 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/IPSLCM/piControl_TEST/COMP/orchidee.card

    r6296 r6462  
    5050 
    5151[ParametersFiles] 
    52 List=   (${SUBMIT_DIR}/PARAM/orchidee.def, .)   ,\ 
     52List=   (${SUBMIT_DIR}/PARAM/orchidee.def_v22, orchidee.def)   ,\ 
    5353    (${SUBMIT_DIR}/PARAM/ping_orchidee.xml, . )                       ,\ 
    5454        (${SUBMIT_DIR}/PARAM/file_def_orchidee.xml, .)  ,\ 
    55         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_input_orchidee.xml, .) ,\ 
    56         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_routing_orchidee.xml, .)   ,\ 
    57         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    58         (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     55        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/context_input_orchidee.xml, .) ,\ 
     56        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/context_routing_orchidee.xml, .)   ,\ 
     57        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/context_orchidee.xml, .)   ,\ 
     58        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/field_def_orchidee.xml, .) 
    5959 
    6060[RestartFiles] 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/IPSLCM/piControl_TEST/config.card

    r6417 r6462  
    190190[Executable] 
    191191#D- For each component, Real name of executable, Name of executable for oasis 
    192 ICO= (icosa_lmdz_${OptMode}.exe, icosa_lmdz.exe, 160MPI, 4OMP) 
     192ICO= (icosa_lmdz_orch22_${OptMode}.exe, icosa_lmdz.exe, 160MPI, 4OMP) 
    193193ATM= ("" ,"") 
    194194SRF= ("" ,"" ) 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/LMDZ/clim_360d/config.card

    r6290 r6462  
    5555#D- Here is set 71MPI*8OMP which is suitable for resolution 144x142x79 
    5656#D- Change to 31MPI*4OMP for resolution 96x95x39 
    57 ATM= (gcm_${ResolAtm}_${OptMode}.e, lmdz.x, 71MPI, 8OMP) 
     57ATM= (gcm_${ResolAtm}_orch22_${OptMode}.e, lmdz.x, 71MPI, 8OMP) 
    5858IOS= (xios_server_${OptMode}.exe, xios.x, 1MPI) 
    5959 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/LMDZOR/amip/COMP/orchidee.card

    r6302 r6462  
    33 
    44[UserChoices] 
    5 # The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
    6 # By default the file orchidee.def_CWRR will be selected. 
    7 DefSuffix=CWRR 
    8  
    95# VEGET_UPDATE=0Y : default, do not update the vegetation and woodharvest file except if starting without restart file 
    106# VEGET_UPDATE=1Y : update the vegetation and woodharvest file 1st of January each year 
    … …  
    4945 
    5046[ParametersFiles] 
    51 List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\ 
     47List=   (${SUBMIT_DIR}/PARAM/orchidee.def_v22, orchidee.def)   ,\ 
    5248        (${SUBMIT_DIR}/PARAM/file_def_orchidee.xml, .)  ,\ 
    53         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_input_orchidee.xml, .) ,\ 
    54         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    55         (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     49        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/context_input_orchidee.xml, .) ,\ 
     50        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/context_orchidee.xml, .)   ,\ 
     51        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/field_def_orchidee.xml, .) 
    5652 
    5753[RestartFiles] 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/LMDZOR/amip/config.card

    r5878 r6462  
    5757#D- Here is set 71MPI*8OMP which is suitable for resolution 144x142x79 
    5858#D- Change to 31MPI*4OMP for resolution 96x95x39 
    59 ATM= (gcm_${ResolAtm}_${OptMode}.e, lmdz.x, 71MPI, 8OMP) 
     59ATM= (gcm_${ResolAtm}_orch22_${OptMode}.e, lmdz.x, 71MPI, 8OMP) 
    6060SRF= ("", "") 
    6161SBG= ("", "") 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/LMDZOR/clim_pdControl/COMP/orchidee.card

    r6302 r6462  
    33 
    44[UserChoices] 
    5 # The variable DefSuffix gives the suffix of the orchidee.def file to be used. 
    6 # By default the file orchidee.def_CWRR will be selected. 
    7 DefSuffix=CWRR 
    8  
    95# VEGET_UPDATE_at_start=y : orchidee.driver will set VEGET_UPDATE=1Y at the first cumul period when starting a new simulation.  
    106#                           After the first period, VEGET_UPDATE will be set according to the choice done below.   
    … …  
    5349 
    5450[ParametersFiles] 
    55 List=   (${SUBMIT_DIR}/PARAM/orchidee.def_${DefSuffix}, orchidee.def)   ,\ 
     51List=   (${SUBMIT_DIR}/PARAM/orchidee.def_v22, orchidee.def)   ,\ 
    5652        (${SUBMIT_DIR}/PARAM/file_def_orchidee.xml, .)  ,\ 
    57         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_input_orchidee.xml, .) ,\ 
    58         (${MODIPSL}/modeles/ORCHIDEE/src_xml/context_orchidee.xml, .)   ,\ 
    59         (${MODIPSL}/modeles/ORCHIDEE/src_xml/field_def_orchidee.xml, .) 
     53        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/context_input_orchidee.xml, .) ,\ 
     54        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/context_orchidee.xml, .)   ,\ 
     55        (${MODIPSL}/modeles/ORCHIDEE_2_2/src_xml/field_def_orchidee.xml, .) 
    6056 
    6157[RestartFiles] 

  • CONFIG/UNIFORM/v7/IPSLCM7/EXPERIMENTS/LMDZOR/clim_pdControl/config.card

    r6303 r6462  
    5757#D- Here is set 71MPI*8OMP which is suitable for resolution 144x142x79 
    5858#D- Change to 31MPI*4OMP for resolution 96x95x39 
    59 ATM= (gcm_${ResolAtm}_${OptMode}.e, lmdz.x, 71MPI, 8OMP) 
     59ATM= (gcm_${ResolAtm}_orch22_${OptMode}.e, lmdz.x, 71MPI, 8OMP) 
    6060SRF= ("", "") 
    6161SBG= ("", "") 

  • CONFIG/UNIFORM/v7/IPSLCM7/compile_ipslcm7.sh

    r6458 r6462  
    4141rad=rrtm 
    4242opt_rad="" 
     43 
     44# orchversion tells if ORCHIDEE_2_2 or ORCHIDEE_trunk is compiled. This is used as argument and also in the suffix of the executables. 
     45# orchcomp is the key word needed for LMDZ for the compilation of coherent interface. Only used internal to the compilation script. 
     46orchversion=orch22 
     47orchcomp=orchidee2.1 
     48 
    4349# Default netcdf_lib is used for XIOS but can be change by argument 
    4450netcdf_lib="" 
    … …  
    8086 
    8187Example 4: Compilation of LMDZ in regular lat-lon for dimension 144x142x79.  
    82 The dimension can be changed to any other 3d dimension. DYNAMICO is also compiled as default. 
     88           The dimension can be changed to any other 3d dimension. DYNAMICO is also compiled as default. 
    8389./compile_ipslcm7.sh -regular_latlon 144x142x79 
     90 
     91Example 5: Compiltion of ORCHIDEE_trunk version 
     92           Note that for compiling ORCHIDEE trunk you must first have extracted ORCHIDEE_trunk folder in modeles.  
     93           modeles/ORCHIDEE_2_2 folder can be kept at the same time. 
     94./compile_ipslcm7.sh -orch4 
     95./compile_ipslcm7.sh -regular_latlon 144x142x79 -orch4 
    8496 
    8597end_help 
    … …  
    100112        "-cleannemo")  full_nemo=y ; shift ;; 
    101113        "-rad")        rad=$2; shift ; shift ;; 
     114        "-orch22")     orchversion="orch22"; orchcomp=orchidee2.1; shift ; shift ;; 
     115        "-orch4")      orchversion="orch4"; orchcomp=orchideetrunk; shift ; shift ;; 
    102116        *)             echo "unknown option "$1" , exiting..." ; exit 
    103117    esac 
    … …  
    171185fi 
    172186 
     187 
     188#### Clean if full_orch 
     189# If full recompilation of ORCHIDEE then first clean modipsl/lib folder 
     190if [ X${full_orch} == X"-full" ] ; then 
     191   rm -f $modipsl/lib/* 
     192fi 
     193 
    173194#### 2 Do the compilation  
    174195## 2.1 Compile ioipsl 
    … …  
    215236 
    216237 
    217 ## 2.4 Compile orchidee 
    218 cd $modipsl/modeles/ORCHIDEE 
    219 echo; echo "NOW COMPILE ORCHIDEE" 
    220 echo >> $outfile ; echo " NOW COMPILE ORCHIDEE"   >> $outfile  
     238## 2.4 Compile ORCHIDEE 
     239# Choose ORCHIDEE version to compile and create a link to generic folder name ORCHIDEE. 
     240# This link is needed for the compilation of ICOSA_LMDZ for it to find the orchidee librarie.  
     241cd $modipsl/modeles 
     242rm -f ORCHIDEE 
     243if [ $orchversion == orch22 ] ; then 
     244    ln -s ORCHIDEE_2_2 ORCHIDEE 
     245    cd $modipsl/modeles/ORCHIDEE_2_2 
     246    echo; echo "NOW COMPILE ORCHIDEE_2_2" 
     247    echo >> $outfile ; echo " NOW COMPILE ORCHIDEE_2_2"   >> $outfile  
     248else 
     249    ln -s ORCHIDEE_trunk ORCHIDEE 
     250    cd $modipsl/modeles/ORCHIDEE_trunk 
     251    echo; echo "NOW COMPILE ORCHIDEE_trunk v4" 
     252    echo >> $outfile ; echo " NOW COMPILE ORCHIDEE_trunk v4"   >> $outfile  
     253fi 
    221254 
    222255# Check if the compilation of ORCHIDEE was previsouly interupted prematured.  
    … …  
    232265fi 
    233266 
    234 echo    ./makeorchidee_fcm -j 8 -xios -parallel $parallel -$optmode -arch ${fcm_arch} -arch_path $arch_path $full_orch   >> $outfile  
    235         ./makeorchidee_fcm -j 8 -xios -parallel $parallel -$optmode -arch ${fcm_arch} -arch_path $arch_path $full_orch   >> $outfile 2>&1 
     267echo    ./makeorchidee_fcm -j 8 -xios -parallel $parallel -$optmode -arch ${fcm_arch} -arch_path $arch_path $full_orch  >> $outfile  
     268        ./makeorchidee_fcm -j 8 -xios -parallel $parallel -$optmode -arch ${fcm_arch} -arch_path $arch_path $full_orch  >> $outfile 2>&1 
    236269# Test if compiling finished 
    237270if [[ $? != 0 ]] ; then 
    … …  
    239272    exit 
    240273fi 
     274 
     275# Rename exetubles for ORCHIDEE offline driver with suffix version 
     276cd $modipsl/bin 
     277if [ -f orchideedriver ] ; then mv orchideedriver orchideedriver.$orchversion ; fi 
     278if [ -f orchidee_ol ] ; then mv orchidee_ol orchidee_ol.$orchversion ; fi 
    241279 
    242280 
    … …  
    305343fi 
    306344 
    307 # Compile LMDZ  
     345 
     346## 2.6 Compile LMDZ  
    308347cd $modipsl/modeles/LMDZ 
    309348# Compile LMDZ as library to couple to DYNAMICO 
    310349echo; echo "NOW COMPILE LMDZ FOR COUPLING TO DYNAMICO" 
    311350echo >> $outfile ; echo " NOW COMPILE LMDZ FOR COUPLING TO DYNAMICO"   >> $outfile  
     351 
    312352# Retrieve the final svn release number, needed for radiative code suffix of executable 
    313353lmdzsvn=`svnversion . | egrep -o "[0-9]+"  | awk 'NR==1'` 
    … …  
    338378if [ $lmdzsvn -le 4185 -a $rad = "ecrad" ] ; then echo "ecrad only available for LMDZ rev starting with 4186 " ; exit ; fi 
    339379 
    340 echo ./makelmdz_fcm -p lmd -c OMCT $opt_rad -$optmode -mem -parallel $parallel -libphy -v orchidee2.1 -io xios -arch $fcm_arch -j 8 $full_lmdz    >> $outfile  
    341      ./makelmdz_fcm -p lmd -c OMCT $opt_rad -$optmode -mem -parallel $parallel -libphy -v orchidee2.1 -io xios -arch $fcm_arch -j 8 $full_lmdz    >> $outfile 2>&1 
     380echo ./makelmdz_fcm -p lmd -c OMCT $opt_rad -$optmode -mem -parallel $parallel -libphy -v $orchcomp -io xios -arch $fcm_arch -j 8 $full_lmdz    >> $outfile  
     381     ./makelmdz_fcm -p lmd -c OMCT $opt_rad -$optmode -mem -parallel $parallel -libphy -v $orchcomp -io xios -arch $fcm_arch -j 8 $full_lmdz    >> $outfile 2>&1 
    342382# Test if compiling finished 
    343383if [[ $? != 0 ]] ; then 
    … …  
    347387 
    348388 
    349  
    350 ## 2.5 Compile DYNAMICO 
     389## 2.6 Compile DYNAMICO 
    351390cd $modipsl/modeles/DYNAMICO 
    352391echo; echo "NOW COMPILE DYNAMICO " 
    … …  
    361400fi 
    362401 
    363 ## 2.6 Compile interface ICOSA_LMDZ 
     402 
     403## 2.7 Compile interface ICOSA_LMDZ 
    364404cd $modipsl/modeles/ICOSA_LMDZ 
    365405echo; echo "NOW COMPILE ICOSA_LMDZ " 
    … …  
    375415# Move executables to modipsl/bin 
    376416if [ -f $modipsl/modeles/ICOSA_LMDZ/bin/icosa_lmdz.exe ] ; then  
    377     mv $modipsl/modeles/ICOSA_LMDZ/bin/icosa_lmdz.exe $modipsl/bin/icosa_lmdz_${optmode}.exe 
     417    mv $modipsl/modeles/ICOSA_LMDZ/bin/icosa_lmdz.exe $modipsl/bin/icosa_lmdz_${orchversion}_${optmode}.exe 
    378418else 
    379419    echo "THERE IS A PROBLEM IN ICOSA_LMDZ COMPILATION EXECUTABLE MISSING - STOP" 
    … …  
    383423 
    384424 
    385 ## 2.7 Compile LMDZ for regular latlon configuration 
     425## 2.8 Compile LMDZ for regular latlon configuration 
    386426if [ $regular_latlon = yes ] ; then 
    387427 
    … …  
    402442        rm -f .lock 
    403443    fi 
    404     echo ./makelmdz_fcm -d ${resol_atm} -c OMCT -p lmd $opt_rad -$optmode -mem -parallel $parallel -io xios -v orchidee2.1 -arch $fcm_arch -j 8 $full_lmdz gcm    >> $outfile  
    405          ./makelmdz_fcm -d ${resol_atm} -c OMCT -p lmd $opt_rad -$optmode -mem -parallel $parallel -io xios -v orchidee2.1 -arch $fcm_arch -j 8 $full_lmdz gcm    >> $outfile 2>&1 
     444    echo ./makelmdz_fcm -d ${resol_atm} -c OMCT -p lmd $opt_rad -$optmode -mem -parallel $parallel -io xios -v $orchcomp -arch $fcm_arch -j 8 $full_lmdz gcm    >> $outfile  
     445         ./makelmdz_fcm -d ${resol_atm} -c OMCT -p lmd $opt_rad -$optmode -mem -parallel $parallel -io xios -v $orchcomp -arch $fcm_arch -j 8 $full_lmdz gcm    >> $outfile 2>&1 
    406446    # Test if compiling finished 
    407447    if [[ $? != 0 ]] ; then 
    … …  
    419459    fi 
    420460    echo gcm suffix = $suffix 
    421  
    422461     
    423     # Move executable gcm to modipsl/bin folder 
     462    # Move executables to modipsl/bin folder 
    424463    echo "Move gcm.e executable to modipsl/bin" 
    425464    if [ -f $modipsl/modeles/LMDZ/bin/gcm${suffix} ] ;  then 
    426         mv $modipsl/modeles/LMDZ/bin/gcm${suffix} $modipsl/bin/gcm_${resol_atm}_${optmode}.e 
     465        mv $modipsl/modeles/LMDZ/bin/gcm${suffix} $modipsl/bin/gcm_${resol_atm}_${orchversion}_${optmode}.e 
    427466    else 
    428467        echo "ERROR gcm${suffix} executable does not exist."  
    429468        echo "THERE IS A PROBLEM IN LMDZ REGULAR LATLON COMPILATION - STOP" 
    430469        exit 
    431     fi 
    432      
     470    fi     
     471 
    433472    # Compile ce0l initialization program for LMDZ regular lat-lon exectuable 
    434473    echo; echo "NOW COMPILE CE0L OF LMDZ. Resolution = ${resol_atm}" 
    435474    echo >> $outfile ; echo " NOW COMPILE CE0L OF LMDZ. Resolution = ${resol_atm}"   >> $outfile  
    436475 
    437     echo ./makelmdz_fcm -d ${resol_atm} -c OMCT -p lmd -rrtm true -$optmode -mem -parallel $parallel -io xios -v orchidee2.1 -arch $fcm_arch -j 8 $full_lmdz ce0l    >> $outfile  
    438          ./makelmdz_fcm -d ${resol_atm} -c OMCT -p lmd -rrtm true -$optmode -mem -parallel $parallel -io xios -v orchidee2.1 -arch $fcm_arch -j 8 $full_lmdz ce0l    >> $outfile 2>&1 
     476    echo ./makelmdz_fcm -d ${resol_atm} -c OMCT -p lmd -rrtm true -$optmode -mem -parallel $parallel -io xios -v $orchcomp -arch $fcm_arch -j 8 $full_lmdz ce0l    >> $outfile  
     477         ./makelmdz_fcm -d ${resol_atm} -c OMCT -p lmd -rrtm true -$optmode -mem -parallel $parallel -io xios -v $orchcomp -arch $fcm_arch -j 8 $full_lmdz ce0l    >> $outfile 2>&1 
    439478    # Test if compiling finished 
    440479    if [[ $? != 0 ]] ; then 
    … …  
    442481        exit 
    443482    fi 
    444  
    445      
     483    
     484  
    446485    # Move executable ce0l to modipsl/bin folder 
    447486    echo "Move ce0l executable to modipsl/bin" 
Note: See TracChangeset for help on using the changeset viewer.