Changeset 551 for CONFIG/IPSLCM/IPSLCM5/trunk

Timestamp:

02/09/09 14:43:13 (16 years ago)

Author:

aclsce

Message:

Added possibility to chose opa version by using variable in card :
By default : ORCA_version=ORCA2.1
Temporary solution...

Location:

CONFIG/IPSLCM/IPSLCM5/trunk/EXP00/COMP

Files:

• lmdz.card (modified) (2 diffs)
• nemo.card (modified) (3 diffs)
• oasis.card (modified) (1 diff)

CONFIG/IPSLCM/IPSLCM5/trunk/EXP00/COMP/lmdz.card

@@ -6 +6 @@
 ByPass_hgardfou_mats= n
 LMDZ_adjust= n
+ORCA_version=ORCA2.1
 
 [InitialStateFiles]
@@ -16 +17 @@
         (${R_INIT}/ATM/${config_UserChoices_TagName}/Rugos.nc, .), \
         (${R_INIT}/ATM/${config_UserChoices_TagName}/landiceref.nc, .), \
-        (${R_INIT}/ATM/${config_UserChoices_TagName}/${RESOL}/o2a.nc, .) 
+        (${R_INIT}/ATM/${config_UserChoices_TagName}/\${${compname}_UserChoices_ORCA_version}x${RESOL_ATM}/o2a.nc, .) 
 
 [BoundaryFiles]

CONFIG/IPSLCM/IPSLCM5/trunk/EXP00/COMP/nemo.card

@@ -4 +4 @@
 [UserChoices]
 OPA_NPDT_JOURS=15
+ORCA_version=ORCA2.1
 
 [InitialStateFiles]
@@ -10 +11 @@
 [BoundaryFiles]
 List=   ()
-ListNonDel= (${R_BC}/OCE/${config_UserChoices_TagName}/${RESOL_OCE}/ahmcoef, .), \
-            (${R_BC}/OCE/${config_UserChoices_TagName}/${RESOL_OCE}/bathy_level.nc, .), \
-            (${R_BC}/OCE/${config_UserChoices_TagName}/${RESOL_OCE}/bathy_meter.nc, .), \
-            (${R_BC}/OCE/${config_UserChoices_TagName}/${RESOL_OCE}/coordinates.nc, .), \
-            (${R_BC}/OCE/${config_UserChoices_TagName}/${RESOL_OCE}/data_1m_potential_temperature_nomask.nc, .), \
-            (${R_BC}/OCE/${config_UserChoices_TagName}/${RESOL_OCE}/data_1m_salinity_nomask.nc, .), \
-            (${R_BC}/OCE/${config_UserChoices_TagName}/${RESOL_OCE}/geothermal_heating.nc, .),\
-            (${R_BC}/OCE/${config_UserChoices_TagName}/${RESOL_OCE}/runoff_1m_nomask.nc, .),\
+ListNonDel= (${R_BC}/OCE/${config_UserChoices_TagName}/\${${compname}_UserChoices_ORCA_version}/ahmcoef, .), \
+            (${R_BC}/OCE/${config_UserChoices_TagName}/\${${compname}_UserChoices_ORCA_version}/bathy_level.nc, .), \
+            (${R_BC}/OCE/${config_UserChoices_TagName}/\${${compname}_UserChoices_ORCA_version}/bathy_meter.nc, .), \
+            (${R_BC}/OCE/${config_UserChoices_TagName}/\${${compname}_UserChoices_ORCA_version}/coordinates.nc, .), \
+            (${R_BC}/OCE/${config_UserChoices_TagName}/\${${compname}_UserChoices_ORCA_version}/data_1m_potential_temperature_nomask.nc, .), \
+            (${R_BC}/OCE/${config_UserChoices_TagName}/\${${compname}_UserChoices_ORCA_version}/data_1m_salinity_nomask.nc, .), \
+            (${R_BC}/OCE/${config_UserChoices_TagName}/\${${compname}_UserChoices_ORCA_version}/geothermal_heating.nc, .),\
+            (${R_BC}/OCE/${config_UserChoices_TagName}/\${${compname}_UserChoices_ORCA_version}/runoff_1m_nomask.nc, .),\
 
 [ParametersFiles]
@@ -44 +45 @@
 Patches = ()
 GatherWithInternal = (nav_lon, nav_lat, deptht, time_counter)
-TimeSeriesVars = (iowaflup, sohtc300, sohefldo, soicecov, somxl010, sorunoff, sosaline, sossheig, sosstsst, sowaflep, sowaflcd, sowaflup)
+TimeSeriesVars = (sohtc300, sohefldo, soicecov, somxl010, sosaline, sossheig, sosstsst, sowaflcd, sowaflup)
 
 [Post_1M_grid_U]

CONFIG/IPSLCM/IPSLCM5/trunk/EXP00/COMP/oasis.card

@@ -4 +4 @@
 [UserChoices]
 Output_mode=n
+ORCA_version=ORCA2.1
 
 [InitialStateFiles]
-List=   (${R_INIT}/CPL/${config_UserChoices_TagName}/${RESOL}/flxat.nc, flxat.nc), \
-        (${R_INIT}/CPL/${config_UserChoices_TagName}/${RESOL}/sstoc.nc, sstoc.nc)
+List=   (${R_INIT}/CPL/${config_UserChoices_TagName}/\${${compname}_UserChoices_ORCA_version}x${RESOL_ATM}/flxat.nc, flxat.nc), \
+        (${R_INIT}/CPL/${config_UserChoices_TagName}/\${${compname}_UserChoices_ORCA_version}x${RESOL_ATM}/sstoc.nc, sstoc.nc)
 
 [BoundaryFiles]
 List=   ()
-ListNonDel= (${R_BC}/CPL/${config_UserChoices_TagName}/${RESOL}/grids.nc, grids.nc),\
-            (${R_BC}/CPL/${config_UserChoices_TagName}/${RESOL}/masks.nc, masks.nc),\
-            (${R_BC}/CPL/${config_UserChoices_TagName}/${RESOL}/areas.nc, areas.nc),\
-            (${R_BC}/CPL/${config_UserChoices_TagName}/${RESOL}/mozaic.wa2o, wa2o.flx),\
-            (${R_BC}/CPL/${config_UserChoices_TagName}/${RESOL}/mozaic.wo2a, wo2a.tsg),\
-            (${R_BC}/CPL/${config_UserChoices_TagName}/${RESOL}/mozaic.wa2o.runoff, wa2o.run),\
-            (${R_BC}/CPL/${config_UserChoices_TagName}/${RESOL}/mozaic.wa2o.calvin, wa2o.cal)
+ListNonDel= (${R_BC}/CPL/${config_UserChoices_TagName}/\${${compname}_UserChoices_ORCA_version}x${RESOL_ATM}/grids.nc, grids.nc),\
+            (${R_BC}/CPL/${config_UserChoices_TagName}/\${${compname}_UserChoices_ORCA_version}x${RESOL_ATM}/masks.nc, masks.nc),\
+            (${R_BC}/CPL/${config_UserChoices_TagName}/\${${compname}_UserChoices_ORCA_version}x${RESOL_ATM}/areas.nc, areas.nc),\
+            (${R_BC}/CPL/${config_UserChoices_TagName}/\${${compname}_UserChoices_ORCA_version}x${RESOL_ATM}/mozaic.wa2o, wa2o.flx),\
+            (${R_BC}/CPL/${config_UserChoices_TagName}/\${${compname}_UserChoices_ORCA_version}x${RESOL_ATM}/mozaic.wo2a, wo2a.tsg),\
+            (${R_BC}/CPL/${config_UserChoices_TagName}/\${${compname}_UserChoices_ORCA_version}x${RESOL_ATM}/mozaic.wa2o.runoff, wa2o.run),\
+            (${R_BC}/CPL/${config_UserChoices_TagName}/\${${compname}_UserChoices_ORCA_version}x${RESOL_ATM}/mozaic.wa2o.calvin, wa2o.cal)
 
 [ParametersFiles]