New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 2072 for branches/devmercator2010/NVTK – NEMO

Ignore:
Timestamp:
2010-09-08T16:29:38+02:00 (14 years ago)
Author:
cbricaud
Message:

add change from DEV_r1784_3DF

Location:
branches/devmercator2010/NVTK
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • branches/devmercator2010/NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_GYRE

    r1791 r2072  
    3838#-Q- sx8mercure prefix = -D 
    3939#-Q- sx8brodie prefix = -D 
    40 #-Q- es2 prefix = -D 
     40#-Q- eshpux prefix = -D 
    4141#-Q- sxdkrz prefix = -D 
    4242#-Q- linux  prefix = -D 

  • branches/devmercator2010/NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_GYRE_LOBSTER

    r1791 r2072  
    3838#-Q- sx8mercure prefix = -D 
    3939#-Q- sx8brodie prefix = -D 
    40 #-Q- es2 prefix = -D 
     40#-Q- eshpux prefix = -D 
    4141#-Q- sxdkrz prefix = -D 
    4242#-Q- linux  prefix = -D 

  • branches/devmercator2010/NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_ORCA2_LIM

    r1791 r2072  
    3939#-Q- sx8mercure prefix = -D 
    4040#-Q- sx8brodie prefix = -D 
    41 #-Q- es2 prefix = -D 
     41#-Q- eshpux prefix = -D 
    4242#-Q- sxdkrz prefix = -D 
    4343#-Q- linux  prefix = -D 

  • branches/devmercator2010/NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_ORCA2_LIM3

    r1791 r2072  
    3939#-Q- sx8mercure prefix = -D 
    4040#-Q- sx8brodie prefix = -D 
    41 #-Q- es2 prefix = -D 
     41#-Q- eshpux prefix = -D 
    4242#-Q- sxdkrz prefix = -D 
    4343#-Q- linux  prefix = -D 

  • branches/devmercator2010/NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_ORCA2_LIM_PISCES

    r1791 r2072  
    3838#-Q- sx8mercure prefix = -D 
    3939#-Q- sx8brodie prefix = -D 
    40 #-Q- es2 prefix = -D 
     40#-Q- eshpux prefix = -D 
    4141#-Q- sxdkrz prefix = -D 
    4242#-Q- linux  prefix = -D 

  • branches/devmercator2010/NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_ORCA2_OFF_PISCES

    r1791 r2072  
    3838#-Q- sx8mercure prefix = -D 
    3939#-Q- sx8brodie prefix = -D 
    40 #-Q- es2 prefix = -D 
     40#-Q- eshpux prefix = -D 
    4141#-Q- sxdkrz prefix = -D 
    4242#-Q- linux  prefix = -D 

  • branches/devmercator2010/NVTK/INSTALL/CONFIG_FILES/BB_make.ldef_ZAGRIF

    r1791 r2072  
    3838#-Q- sx8mercure prefix = -D 
    3939#-Q- sx8brodie prefix = -D 
    40 #-Q- es2 prefix = -D 
     40#-Q- eshpux prefix = -D 
    4141#-Q- sxdkrz prefix = -D 
    4242#-Q- linux  prefix = -D 

  • branches/devmercator2010/NVTK/INSTALL/JOBS/job_GYRE.ksh

    r2040 r2072  
    1414MYO_EXP=xxx 
    1515TSYMB=xxx 
    16 USE_IOMPUT=xxx 
    17 USE_IOSERVER=xxx 
    18 NB_PROCS_IOSERVER=xxx 
    1916 
    2017# Variables changed by ins_valid.ksh script 
    … …  
    110107 
    111108mv nam.tmp namelist 
    112  
    113 # iom_put xml file 
    114 if [ "${USE_IOMPUT}" = "true" ] 
    115 then 
    116     get_namelist ${LOC_NAM} xmlio_server.def ${MYO_EXP} xmlio_server.def 
    117     get_namelist ${LOC_NAM} iodef.xml ${MYO_EXP} iodef.xml 
    118     sed -e "s/^ *using_server *=.*$/  using_server = .${USE_IOSERVER}./" xmlio_server.def > tmp$$ 
    119     mv tmp$$ xmlio_server.def 
    120 fi 
    121  
    122109 
    123110# Analytical forcing 
    … …  
    232219case ${RUN} in 
    233220   'mon' | 'omp' ) 
    234                liste_files=' *abort* memory* namelist* *xml* perfs* solver.stat ocean.output layout* GYRE* restart* mono*' ;; 
     221               liste_files=' *abort* memory* namelist* perfs* solver.stat ocean.output layout* GYRE* restart* mono*' ;; 
    235222   'mpi' ) 
    236                liste_files=' *abort* namelist* *xml* solver.stat perfs* ocean.output* layout* GYRE* restart* mpp*' ;; 
     223               liste_files=' *abort* namelist* solver.stat perfs* ocean.output* layout* GYRE* restart* mpp*' ;; 
    237224esac 
    238225 
    … …  
    258245############################################################## 
    259246############################################################## 
    260 if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' -o ${REF_TAG} = 'nemo_v3_2' ] 
     247if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' ] 
    261248then 
    262249   STORE_DATA=${REF_OD}/${CONF}/${REF_TAG}/${RUN}/${DIROUT} 

  • branches/devmercator2010/NVTK/INSTALL/JOBS/job_GYRE_LOBSTER.ksh

    r2040 r2072  
    1414MYO_EXP=xxx 
    1515TSYMB=xxx 
    16 USE_IOMPUT=xxx 
    17 USE_IOSERVER=xxx 
    18 NB_PROCS_IOSERVER=xxx 
    19  
    2016 
    2117# Variables changed by ins_valid.ksh script 
    … …  
    132128sed -e "s%$PAT_ADD%   nwritedia    = ${ITERATIONS}%" namelist_lobster > nam.tmp 
    133129mv nam.tmp namelist_lobster 
    134  
    135 # iom_put xml file 
    136 if [ "${USE_IOMPUT}" = "true" ] 
    137 then 
    138     get_namelist ${LOC_NAM} xmlio_server.def ${MYO_EXP} xmlio_server.def 
    139     get_namelist ${LOC_NAM} iodef.xml ${MYO_EXP} iodef.xml 
    140     sed -e "s/^ *using_server *=.*$/  using_server = .${USE_IOSERVER}./" xmlio_server.def > tmp$$ 
    141     mv tmp$$ xmlio_server.def 
    142 fi 
    143130 
    144131# Analytical forcing 
    … …  
    266253case ${RUN} in 
    267254   'mon' | 'omp' ) 
    268                liste_files=' *abort* memory* namelist* *xml* perfs* solver.stat ocean.output layout* GYRE* restart* mono*' ;; 
     255               liste_files=' *abort* memory* namelist* perfs* solver.stat ocean.output layout* GYRE* restart* mono*' ;; 
    269256   'mpi' ) 
    270                liste_files=' *abort* namelist* *xml* solver.stat perfs* ocean.output* layout* GYRE* restart* mpp*' ;; 
     257               liste_files=' *abort* namelist* solver.stat perfs* ocean.output* layout* GYRE* restart* mpp*' ;; 
    271258esac 
    272259 
    … …  
    292279############################################################## 
    293280############################################################## 
    294 if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3'  -o ${REF_TAG} = 'nemo_v3_2' ] 
     281if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' ] 
    295282then 
    296283   STORE_DATA=${REF_OD}/${CONF}/${REF_TAG}/${RUN}/${DIROUT} 

  • branches/devmercator2010/NVTK/INSTALL/JOBS/job_ORCA2_LIM.ksh

    r2040 r2072  
    139139 
    140140# Get forcing files 
    141 ${D_GET} ${D_INPUT}/ORCA2_LIM_nemo_v3.2.tar ORCA2_LIM_nemo_v3.2.tar 
    142 tar xvf ORCA2_LIM_nemo_v3.2.tar 
    143 rm -f ORCA2_LIM_nemo_v3.2.tar 
     141${D_GET} ${D_INPUT}/ORCA2_LIM_nemo_v3.1.tar ORCA2_LIM_nemo_v3.1.tar 
     142tar xvf ORCA2_LIM_nemo_v3.1.tar 
     143rm -f ORCA2_LIM_nemo_v3.1.tar 
    144144 
    145145# Get restarts files if needed 
    … …  
    310310############################################################## 
    311311############################################################## 
    312 if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' -o ${REF_TAG} = 'nemo_v3_2' ] 
     312if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' ] 
    313313then 
    314314   STORE_DATA=${REF_OD}/${CONF}/${REF_TAG}/${RUN}/${DIROUT} 

  • branches/devmercator2010/NVTK/INSTALL/JOBS/job_ORCA2_LIM3.ksh

    r2040 r2072  
    135135 
    136136# Get forcing files 
    137 ${D_GET} ${D_INPUT}/ORCA2_LIM_nemo_v3.2.tar ORCA2_LIM_nemo_v3.2.tar 
    138 tar xvf ORCA2_LIM_nemo_v3.2.tar 
    139 rm -f ORCA2_LIM_nemo_v3.2.tar 
     137${D_GET} ${D_INPUT}/ORCA2_LIM_nemo_v3.1.tar ORCA2_LIM_nemo_v3.1.tar 
     138tar xvf ORCA2_LIM_nemo_v3.1.tar 
     139rm -f ORCA2_LIM_nemo_v3.1.tar 
    140140 
    141141# Get restarts files if needed 
    … …  
    306306############################################################## 
    307307############################################################## 
    308 if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' -o ${REF_TAG} = 'nemo_v3_2' ] 
     308if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' ] 
    309309then 
    310310   STORE_DATA=${REF_OD}/${CONF}/${REF_TAG}/${RUN}/${DIROUT} 

  • branches/devmercator2010/NVTK/INSTALL/JOBS/job_ORCA2_LIM_PISCES.ksh

    r2040 r2072  
    1414MYO_EXP=xxx 
    1515TSYMB=xxx 
    16 USE_IOMPUT=xxx 
    17 USE_IOSERVER=xxx 
    18 NB_PROCS_IOSERVER=xxx 
    19  
    2016 
    2117# Variables changed by ins_valid.ksh script 
    … …  
    163159mv nam.tmp namelist_pisces 
    164160 
    165 # iom_put xml file 
    166 if [ "${USE_IOMPUT}" = "true" ] 
    167 then 
    168     get_namelist ${LOC_NAM} xmlio_server.def ${MYO_EXP} xmlio_server.def 
    169     get_namelist ${LOC_NAM} iodef.xml ${MYO_EXP} iodef.xml 
    170     sed -e "s/^ *using_server *=.*$/  using_server = .${USE_IOSERVER}./" xmlio_server.def > tmp$$ 
    171     mv tmp$$ xmlio_server.def 
    172 fi 
    173  
    174161# Get forcing files 
    175 ${D_GET} ${D_INPUT}/ORCA2_LIM_nemo_v3.2.tar ORCA2_LIM_nemo_v3.2.tar 
    176 tar xvf ORCA2_LIM_nemo_v3.2.tar 
    177 rm -f ORCA2_LIM_nemo_v3.2.tar 
     162${D_GET} ${D_INPUT}/ORCA2_LIM_nemo_v3.1.tar ORCA2_LIM_nemo_v3.1.tar 
     163tar xvf ORCA2_LIM_nemo_v3.1.tar 
     164rm -f ORCA2_LIM_nemo_v3.1.tar 
    178165 
    179166# Get forcing pisces files 
    … …  
    305292case ${RUN} in 
    306293   'mon' | 'omp' ) 
    307                liste_files='*abort* memory* namelist* *xml* perfs* solver.stat ocean.output layout* ORCA2* restart* mono*' ;; 
     294               liste_files='*abort* memory* namelist* perfs* solver.stat ocean.output layout* ORCA2* restart* mono*' ;; 
    308295   'mpi' ) 
    309                liste_files='*abort* namelist* *xml* solver.stat perfs* ocean.output* layout* ORCA2* restart* mpp*' ;; 
     296               liste_files='*abort* namelist* solver.stat perfs* ocean.output* layout* ORCA2* restart* mpp*' ;; 
    310297esac 
    311298 
    … …  
    331318############################################################## 
    332319############################################################## 
    333 if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' -o ${REF_TAG} = 'nemo_v3_2' ] 
     320if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' ] 
    334321then 
    335322   STORE_DATA=${REF_OD}/${CONF}/${REF_TAG}/${RUN}/${DIROUT} 

  • branches/devmercator2010/NVTK/INSTALL/JOBS/job_ORCA2_OFF_PISCES.ksh

    r2040 r2072  
    1414MYO_EXP=xxx 
    1515TSYMB=xxx 
    16 USE_IOMPUT=xxx 
    17 USE_IOSERVER=xxx 
    18 NB_PROCS_IOSERVER=xxx 
    19  
    2016 
    2117# Variables changed by ins_valid.ksh script 
    … …  
    138134mv nam.tmp namelist_pisces 
    139135 
    140 # iom_put xml file 
    141 if [ "${USE_IOMPUT}" = "true" ] 
    142 then 
    143     get_namelist ${LOC_NAM} xmlio_server.def ${MYO_EXP} xmlio_server.def 
    144     get_namelist ${LOC_NAM} iodef.xml ${MYO_EXP} iodef.xml 
    145     sed -e "s/^ *using_server *=.*$/  using_server = .${USE_IOSERVER}./" xmlio_server.def > tmp$$ 
    146     mv tmp$$ xmlio_server.def 
    147 fi 
    148136 
    149137# Get forcing files 
    … …  
    276264case ${RUN} in 
    277265   'mon' | 'omp' ) 
    278                liste_files='*abort* memory* namelist* *xml* perfs* ocean.output layout* PISCES* restart* mono*' ;; 
     266               liste_files='*abort* memory* namelist* perfs* ocean.output layout* PISCES* restart* mono*' ;; 
    279267   'mpi' ) 
    280                liste_files='*abort* namelist* *xml* perfs* ocean.output* layout* PISCES* restart* mpp*' ;; 
     268               liste_files='*abort* namelist* perfs* ocean.output* layout* PISCES* restart* mpp*' ;; 
    281269esac 
    282270 
    … …  
    302290############################################################## 
    303291############################################################## 
    304 if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' -o ${REF_TAG} = 'nemo_v3_2' ] 
     292if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' ] 
    305293then 
    306294   STORE_DATA=${REF_OD}/${CONF}/${REF_TAG}/${RUN}/${DIROUT} 

  • branches/devmercator2010/NVTK/INSTALL/JOBS/job_ZAGRIF.ksh

    r2040 r2072  
    1414MYO_EXP=xxx 
    1515TSYMB=xxx 
    16 USE_IOMPUT=xxx 
    17 USE_IOSERVER=xxx 
    18 NB_PROCS_IOSERVER=xxx 
    1916 
    2017# Variables changed by ins_valid.ksh script 
    … …  
    149146done 
    150147 
    151 # iom_put xml file 
    152 if [ "${USE_IOMPUT}" = "true" ] 
    153 then 
    154     get_namelist ${LOC_NAM} xmlio_server.def ${MYO_EXP} xmlio_server.def 
    155     get_namelist ${LOC_NAM} iodef.xml ${MYO_EXP} iodef.xml 
    156     sed -e "s/^ *using_server *=.*$/  using_server = .${USE_IOSERVER}./" xmlio_server.def > tmp$$ 
    157     mv tmp$$ xmlio_server.def 
    158 fi 
    159  
    160148# Get forcing files 
    161 ${D_GET} ${D_INPUT}/ORCA2_LIM_nemo_v3.2.tar ORCA2_LIM_nemo_v3.2.tar 
    162 tar xvf ORCA2_LIM_nemo_v3.2.tar 
    163 rm -f ORCA2_LIM_nemo_v3.2.tar 
     149${D_GET} ${D_INPUT}/ORCA2_LIM_nemo_v3.1.tar ORCA2_LIM_nemo_v3.1.tar 
     150tar xvf ORCA2_LIM_nemo_v3.1.tar 
     151rm -f ORCA2_LIM_nemo_v3.1.tar 
    164152 
    165153# Get restarts files if needed 
    … …  
    279267case ${RUN} in 
    280268   'mon' | 'omp' ) 
    281                liste_files=' *abort* memory* *namelist* *xml* perfs* solver.stat ocean.output 1_Agulhas* layout* ZAGRIF* restart* mono*' ;; 
     269               liste_files=' *abort* memory* *namelist* perfs* solver.stat ocean.output 1_Agulhas* layout* ZAGRIF* restart* mono*' ;; 
    282270   'mpi' ) 
    283                liste_files=' *abort* *namelist* *xml* solver.stat perfs* ocean.output* layout* 1_Agulhas* ZAGRIF* restart* mpp*' ;; 
     271               liste_files=' *abort* *namelist* solver.stat perfs* ocean.output* layout* 1_Agulhas* ZAGRIF* restart* mpp*' ;; 
    284272esac 
    285273 
    … …  
    305293############################################################## 
    306294############################################################## 
    307 if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' -o ${REF_TAG} = 'nemo_v3_2' ] 
     295if [ ${REF_TAG} = 'nemo_v2' -o ${REF_TAG} = 'nemo_v2_3' -o ${REF_TAG} = 'nemo_v3' ] 
    308296then 
    309297   STORE_DATA=${REF_OD}/${CONF}/${REF_TAG}/${RUN}/${DIROUT} 

  • branches/devmercator2010/NVTK/Makefile

    r2040 r2072  
    3636#- 
    3737#- Configurations list which must be tested 
    38 LISTE_CONF = GYRE GYRE_LOBSTER ORCA2_LIM ORCA2_LIM3 ORCA2_LIM_PISCES ORCA2_OFF_PISCES ZAGRIF 
     38LISTE_CONF = GYRE GYRE_LOBSTER ORCA2_LIM ORCA2_LIM3 ORCA2_LIM_PISCES ORCA2_OFF_PISCES 
    3939#- 
    4040#- Jobs to launch use keyword: nojob, all, long, short or gtime 
    … …  
    6060MAK_MEMO = memo 
    6161#- 
    62 #- Experience name or reference Tag name (nemo_v2, nemo_v2_3 ,nemo_v3 or nemo_v3_2) 
    63 REF_TAGV = nemo_v3_2 
     62#- Experience name or reference Tag name (nemo_v2, nemo_v2_3 or nemo_v3) 
     63REF_TAGV = nemo_v3 
    6464#- 
    6565##################################################################### 

  • branches/devmercator2010/NVTK/fait_AA_make

    r2039 r2072  
    126126#-Q- sx8brodie    -R2 \\ 
    127127#-Q- sxdkrz    -R2 \\ 
    128 #-Q- es2    -R2 \\ 
     128#-Q- eshpux    -R2 \\ 
    129129#-Q- aix6      -qsource \\ 
    130130#-Q- babel     -qsource \\ 
    … …  
    143143.PRECIOUS : \$(MODEL_LIB) 
    144144#-Q- sxdkrz .PRECIOUS : \$(SXMODEL_LIB) 
    145 #-Q- es2 .PRECIOUS : \$(SXMODEL_LIB) 
     145#-Q- eshpux .PRECIOUS : \$(SXMODEL_LIB) 
    146146 
    147147# library dependancies 
    … …  
    161161#-Q- sx8brodie    -R2 \\ 
    162162#-Q- sxdkrz    -R2 \\ 
    163 #-Q- es2    -R2 \\ 
     163#-Q- eshpux    -R2 \\ 
    164164#-Q- aix6      -qsource \\ 
    165165#-Q- babel     -qsource \\ 
    … …  
    192192#-Q- sx8brodie    -R2 \\ 
    193193#-Q- sxdkrz    -R2 \\ 
    194 #-Q- es2    -R2 \\ 
     194#-Q- eshpux    -R2 \\ 
    195195#-Q- aix6      -qsource \\ 
    196196#-Q- babel     -qsource \\ 
    … …  
    202202#-Q- sx8brodie    -R2 \\ 
    203203#-Q- sxdkrz    -R2 \\ 
    204 #-Q- es2    -R2 \\ 
     204#-Q- eshpux    -R2 \\ 
    205205#-Q- aix6      -qsource \\ 
    206206#-Q- babel     -qsource \\ 
    … …  
    240240echo '#-Q- sxdkrz  F_O =  -f2003 nocbind -ew -sx6 -ftrace -C vopt -Wf"-init stack=nan" -Wl"-f nan" -Wf"-P nh -O overlap" -Wf"-pvctl noassume loopcnt=10000" -L transform -I $(MODDIR) -I $(MODEL_LIB) -I $(NCDF_INC) $(USER_INC)' 
    241241echo '#-Q- sxdkrz  L_X = $(L_O) -ftrace' 
    242 echo '#-Q- es2  # Compiler options for NEMO (Earth Simulator)' 
    243 echo '#-Q- es2  # for super perfs!' 
    244 echo '#-Q- es2  # F_O = -f2003 nocbind $(FTRACE) -pi nest=5 line=10000 expin=Fmpplib.F -Wf,-A idbl4 -C hopt -Wf"-P nh -O overlap" -Wf,-pvctl noassume loopcnt=10000 -L transform -I $(MODDIR) -I $(MODEL_LIB) -I $(NCDF_INC) $(USER_INC)' 
    245 echo '#-Q- es2  # regular options!' 
    246 echo '#-Q- es2  F_O = -f2003 nocbind $(FTRACE) -Wf,-A idbl4 -C vopt -P stack -Wf"-P nh -O overlap" -Wf,-pvctl noassume loopcnt=10000 -L transform -Wf,-pvctl nomsg -Wf"-O nomsg" -I $(MODDIR) -I $(MODEL_LIB) -I $(NCDF_INC) $(USER_INC)' 
    247 echo '#-Q- es2  L_X = $(L_O)' 
     242echo '#-Q- eshpux  # Compiler options for NEMO (Earth Simulator)' 
     243echo '#-Q- eshpux  # for super perfs!' 
     244echo '#-Q- eshpux  # F_O = -f2003 nocbind $(FTRACE) -pi nest=5 line=10000 expin=Fmpplib.F -Wf,-A idbl4 -C hopt -Wf"-P nh -O overlap" -Wf,-pvctl noassume loopcnt=10000 -L transform -I $(MODDIR) -I $(MODEL_LIB) -I $(NCDF_INC) $(USER_INC)' 
     245echo '#-Q- eshpux  # regular options!' 
     246echo '#-Q- eshpux  F_O = -f2003 nocbind $(FTRACE) -Wf,-A idbl4 -C vopt -P stack -Wf"-P nh -O overlap" -Wf,-pvctl noassume loopcnt=10000 -L transform -Wf,-pvctl nomsg -Wf"-O nomsg" -I $(MODDIR) -I $(MODEL_LIB) -I $(NCDF_INC) $(USER_INC)' 
     247echo '#-Q- eshpux  L_X = $(L_O)' 
    248248echo '#-Q- linux  # Compiler options for NEMO (pgf version)' 
    249249echo '#-Q- linux  F_O = -Mlist -O3 -byteswapio -r8  -I $(MODDIR) -I$(MODEL_LIB) -I $(NCDF_INC) $(USER_INC)' 
    … …  
    276276echo '#-Q- sx8brodie PREF=i.' 
    277277echo '#-Q- sxdkrz PREF=i.' 
    278 echo '#-Q- es2 PREF=i.' 
     278echo '#-Q- eshpux PREF=i.' 
    279279echo '' 
    280280echo '#Run type: mon, mpi or omp ' 
    … …  
    417417   for inc in `sed -n 's/^[   ]*[iI][nN][cC][lL][uU][dD][eE][  ]*\(['\''"]\)\([^'\''"]*\)\1.*/\2/p' $fic | sort -u` 
    418418   do 
    419         if [ "${inc}" != "mpif.h" ] 
    420         then 
    421419       dep="$dep\n$inc" 
    422         fi 
    423420   done 
    424421 
    … …  
    432429   for inc in `sed -n 's/^#[  ]*[iI][nN][cC][lL][uU][dD][eE][  ]*\(['\''"]\)\([^'\''"]*\)\1.*/\2/p' $fic | sort -u` 
    433430   do 
    434             if [ "${inc}" != "mpif.h" ] 
    435             then 
    436             j=1 
     431       j=1 
    437432       dep="$dep\n$inc" 
    438433      for inc2 in `sed -n 's/^#[    ]*[iI][nN][cC][lL][uU][dD][eE][  ]*\(['\''"]\)\([^'\''"]*\)\1.*/\2/p' $inc | sort -u` 
    … …  
    442437          for inc3 in `sed -n 's/^#[   ]*[iI][nN][cC][lL][uU][dD][eE][  ]*\(['\''"]\)\([^'\''"]*\)\1.*/\2/p' $inc2 | sort -u` 
    443438          do 
    444  
    445439         dep="$dep\n$inc3" 
    446440          done 
    447441      done 
    448             fi 
    449442   done 
    450443 
Note: See TracChangeset for help on using the changeset viewer.