Changeset 3121

Timestamp:

02/13/17 15:20:24 (7 years ago)

Author:

mafoipsl

Message:

A series of small changes to prepare IPSLCM6.0.8-LR :

• 71 MPI tasks for LMDZ ie 2 bands of latitude instead of 3
• no systematic creation of mesh_mask in opa9.driver
• lmdz.card : 3 variables modified for LMDZ TS (t2m_min t2m_max and od550_strat replaced by ave_t2m_daily_max, ave_t2m_daily_min and OD550_STRAT)
• add an operation on k for transpir variable in Orchidee monitoring
• change the computation of lag to allow LMDZ coupling with day_step=672
• small correction in oasis.card (InitialStateFiles)
• add debug text files saving for oasis3-mct for each component : 1 for lmdz, 2 for nemo and 3 for xios

Location:

CONFIG/UNIFORM/v6/IPSLCM6

Files:

• EXPERIMENTS/IPSLCM/pdControl/COMP/lmdz.card (modified) (2 diffs)
• EXPERIMENTS/IPSLCM/pdControl/COMP/oasis.card (modified) (1 diff)
• EXPERIMENTS/IPSLCM/pdControl/COMP/opa9.card (modified) (1 diff)
• EXPERIMENTS/IPSLCM/pdControl/COMP/xios.card (modified) (1 diff)
• EXPERIMENTS/IPSLCM/pdControl/config.card (modified) (3 diffs)
• EXPERIMENTS/IPSLCM/piControl/COMP/lmdz.card (modified) (2 diffs)
• EXPERIMENTS/IPSLCM/piControl/COMP/oasis.card (modified) (1 diff)
• EXPERIMENTS/IPSLCM/piControl/COMP/opa9.card (modified) (1 diff)
• EXPERIMENTS/IPSLCM/piControl/COMP/xios.card (modified) (1 diff)
• EXPERIMENTS/IPSLCM/piControl/config.card (modified) (3 diffs)
• GENERAL/DRIVER/oasis.driver (modified) (1 diff)
• GENERAL/DRIVER/opa9.driver (modified) (1 diff)
• GENERAL/POST/monitoring01_lmdz.cfg (modified) (1 diff)
• GENERAL/POST/monitoring01_orchidee.cfg (modified) (1 diff)

CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/pdControl/COMP/lmdz.card

@@ -102 +102 @@
 
 [OutputText]
-List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def, config.def, vert.def, used_run.def, iodef.xml, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt, out_lmdz.x.err, out_lmdz.x.out)
+List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def, config.def, vert.def, used_run.def, iodef.xml, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug_notroot.01, debug.root.01, lmdz.prt, out_lmdz.x.err, out_lmdz.x.out)
 
 [OutputFiles]
@@ -120 +120 @@
 Patches= ()
 GatherWithInternal = (lon, lat, presnivs, time_counter, time_centered, time_centered_bounds, aire)
-TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, ftime_con, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFC, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, rh2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux, taux_ter, taux_sic, taux_lic, taux_oce, tauy, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, nettop, pbase, ptop, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic, wind10m, od550aer, od550lt1aer, od550_strat, absvisaer, loadoa, loadbc, loadso4, loaddust, loadss, sconcoa, sconcbc, sconcso4, sconcdust, sconcss, reffclwtop, cldncl, swtoaas_ant, swtoacs_ant, swtoacf_ant, swsrfas_ant, swsrfcs_ant, swsrfcf_ant, swtoaas_nat, swtoacs_nat, swtoacf_nat, swsrfas_nat, swsrfcs_nat, swsrfcf_nat, solswai, solswad, swtoacf_zero, swsrfcf_zero,R_ecc,  R_peri, R_incl, solaire, co2_ppm, CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt)
+TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, ftime_con, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFC, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, rh2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, ave_t2m_daily_max, ave_t2m_daily_min, taux, taux_ter, taux_sic, taux_lic, taux_oce, tauy, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, nettop, pbase, ptop, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic, wind10m, od550aer, od550lt1aer, OD550_STRAT, absvisaer, loadoa, loadbc, loadso4, loaddust, loadss, sconcoa, sconcbc, sconcso4, sconcdust, sconcss, reffclwtop, cldncl, swtoaas_ant, swtoacs_ant, swtoacf_ant, swsrfas_ant, swsrfcs_ant, swsrfcf_ant, swtoaas_nat, swtoacs_nat, swtoacf_nat, swsrfas_nat, swsrfcs_nat, swsrfcf_nat, solswai, solswad, swtoacf_zero, swsrfcf_zero,R_ecc,  R_peri, R_incl, solaire, co2_ppm, CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt)
 ChunckJob2D = NONE
 TimeSeriesVars3D = (upwd, lwcon, iwcon, lcc3dcon, lcc3dstra, temp, theta, ovap, ovapinit, geop, vitu, vitv, vitw, pres, rneb, rnebcon, rhum, mc, paprs, scdnc, ec550aer, concoa, concbc, concso4, concss, concdust, reffclws, reffclwc, tnt, dtdyn, dtphy, dtlschr, tntr, tntscpbl, tnhus, dqdyn, dqvdf, tnhusscpbl, dqphy, evu, mcd)

CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/pdControl/COMP/oasis.card

@@ -8 +8 @@
 Lucia=n
 
+[InitialStateFiles]
 List=   (${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/flxat_v2.nc, flxat.nc), \
         (${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/sstoc_v2.nc, sstoc.nc), \

CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/pdControl/COMP/opa9.card

@@ -52 +52 @@
 
 [OutputText]
-List=   (ocean.output, solver.stat, namelist, output.namelist.*, context_nemo.xml, field_def_nemo.xml, domain_def_nemo.xml, out_opa.xx.out, out_opa.xx.err)
+List=   (ocean.output, solver.stat, namelist, output.namelist.*, context_nemo.xml, field_def_nemo.xml, domain_def_nemo.xml, out_opa.xx.out, out_opa.xx.err, debug_notroot.02, debug.root.02)
 
 [OutputFiles]

CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/pdControl/COMP/xios.card

@@ -21 +21 @@
 
 [OutputText]
-List=   (out_xios.x.err.*, out_xios.x.out.*)
+List=   (out_xios.x.err.*, out_xios.x.out.*, debug_notroot.03, debug.root.03)
 
 [OutputFiles]

CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/pdControl/config.card

@@ -14 +14 @@
 #----- DEVT TEST PROD
 SpaceName=DEVT
-LongName="IPSLCM6.0.7"
+LongName="IPSLCM6.0.8"
 TagName=IPSLCM6
 #D- Choice of experiment in EXPERIMENTS directory
@@ -151 +151 @@
 [ListOfComponents]
 #D- For each component, Name of component, Tag of component
-ATM= (lmdz, LMDZ-testing-r2729)
-SRF= (orchidee, trunk-r3623)
-SBG= (stomate, trunk-r3623)
-OCE= (opa9, nemo_v3_6_STABLE-r6665)
-ICE= (lim3, nemo_v3_6_STABLE-r6665)
-MBG= (pisces, nemo_v3_6_STABLE-r6665)
-CPL= (oasis, OASIS3-MCT)
-IOS= (xios, trunk-r858)
+ATM= (lmdz, LMDZ-testing-r2787)
+SRF= (orchidee, trunk-r4067)
+SBG= (stomate, trunk-r4067)
+OCE= (opa9, nemo_v3_6_STABLE-r7664)
+ICE= (lim3, nemo_v3_6_STABLE-r7664)
+MBG= (pisces, nemo_v3_6_STABLE-r7664)
+CPL= (oasis, oasis3-mct-r1818)
+IOS= (xios, trunk-r1043)
 
 #========================================================================
@@ -164 +164 @@
 [Executable]
 #D- For each component, Real name of executable, Name of executable for oasis
-ATM= (gcm.e, lmdz.x, 47MPI, 8OMP)
+ATM= (gcm.e, lmdz.x, 71MPI, 8OMP)
 SRF= ("" ,"" )
 SBG= ("" ,"" )

CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/lmdz.card

@@ -100 +100 @@
 
 [OutputText]
-List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def, config.def, vert.def, used_run.def, iodef.xml, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug.01, lmdz.prt, out_lmdz.x.err, out_lmdz.x.out)
+List=   (physiq.def, gcm.def, run.def, traceur.def, guide.def, config.def, vert.def, used_run.def, iodef.xml, context_lmdz.xml, field_def_lmdz.xml, file_def_*lmdz.xml, debug_notroot.01, debug.root.01, lmdz.prt, out_lmdz.x.err, out_lmdz.x.out)
 
 [OutputFiles]
@@ -118 +118 @@
 Patches= ()
 GatherWithInternal = (lon, lat, presnivs, time_counter, time_centered, time_centered_bounds, aire)
-TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, ftime_con, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFC, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, rh2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, t2m_max, t2m_min, taux, taux_ter, taux_sic, taux_lic, taux_oce, tauy, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, nettop, pbase, ptop, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic, wind10m, od550aer, od550lt1aer, od550_strat, absvisaer, loadoa, loadbc, loadso4, loaddust, loadss, sconcoa, sconcbc, sconcso4, sconcdust, sconcss, reffclwtop, cldncl, swtoaas_ant, swtoacs_ant, swtoacf_ant, swsrfas_ant, swsrfcs_ant, swsrfcf_ant, swtoaas_nat, swtoacs_nat, swtoacf_nat, swsrfas_nat, swsrfcs_nat, swsrfcf_nat, solswai, solswad, swtoacf_zero, swsrfcf_zero, R_ecc,  R_peri, R_incl, solaire, co2_ppm, CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt)
+TimeSeriesVars2D = (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, ftime_con, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFC, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, rh2m, sens, sicf, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWdnTOA, SWupTOA, SWdn200, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, ave_t2m_daily_max, ave_t2m_daily_min, taux, taux_ter, taux_sic, taux_lic, taux_oce, tauy, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, nettop, pbase, ptop, topl0, topl, tops0, tops, topswad, topswai, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic, wind10m, od550aer, od550lt1aer, OD550_STRAT, absvisaer, loadoa, loadbc, loadso4, loaddust, loadss, sconcoa, sconcbc, sconcso4, sconcdust, sconcss, reffclwtop, cldncl, swtoaas_ant, swtoacs_ant, swtoacf_ant, swsrfas_ant, swsrfcs_ant, swsrfcf_ant, swtoaas_nat, swtoacs_nat, swtoacf_nat, swsrfas_nat, swsrfcs_nat, swsrfcf_nat, solswai, solswad, swtoacf_zero, swsrfcf_zero, R_ecc,  R_peri, R_incl, solaire, co2_ppm, CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt)
 ChunckJob2D = NONE
 TimeSeriesVars3D = (upwd, lwcon, iwcon, lcc3dcon, lcc3dstra, temp, theta, ovap, ovapinit, geop, vitu, vitv, vitw, pres, rneb, rnebcon, rhum, mc, paprs, scdnc, ec550aer, concoa, concbc, concso4, concss, concdust, reffclws, reffclwc, tnt, dtdyn, dtphy, dtlschr, tntr, tntscpbl, tnhus, dqdyn, dqvdf, tnhusscpbl, dqphy, evu, mcd)

CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/oasis.card

@@ -8 +8 @@
 Lucia=n
 
+[InitialStateFiles]
 List=   (${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/flxat_v2.nc, flxat.nc), \
         (${R_IN}/CPL/IPSLCM6/${config_UserChoices_ORCA_version}x${RESOL_ATM}/sstoc_v2.nc, sstoc.nc), \

CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/opa9.card

@@ -52 +52 @@
 
 [OutputText]
-List=   (ocean.output, solver.stat, namelist, output.namelist.*, context_nemo.xml, field_def_nemo.xml, domain_def_nemo.xml, out_opa.xx.out, out_opa.xx.err)
+List=   (ocean.output, solver.stat, namelist, output.namelist.*, context_nemo.xml, field_def_nemo.xml, domain_def_nemo.xml, out_opa.xx.out, out_opa.xx.err, debug_notroot.02, debug.root.02)
 
 [OutputFiles]

CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/xios.card

@@ -21 +21 @@
 
 [OutputText]
-List=   (out_xios.x.err.*, out_xios.x.out.*)
+List=   (out_xios.x.err.*, out_xios.x.out.*, debug_notroot.03, debug.root.03)
 
 [OutputFiles]

CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/config.card

@@ -14 +14 @@
 #----- DEVT TEST PROD
 SpaceName=DEVT
-LongName="IPSLCM6.0.7"
+LongName="IPSLCM6.0.8"
 TagName=IPSLCM6
 #D- Choice of experiment in EXPERIMENTS directory
@@ -151 +151 @@
 [ListOfComponents]
 #D- For each component, Name of component, Tag of component
-ATM= (lmdz, LMDZ-testing-r2729)
-SRF= (orchidee, trunk-r3623)
-SBG= (stomate, trunk-r3623)
-OCE= (opa9, nemo_v3_6_STABLE-r6665)
-ICE= (lim3, nemo_v3_6_STABLE-r6665)
-MBG= (pisces, nemo_v3_6_STABLE-r6665)
-CPL= (oasis, OASIS3-MCT)
-IOS= (xios, trunk-r858)
+ATM= (lmdz, LMDZ-testing-r2787)
+SRF= (orchidee, trunk-r4067)
+SBG= (stomate, trunk-r4067)
+OCE= (opa9, nemo_v3_6_STABLE-r7664)
+ICE= (lim3, nemo_v3_6_STABLE-r7664)
+MBG= (pisces, nemo_v3_6_STABLE-r7664)
+CPL= (oasis, oasis3-mct-r1818)
+IOS= (xios, trunk-r1043)
 
 #========================================================================
@@ -164 +164 @@
 [Executable]
 #D- For each component, Real name of executable, Name of executable for oasis
-ATM= (gcm.e, lmdz.x, 47MPI, 8OMP)
+ATM= (gcm.e, lmdz.x, 71MPI, 8OMP)
 SRF= ("" ,"" )
 SBG= ("" ,"" )

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/oasis.driver

@@ -66 +66 @@
     IGCM_debug_Print 3 "Parametre de calcul Lag LMDZ mis a jour " ${day_step} ${iphysiq} ${nsplit_phys}
                                                               
-    (( LagAtm = 86400 / day_step * iphysiq / nsplit_phys ))
+    (( LagAtm = 86400 * iphysiq / day_step / nsplit_phys ))
     (( LagAtmRoffCalv = $FreqCoupling + $LagAtm ))
     (( LagOce = 86400 / OPA_NPDT_DAY ))

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/DRIVER/opa9.driver

@@ -111 +111 @@
         OPA_LRSTAR=.FALSE.
         OPA_NRSTDT=0
-        # Put OPA_NMSH=0 when OPA running in parallel mode
-        OPA_NMSH=1
         #echo "NO OPA RESTART"
     elif ( [ "${CumulPeriod}" -eq 1 ] && [ "${config_OCE_Restart}" = "y" ] ) ; then
         OPA_LRSTAR=.TRUE.
         OPA_NRSTDT=0
-        OPA_NMSH=1
         #echo "OPA RESTART"
     else
         OPA_LRSTAR=.TRUE.
         OPA_NRSTDT=2
-        OPA_NMSH=0
         #echo "OPA RESTART"
     fi
 
-    ##-- Meshmask option
+    ##-- Meshmask option. Forced only once.
     IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/COMP/opa9.card UserChoices mesh_mask
 
+    OPA_NMSH=0
     if [ "${opa9_UserChoices_mesh_mask}" = "y" ]; then
         OPA_NMSH=1

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/POST/monitoring01_lmdz.cfg

@@ -53 +53 @@
  prw_global     | "prw"                        | "" | "prw[d=1]"                | "Precipitable water (GLOBAL)"            | "kg/m^2"    | "aire[d=1]"
  od550aer_tropo_forcing | "od550aer"              | "" | "od550aer[d=1]"           | "Total aerosol optical depth at 550nm"   | "-"         | "aire[d=1]"   
- od550aer_strat_forcing | "od550_strat"           | "" | "od550_strat[d=1]"        | "Aerosol optical depth at 550nm"         | "-"         | "aire[d=1]"   
+ od550aer_strat_forcing | "OD550_STRAT"           | "" | "OD550_STRAT[d=1]"        | "Aerosol optical depth at 550nm"         | "-"         | "aire[d=1]"   
  od550lt1aer_forcing    | "od550lt1aer"           | "" | "od550lt1aer[d=1]"        | "Fine mode optical depth"                | "-"         | "aire[d=1]"   
  absvisaer_forcing      | "absvisaer"             | "" | "absvisaer[d=1]"          | "Absorption aerosol visible optical depth" | "-"       | "aire[d=1]"   

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/POST/monitoring01_orchidee.cfg

@@ -46 +46 @@
 evap_lands       | "evap"             |  "" | "evap[d=1]"                        | "Evaporation (LANDS)"               | "mm/d"     | "Areas[d=1]*Contfrac[d=1]"
 evapnu_lands     | "evapnu"           |  "" | "evapnu[d=1]"                      | "Soil evaporation (LANDS)"          | "mm/d"     | "Areas[d=1]*Contfrac[d=1]"
-transpir_lands   | "transpir"         |  "" | "transpir[d=1]"                    | "Transpiration (LANDS)"             | "mm/d"     | "Areas[d=1]*Contfrac[d=1]"
+transpir_lands   | "transpir"         |  "" | "transpir[d=1,k=@sum]"             | "Transpiration (LANDS)"             | "mm/d"     | "Areas[d=1]*Contfrac[d=1]"
 subli_lands      | "subli"            |  "" | "subli[d=1]"                       | "Sublimation (LANDS)"               | "mm/d"     | "Areas[d=1]*Contfrac[d=1]"
 snow_swe_lands   | "frac_snow snow"   |  "" | "snow[d=2]"                        | "Snow Mass (LANDS)"                 | "kg/m^2"   | "Areas[d=2]*Contfrac[d=2]"