Changeset 4175 for branches/2013/dev_CMCC_2013/NEMOGCM
- Timestamp:
- 2013-11-11T12:07:00+01:00 (11 years ago)
- Location:
- branches/2013/dev_CMCC_2013/NEMOGCM
- Files:
-
- 30 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/2013/dev_CMCC_2013/NEMOGCM/ARCH/arch-X64_CURIE.fcm
r3922 r4175 29 29 # - fcm variables are starting with a % (and not a $) 30 30 # 31 %NCDF_HOME /usr/local/netcdf-4.2_hdf5 32 %HDF5_HOME /usr/local/hdf5-1.8. 831 %NCDF_HOME /usr/local/netcdf-4.2_hdf5_parallel 32 %HDF5_HOME /usr/local/hdf5-1.8.9_parallel 33 33 %XIOS_HOME $WORKDIR/now/models/xios 34 34 %OASIS_HOME $WORKDIR/now/models/oa3mct -
branches/2013/dev_CMCC_2013/NEMOGCM/CONFIG/AMM12/EXP00/iodef.xml
r3940 r4175 62 62 <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 63 63 <axis id="nfloat" long_name="Float number" unit="-" /> 64 <axis id="icbcla" long_name="Iceberg class" unit="-" /> 64 65 </axis_definition> 65 66 -
branches/2013/dev_CMCC_2013/NEMOGCM/CONFIG/GYRE/EXP00/iodef.xml
r3940 r4175 92 92 <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 93 93 <axis id="nfloat" long_name="Float number" unit="-" /> 94 <axis id="icbcla" long_name="Iceberg class" unit="-" /> 94 95 </axis_definition> 95 96 -
branches/2013/dev_CMCC_2013/NEMOGCM/CONFIG/GYRE_BFM/EXP00/iodef.xml
r3940 r4175 62 62 <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 63 63 <axis id="nfloat" long_name="Float number" unit="-" /> 64 <axis id="icbcla" long_name="Iceberg class" unit="-" /> 64 65 </axis_definition> 65 66 -
branches/2013/dev_CMCC_2013/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/iodef.xml
r3940 r4175 128 128 <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 129 129 <axis id="nfloat" long_name="Float number" unit="-" /> 130 <axis id="icbcla" long_name="Iceberg class" unit="-" /> 130 131 </axis_definition> 131 132 -
branches/2013/dev_CMCC_2013/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_ar5.xml
r3940 r4175 248 248 <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 249 249 <axis id="nfloat" long_name="Float number" unit="-" /> 250 <axis id="icbcla" long_name="Iceberg class" unit="-" /> 250 251 </axis_definition> 251 252 -
branches/2013/dev_CMCC_2013/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_default.xml
- Property svn:mime-type deleted
- Property svn:keywords set to Id
r3940 r4175 129 129 <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 130 130 <axis id="nfloat" long_name="Float number" unit="-" /> 131 <axis id="icbcla" long_name="Iceberg class" unit="-" /> 131 132 </axis_definition> 132 133 -
branches/2013/dev_CMCC_2013/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_demo.xml
- Property svn:mime-type deleted
- Property svn:keywords set to Id
r3940 r4175 44 44 <!-- mooring: automatic definition of the file name suffix based on id="0n180wT" --> 45 45 <!-- include a group of variables. see field_def.xml for mooring variables definition --> 46 <file id="0n180wT" 47 <field_group group_ref="mooring" />46 <file id="0n180wT"> 47 <field_group group_ref="mooring" domain_ref="0n180wT" /> 48 48 </file> 49 49 … … 53 53 <field_group id="EqT" domain_ref="EqT" > 54 54 <field field_ref="toce" name="votemper" axis_ref="deptht_myzoom" /> 55 <field field_ref="sss" /> 55 56 </field_group> 56 57 </file> … … 85 86 <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 86 87 <axis id="nfloat" long_name="Float number" unit="-" /> 88 <axis id="icbcla" long_name="Iceberg class" unit="-" /> 87 89 </axis_definition> 88 90 -
branches/2013/dev_CMCC_2013/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_oldstyle.xml
- Property svn:mime-type deleted
- Property svn:keywords set to Id
r3940 r4175 116 116 <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 117 117 <axis id="nfloat" long_name="Float number" unit="-" /> 118 <axis id="icbcla" long_name="Iceberg class" unit="-" /> 118 119 </axis_definition> 119 120 -
branches/2013/dev_CMCC_2013/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/iodef.xml
r3771 r4175 21 21 --> 22 22 23 <file_definition type="multiple_file" sync_freq="1d" min_digits="4">23 <file_definition type="multiple_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="1d" min_digits="4"> 24 24 25 25 <file_group id="1h" output_freq="1h" output_level="10" enabled=".TRUE."/> <!-- 1h files --> … … 60 60 <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 61 61 <axis id="nfloat" long_name="Float number" unit="-" /> 62 <axis id="icbcla" long_name="Iceberg class" unit="-" /> 62 63 </axis_definition> 63 64 -
branches/2013/dev_CMCC_2013/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml
r3905 r4175 21 21 --> 22 22 23 <file_definition type="multiple_file" sync_freq="1d" min_digits="4">23 <file_definition type="multiple_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="10d" min_digits="4"> 24 24 25 25 <file_group id="1h" output_freq="1h" output_level="10" enabled=".TRUE."/> <!-- 1h files --> … … 31 31 <file_group id="1d" output_freq="1d" output_level="10" enabled=".TRUE."> <!-- 1d files --> 32 32 33 <file id=" 1d_grid_T" name="auto" description="ocean T grid variables" >33 <file id="file1" name_suffix="_grid_T" description="ocean T grid variables" > 34 34 <field field_ref="sst" name="sosstsst" /> 35 35 <field field_ref="sss" name="sosaline" /> … … 37 37 </file> 38 38 39 <file id=" 1d_grid_U" name="auto" description="ocean U grid variables" >39 <file id="file2" name_suffix="_grid_U" description="ocean U grid variables" > 40 40 <field field_ref="suoce" name="vozocrtx" /> 41 41 </file> 42 42 43 <file id=" 1d_grid_V" name="auto" description="ocean V grid variables" >43 <file id="file3" name_suffix="_grid_V" description="ocean V grid variables" > 44 44 <field field_ref="svoce" name="vomecrty" /> 45 45 </file> … … 49 49 <file_group id="5d" output_freq="5d" output_level="10" enabled=".TRUE."> <!-- 5d files --> 50 50 51 <file id=" 5d_grid_T" name="auto" description="ocean T grid variables" >51 <file id="file4" name_suffix="_grid_T" description="ocean T grid variables" > 52 52 <field field_ref="toce" name="votemper" /> 53 53 <field field_ref="soce" name="vosaline" /> … … 69 69 </file> 70 70 71 <file id=" 5d_grid_U" name="auto" description="ocean U grid variables" >71 <file id="file5" name_suffix="_grid_U" description="ocean U grid variables" > 72 72 <field field_ref="uoce" name="vozocrtx" /> 73 73 <field field_ref="uoce_eiv" name="vozoeivu" /> … … 75 75 </file> 76 76 77 <file id=" 5d_grid_V" name="auto" description="ocean V grid variables" >77 <file id="file6" name_suffix="_grid_V" description="ocean V grid variables" > 78 78 <field field_ref="voce" name="vomecrty" /> 79 79 <field field_ref="voce_eiv" name="vomeeivv" /> … … 81 81 </file> 82 82 83 <file id=" 5d_grid_W" name="auto" description="ocean W grid variables" >83 <file id="file7" name_suffix="_grid_W" description="ocean W grid variables" > 84 84 <field field_ref="woce" name="vovecrtz" /> 85 85 <field field_ref="avt" name="votkeavt" /> … … 88 88 </file> 89 89 90 <file id=" 5d_icemod" name="auto" description="ice variables" >90 <file id="file8" name_suffix="_icemod" description="ice variables" > 91 91 <field field_ref="ice_pres" /> 92 92 <field field_ref="snowthic_cea" name="isnowthi" /> … … 108 108 <file_group id="1m" output_freq="1mo" output_level="10" enabled=".TRUE."> <!-- real monthly files --> 109 109 110 <file id=" 1m_ptrc_T" name="auto" description="pisces sms variables" >110 <file id="file9" name_suffix="_ptrc_T" description="pisces sms variables" > 111 111 <field field_ref="DIC" /> 112 112 <field field_ref="Alkalini" /> … … 120 120 </file> 121 121 122 <file id=" 1m_diad_T" name="auto" description="additional pisces diagnostics" >122 <file id="file10" name_suffix="_diad_T" description="additional pisces diagnostics" > 123 123 <field field_ref="Cflx" /> 124 124 <field field_ref="Dpco2" /> … … 133 133 <file_group id="1y" output_freq="1y" output_level="10" enabled=".TRUE."> <!-- real yearly files --> 134 134 135 <file id=" 1y_ptrc_T" name="auto" description="pisces sms variables" >135 <file id="file11" name_suffix="_ptrc_T" description="pisces sms variables" > 136 136 <field field_ref="DIC" /> 137 137 <field field_ref="Alkalini" /> … … 160 160 </file> 161 161 162 <file id=" 1y_diad_T" name="auto" description="additional pisces diagnostics" >162 <file id="file12" name_suffix="_diad_T" description="additional pisces diagnostics" > 163 163 <field field_ref="PH" /> 164 164 <field field_ref="CO3" /> … … 230 230 <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 231 231 <axis id="nfloat" long_name="Float number" unit="-" /> 232 <axis id="icbcla" long_name="Iceberg class" unit="-" /> 232 233 </axis_definition> 233 234 -
branches/2013/dev_CMCC_2013/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/iodef.xml
r3771 r4175 21 21 --> 22 22 23 <file_definition type="multiple_file" sync_freq="1d" min_digits="4">23 <file_definition type="multiple_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="1d" min_digits="4"> 24 24 25 25 <file_group id="1h" output_freq="1h" output_level="10" enabled=".TRUE."/> <!-- 1h files --> … … 35 35 <file_group id="1m" output_freq="1mo" output_level="10" enabled=".TRUE."> <!-- real monthly files --> 36 36 37 <file id=" 1m_ptrc_T" name="auto" description="pisces sms variables" >37 <file id="file1" name_suffix="_ptrc_T" description="pisces sms variables" > 38 38 <field field_ref="DIC" /> 39 39 <field field_ref="Alkalini" /> … … 47 47 </file> 48 48 49 <file id=" 1m_diad_T" name="auto" description="additional pisces diagnostics" >49 <file id="file2" name_suffix="_diad_T" description="additional pisces diagnostics" > 50 50 <field field_ref="Cflx" /> 51 51 <field field_ref="Dpco2" /> … … 60 60 <file_group id="1y" output_freq="1y" output_level="10" enabled=".TRUE."> <!-- real yearly files --> 61 61 62 <file id=" 1y_ptrc_T" name="auto" description="pisces sms variables" >62 <file id="file3" name_suffix="_ptrc_T" description="pisces sms variables" > 63 63 <field field_ref="DIC" /> 64 64 <field field_ref="Alkalini" /> … … 87 87 </file> 88 88 89 <file id=" 1y_diad_T" name="auto" description="additional pisces diagnostics" >89 <file id="file4" name_suffix="_diad_T" description="additional pisces diagnostics" > 90 90 <field field_ref="PH" /> 91 91 <field field_ref="CO3" /> … … 157 157 <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 158 158 <axis id="nfloat" long_name="Float number" unit="-" /> 159 <axis id="icbcla" long_name="Iceberg class" unit="-" /> 159 160 </axis_definition> 160 161 -
branches/2013/dev_CMCC_2013/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/iodef.xml
r3771 r4175 21 21 --> 22 22 23 <file_definition type="multiple_file" sync_freq="1d" min_digits="4">23 <file_definition type="multiple_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="1d" min_digits="4"> 24 24 25 25 <file_group id="1h" output_freq="1h" output_level="10" enabled=".TRUE."/> <!-- 1h files --> … … 60 60 <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 61 61 <axis id="nfloat" long_name="Float number" unit="-" /> 62 <axis id="icbcla" long_name="Iceberg class" unit="-" /> 62 63 </axis_definition> 63 64 -
branches/2013/dev_CMCC_2013/NEMOGCM/CONFIG/SHARED/field_def.xml
r3905 r4175 221 221 </field_group> 222 222 223 <!-- variables available with iceberg trajectories --> 224 <field_group id="icbvar" domain_ref="grid_T" > 225 <field id="berg_melt" long_name="icb melt rate of icebergs" unit="kg/m2/s" /> 226 <field id="berg_buoy_melt" long_name="icb buoyancy component of iceberg melt rate" unit="kg/m2/s" /> 227 <field id="berg_eros_melt" long_name="icb erosion component of iceberg melt rate" unit="kg/m2/s" /> 228 <field id="berg_conv_melt" long_name="icb convective component of iceberg melt rate" unit="kg/m2/s" /> 229 <field id="berg_virtual_area" long_name="icb virtual coverage by icebergs" unit="m2" /> 230 <field id="bits_src" long_name="icb mass source of bergy bits" unit="kg/m2/s" /> 231 <field id="bits_melt" long_name="icb melt rate of bergy bits" unit="kg/m2/s" /> 232 <field id="bits_mass" long_name="icb bergy bit density field" unit="kg/m2" /> 233 <field id="berg_mass" long_name="icb iceberg density field" unit="kg/m2" /> 234 <field id="calving" long_name="icb calving mass input" unit="kg/s" /> 235 <field id="berg_floating_melt" long_name="icb melt rate of icebergs + bits" unit="kg/m2/s" /> 236 <field id="berg_real_calving" long_name="icb calving into iceberg class" unit="kg/s" axis_ref="icbcla" /> 237 <field id="berg_stored_ice" long_name="icb accumulated ice mass by class" unit="kg" axis_ref="icbcla" /> 238 </field_group> 239 223 240 <!-- ptrc on T grid --> 224 241 … … 249 266 <field id="NH4" long_name="Ammonium Concentration" unit="mmol/m3" /> 250 267 268 <!-- PISCES with Kriest parametisation : variables available with key_kriest --> 269 <field id="Num" long_name="Number of organic particles" unit="nbr" /> 270 271 <!-- PISCES light : variables available with key_pisces_reduced --> 251 272 <field id="DET" long_name="Detritus" unit="mmol-N/m3" /> 252 273 <field id="DOM" long_name="Dissolved Organic Matter" unit="mmol-N/m3" /> 253 274 275 <!-- CFC11 : variables available with key_cfc --> 254 276 <field id="CFC11" long_name="CFC-11 Concentration" unit="umol/L" /> 277 <!-- Bomb C14 : variables available with key_c14b --> 255 278 <field id="C14B" long_name="Bomb C14 Concentration" unit="ration" /> 256 279 </field_group> 257 280 258 <!-- diad on T grid : variables available with key_diatrc --> 259 281 <!-- PISCES additional diagnostics on T grid --> 260 282 <field_group id="diad_T" grid_ref="grid_T_2D"> 261 283 <field id="PH" long_name="PH" unit="-" grid_ref="grid_T_3D" /> … … 311 333 <field id="Heup" long_name="Euphotic layer depth" unit="m" /> 312 334 <field id="Irondep" long_name="Iron deposition from dust" unit="mol/m2/s" /> 313 <field id="Ironsed" long_name="Iron deposition from sediment" unit="mol/m2/s" grid_ref="grid_T_3D" /> 314 315 <field id="FNO3PHY" long_name="FNO3PHY" unit="-" grid_ref="grid_T_3D" /> 316 <field id="FNH4PHY" long_name="FNH4PHY" unit="-" grid_ref="grid_T_3D" /> 317 <field id="FNH4NO3" long_name="FNH4NO3" unit="-" grid_ref="grid_T_3D" /> 318 <field id="TNO3PHY" long_name="TNO3PHY" unit="-" /> 319 <field id="TNH4PHY" long_name="TNH4PHY" unit="-" /> 320 <field id="TPHYDOM" long_name="TPHYDOM" unit="-" /> 321 <field id="TPHYNH4" long_name="TPHYNH4" unit="-" /> 322 <field id="TPHYZOO" long_name="TPHYZOO" unit="-" /> 323 <field id="TPHYDET" long_name="TPHYDET" unit="-" /> 324 <field id="TDETZOO" long_name="TDETZOO" unit="-" /> 325 <field id="TZOODET" long_name="TZOODET" unit="-" /> 326 <field id="TZOOBOD" long_name="TZOOBOD" unit="-" /> 327 <field id="TZOONH4" long_name="TZOONH4" unit="-" /> 328 <field id="TZOODOM" long_name="TZOODOM" unit="-" /> 329 <field id="TNH4NO3" long_name="TNH4NO3" unit="-" /> 330 <field id="TDOMNH4" long_name="TDOMNH4" unit="-" /> 331 <field id="TDETNH4" long_name="TDETNH4" unit="-" /> 332 <field id="TPHYTOT" long_name="TPHYTOT" unit="-" /> 333 <field id="TZOOTOT" long_name="TZOOTOT" unit="-" /> 334 <field id="SEDPOC" long_name="SEDPOC" unit="-" /> 335 <field id="TDETSED" long_name="TDETSED" unit="-" /> 336 337 <field id="qtrCFC11" long_name="Air-sea flux of CFC-11" unit="mol/m2/s" /> 338 <field id="qintCFC11" long_name="Cumulative air-sea flux of CFC-11" unit="mol/m2" /> 339 <field id="qtrC14b" long_name="Air-sea flux of Bomb C14" unit="mol/m2/s" /> 340 <field id="qintC14b" long_name="Cumulative air-sea flux of Bomb C14" unit="mol/m2" /> 341 <field id="fdecay" long_name="Radiactive decay of Bomb C14" unit="mol/m3" grid_ref="grid_T_3D" /> 335 <field id="Ironsed" long_name="Iron deposition from sediment" unit="mol/m2/s" grid_ref="grid_T_3D "/> 336 337 <!-- PISCES with Kriest parametisation : variables available with key_kriest --> 338 <field id="POCFlx" long_name="Particulate organic C flux" unit="mol/m2/s" grid_ref="grid_T_3D" /> 339 <field id="NumFlx" long_name="Particle number flux" unit="nbr/m2/s" grid_ref="grid_T_3D" /> 340 <field id="SiFlx" long_name="Biogenic Si flux" unit="mol/m2/s" grid_ref="grid_T_3D" /> 341 <field id="CaCO3Flx" long_name="CaCO3 flux" unit="mol/m2/s" grid_ref="grid_T_3D" /> 342 <field id="xnum" long_name="Number of particles in aggregats" unit="-" grid_ref="grid_T_3D" /> 343 <field id="W1" long_name="sinking speed of mass flux" unit="m2/s" grid_ref="grid_T_3D" /> 344 <field id="W2" long_name="sinking speed of number flux" unit="m2/s" grid_ref="grid_T_3D" /> 345 346 <!-- PISCES light : variables available with key_pisces_reduced --> 347 <field id="FNO3PHY" long_name="FNO3PHY" unit="-" grid_ref="grid_T_3D" /> 348 <field id="FNH4PHY" long_name="FNH4PHY" unit="-" grid_ref="grid_T_3D" /> 349 <field id="FNH4NO3" long_name="FNH4NO3" unit="-" grid_ref="grid_T_3D" /> 350 <field id="TNO3PHY" long_name="TNO3PHY" unit="-" /> 351 <field id="TNH4PHY" long_name="TNH4PHY" unit="-" /> 352 <field id="TPHYDOM" long_name="TPHYDOM" unit="-" /> 353 <field id="TPHYNH4" long_name="TPHYNH4" unit="-" /> 354 <field id="TPHYZOO" long_name="TPHYZOO" unit="-" /> 355 <field id="TPHYDET" long_name="TPHYDET" unit="-" /> 356 <field id="TDETZOO" long_name="TDETZOO" unit="-" /> 357 <field id="TZOODET" long_name="TZOODET" unit="-" /> 358 <field id="TZOOBOD" long_name="TZOOBOD" unit="-" /> 359 <field id="TZOONH4" long_name="TZOONH4" unit="-" /> 360 <field id="TZOODOM" long_name="TZOODOM" unit="-" /> 361 <field id="TNH4NO3" long_name="TNH4NO3" unit="-" /> 362 <field id="TDOMNH4" long_name="TDOMNH4" unit="-" /> 363 <field id="TDETNH4" long_name="TDETNH4" unit="-" /> 364 <field id="TPHYTOT" long_name="TPHYTOT" unit="-" /> 365 <field id="TZOOTOT" long_name="TZOOTOT" unit="-" /> 366 <field id="SEDPOC" long_name="SEDPOC" unit="-" /> 367 <field id="TDETSED" long_name="TDETSED" unit="-" /> 368 369 <!-- CFC11 : variables available with key_cfc --> 370 <field id="qtrCFC11" long_name="Air-sea flux of CFC-11" unit="mol/m2/s" /> 371 <field id="qintCFC11" long_name="Cumulative air-sea flux of CFC-11" unit="mol/m2" /> 372 <!-- Bomb C14 : variables available with key_c14b --> 373 <field id="qtrC14b" long_name="Air-sea flux of Bomb C14" unit="mol/m2/s" /> 374 <field id="qintC14b" long_name="Cumulative air-sea flux of Bomb C14" unit="mol/m2" /> 375 <field id="fdecay" long_name="Radiactive decay of Bomb C14" unit="mol/m3" grid_ref="grid_T_3D" /> 342 376 </field_group> 343 377 -
branches/2013/dev_CMCC_2013/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn.F90
r3294 r4175 30 30 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 31 31 USE in_out_manager ! 32 USE domvvl ! variable volume 32 33 33 34 IMPLICIT NONE … … 84 85 pu2d(:,:) = 0.e0 85 86 pv2d(:,:) = 0.e0 86 DO jk = 1, jpkm1 !! Vertically integrated momentum trends 87 pu2d(:,:) = pu2d(:,:) + fse3u(:,:,jk) * umask(:,:,jk) * ua(:,:,jk) 88 pv2d(:,:) = pv2d(:,:) + fse3v(:,:,jk) * vmask(:,:,jk) * va(:,:,jk) 89 END DO 90 pu2d(:,:) = pu2d(:,:) * phur(:,:) 91 pv2d(:,:) = pv2d(:,:) * phvr(:,:) 87 IF (lk_vvl) THEN 88 DO jk = 1, jpkm1 !! Vertically integrated momentum trends 89 pu2d(:,:) = pu2d(:,:) + fse3u_a(:,:,jk) * umask(:,:,jk) * ua(:,:,jk) 90 pv2d(:,:) = pv2d(:,:) + fse3v_a(:,:,jk) * vmask(:,:,jk) * va(:,:,jk) 91 END DO 92 pu2d(:,:) = pu2d(:,:) / ( hu_0(:,:) + sshu_a(:,:) + 1._wp - umask(:,:,1) ) 93 pv2d(:,:) = pv2d(:,:) / ( hv_0(:,:) + sshv_a(:,:) + 1._wp - vmask(:,:,1) ) 94 ELSE 95 DO jk = 1, jpkm1 !! Vertically integrated momentum trends 96 pu2d(:,:) = pu2d(:,:) + fse3u(:,:,jk) * umask(:,:,jk) * ua(:,:,jk) 97 pv2d(:,:) = pv2d(:,:) + fse3v(:,:,jk) * vmask(:,:,jk) * va(:,:,jk) 98 END DO 99 pu2d(:,:) = pu2d(:,:) * phur(:,:) 100 pv2d(:,:) = pv2d(:,:) * phvr(:,:) 101 ENDIF 92 102 DO jk = 1 , jpkm1 93 ua(:,:,jk) = ua(:,:,jk) - pu2d(:,:) 94 va(:,:,jk) = va(:,:,jk) - pv2d(:,:) 103 ua(:,:,jk) = ua(:,:,jk) - pu2d(:,:) * umask(:,:,jk) 104 va(:,:,jk) = va(:,:,jk) - pv2d(:,:) * vmask(:,:,jk) 95 105 END DO 96 106 -
branches/2013/dev_CMCC_2013/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90
r3680 r4175 59 59 60 60 indic = 0 ! reset to no error condition 61 IF( kstp == nit000 ) CALL iom_init ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS) 61 62 IF( kstp /= nit000 ) CALL day( kstp ) ! Calendar (day was already called at nit000 in day_init) 62 CALL iom_setkt( kstp ) ! say to iom that we are at time step kstp63 CALL iom_setkt( kstp - nit000 + 1 ) ! say to iom that we are at time step kstp 63 64 64 65 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> … … 106 107 !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 107 108 CALL dia_wri( kstp ) ! ocean model: outputs 109 IF( lk_diahth ) CALL dia_hth( kstp ) ! Thermocline depth (20°C) 110 108 111 109 112 #if defined key_top -
branches/2013/dev_CMCC_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90
r3680 r4175 42 42 #endif 43 43 #if defined key_lim3 44 USE ice_3 44 USE par_ice 45 USE ice 45 46 #endif 46 47 USE domvvl … … 484 485 ijglo = secs(jsec)%listPoint(jpt)%J + jpjzoom - 1 + njmpp - 1 485 486 WRITE(numout,*)' # I J : ',iiglo,ijglo 487 CALL FLUSH(numout) 486 488 ENDDO 487 489 ENDIF … … 606 608 607 609 !! * Local variables 608 INTEGER :: jk, jseg, jclass, &!loop on level/segment/classes610 INTEGER :: jk, jseg, jclass,jl, &!loop on level/segment/classes/ice categories 609 611 isgnu, isgnv ! 610 612 REAL(wp) :: zumid, zvmid, &!U/V velocity on a cell segment … … 771 773 772 774 zTnorm=zumid_ice*e2u(k%I,k%J)+zvmid_ice*e1v(k%I,k%J) 773 775 776 #if defined key_lim2 774 777 transports_2d(1,jsec,jseg) = transports_2d(1,jsec,jseg) + (zTnorm)* & 775 778 (1.0 - frld(sec%listPoint(jseg)%I,sec%listPoint(jseg)%J)) & … … 778 781 transports_2d(2,jsec,jseg) = transports_2d(2,jsec,jseg) + (zTnorm)* & 779 782 (1.0 - frld(sec%listPoint(jseg)%I,sec%listPoint(jseg)%J)) 783 #endif 784 #if defined key_lim3 785 DO jl=1,jpl 786 transports_2d(1,jsec,jseg) = transports_2d(1,jsec,jseg) + (zTnorm)* & 787 a_i(sec%listPoint(jseg)%I,sec%listPoint(jseg)%J,jl) * & 788 ( ht_i(sec%listPoint(jseg)%I,sec%listPoint(jseg)%J,jl) + & 789 ht_s(sec%listPoint(jseg)%I,sec%listPoint(jseg)%J,jl) ) 790 791 transports_2d(2,jsec,jseg) = transports_2d(2,jsec,jseg) + (zTnorm)* & 792 a_i(sec%listPoint(jseg)%I,sec%listPoint(jseg)%J,jl) 793 ENDDO 794 #endif 780 795 781 796 ENDIF !end of ice case -
branches/2013/dev_CMCC_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90
r3294 r4175 192 192 INTEGER :: iku, ikv ! local integers 193 193 INTEGER :: ii0, ii1, ij0, ij1 ! temporary integers 194 REAL(wp) :: zvt 194 REAL(wp) :: zvt, zvtip1, zvtjp1 ! local scalars 195 195 !!---------------------------------------------------------------------- 196 196 ! … … 202 202 WRITE(numout,*) '~~~~~~~~~ ' 203 203 pe3u_b(:,:,jpk) = fse3u_0(:,:,jpk) 204 pe3v_b(:,:,jpk) = fse3 u_0(:,:,jpk)204 pe3v_b(:,:,jpk) = fse3v_0(:,:,jpk) 205 205 ENDIF 206 206 … … 208 208 DO jj = 2, jpjm1 209 209 DO ji = fs_2, fs_jpim1 210 zvt = fse3t_b(ji,jj,jk) * e1e2t(ji,jj) 211 pe3u_b(ji,jj,jk) = 0.5_wp * ( zvt + fse3t_b(ji+1,jj,jk) * e1e2t(ji+1,jj) ) / ( e1u(ji,jj) * e2u(ji,jj) ) 212 pe3v_b(ji,jj,jk) = 0.5_wp * ( zvt + fse3t_b(ji,jj+1,jk) * e1e2t(ji,jj+1) ) / ( e1v(ji,jj) * e2v(ji,jj) ) 210 zvt = ( fse3t_b(ji ,jj ,jk) - fse3t_0(ji ,jj ,jk) ) * e1e2t(ji ,jj ) 211 zvtip1 = ( fse3t_b(ji+1,jj ,jk) - fse3t_0(ji+1,jj ,jk) ) * e1e2t(ji+1,jj ) 212 zvtjp1 = ( fse3t_b(ji ,jj+1,jk) - fse3t_0(ji ,jj+1,jk) ) * e1e2t(ji ,jj+1) 213 pe3u_b(ji,jj,jk) = fse3u_0(ji,jj,jk) + 0.5_wp * ( zvt + zvtip1 ) / ( e1u(ji,jj) * e2u(ji,jj) ) 214 pe3v_b(ji,jj,jk) = fse3v_0(ji,jj,jk) + 0.5_wp * ( zvt + zvtjp1 ) / ( e1v(ji,jj) * e2v(ji,jj) ) 213 215 END DO 214 216 END DO -
branches/2013/dev_CMCC_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90
r3926 r4175 1373 1373 where (e3vw (:,:,:).eq.0.0) e3vw(:,:,:) = 1.0 1374 1374 1375 #if defined key_agrif 1376 ! Ensure meaningful vertical scale factors in ghost lines/columns 1377 IF( .NOT. Agrif_Root() ) THEN 1378 ! 1379 IF((nbondi == -1).OR.(nbondi == 2)) THEN 1380 e3u(1,:,:) = e3u(2,:,:) 1381 ENDIF 1382 ! 1383 IF((nbondi == 1).OR.(nbondi == 2)) THEN 1384 e3u(nlci-1,:,:) = e3u(nlci-2,:,:) 1385 ENDIF 1386 ! 1387 IF((nbondj == -1).OR.(nbondj == 2)) THEN 1388 e3v(:,1,:) = e3v(:,2,:) 1389 ENDIF 1390 ! 1391 IF((nbondj == 1).OR.(nbondj == 2)) THEN 1392 e3v(:,nlcj-1,:) = e3v(:,nlcj-2,:) 1393 ENDIF 1394 ! 1395 ENDIF 1396 #endif 1375 1397 1376 1398 fsdept(:,:,:) = gdept (:,:,:) … … 1421 1443 WRITE(numout,"(10x,i4,4f9.2)") ( jk, fsdept(1,1,jk), fsdepw(1,1,jk), & 1422 1444 & fse3t (1,1,jk), fse3w (1,1,jk), jk=1,jpk ) 1423 DO jj = mj0(20), mj1(20) 1424 DO ji = mi0(20), mi1(20) 1445 iip1 = MIN(20, jpiglo-1) ! for config with i smaller than 20 points 1446 ijp1 = MIN(20, jpjglo-1) ! for config with j smaller than 20 points 1447 DO jj = mj0(ijp1), mj1(ijp1) 1448 DO ji = mi0(iip1), mi1(iip1) 1425 1449 WRITE(numout,*) 1426 WRITE(numout,*) ' domzgr: vertical coordinates : point (20,20,k) bathy = ', bathy(ji,jj), hbatt(ji,jj) 1450 WRITE(numout,*) ' domzgr: vertical coordinates : point (',iip1,',',ijp1,',k) bathy = ', & 1451 & bathy(ji,jj), hbatt(ji,jj) 1427 1452 WRITE(numout,*) ' ~~~~~~ --------------------' 1428 1453 WRITE(numout,"(9x,' level gdept gdepw gde3w e3t e3w ')") … … 1431 1456 END DO 1432 1457 END DO 1433 DO jj = mj0(74), mj1(74) 1434 DO ji = mi0(100), mi1(100) 1458 iip1 = MIN( 74, jpiglo-1) 1459 ijp1 = MIN( 100, jpjglo-1) 1460 DO jj = mj0(ijp1), mj1(ijp1) 1461 DO ji = mi0(iip1), mi1(iip1) 1435 1462 WRITE(numout,*) 1436 WRITE(numout,*) ' domzgr: vertical coordinates : point (100,74,k) bathy = ', bathy(ji,jj), hbatt(ji,jj) 1463 WRITE(numout,*) ' domzgr: vertical coordinates : point (',iip1,',',ijp1,',k) bathy = ', & 1464 & bathy(ji,jj), hbatt(ji,jj) 1437 1465 WRITE(numout,*) ' ~~~~~~ --------------------' 1438 1466 WRITE(numout,"(9x,' level gdept gdepw gde3w e3t e3w ')") -
branches/2013/dev_CMCC_2013/NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90
r3614 r4175 37 37 USE par_oce ! ocean parameters 38 38 USE lib_mpp ! MPP library 39 USE fldread ! read input fields (FLD type)40 39 41 40 IMPLICIT NONE … … 151 150 REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) :: griddata !: work array for icbrst 152 151 153 TYPE(FLD), PUBLIC, ALLOCATABLE , DIMENSION(:) :: sf_icb !: structure: file information, fields read154 155 152 !!---------------------------------------------------------------------- 156 153 !! NEMO/OPA 3.3 , NEMO Consortium (2011) … … 168 165 ! 169 166 icb_alloc = 0 170 ALLOCATE( berg_grid , & 171 & berg_grid%calving (jpi,jpj) , berg_grid%calving_hflx (jpi,jpj) , & 167 ALLOCATE( berg_grid%calving (jpi,jpj) , berg_grid%calving_hflx (jpi,jpj) , & 172 168 & berg_grid%stored_heat(jpi,jpj) , berg_grid%floating_melt(jpi,jpj) , & 173 169 & berg_grid%maxclass (jpi,jpj) , berg_grid%stored_ice (jpi,jpj,nclasses) , & -
branches/2013/dev_CMCC_2013/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90
r3785 r4175 35 35 PUBLIC icb_init ! routine called in nemogcm.F90 module 36 36 37 CHARACTER(len=100) :: cn_dir = './' ! Root directory for location of icb files 38 TYPE(FLD_N) :: sn_icb ! information about the calving file to be read 37 CHARACTER(len=100) :: cn_dir = './' !: Root directory for location of icb files 38 TYPE(FLD_N) :: sn_icb !: information about the calving file to be read 39 TYPE(FLD), PUBLIC, ALLOCATABLE , DIMENSION(:) :: sf_icb !: structure: file information, fields read 40 !: used in icbini and icbstp 39 41 40 42 !!---------------------------------------------------------------------- -
branches/2013/dev_CMCC_2013/NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90
r3614 r4175 24 24 USE lib_mpp 25 25 USE iom 26 USE fldread 26 27 USE timing ! timing 27 28 -
branches/2013/dev_CMCC_2013/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90
r3940 r4175 31 31 USE sbc_oce, ONLY : nn_fsbc ! ocean space and time domain 32 32 USE trc_oce, ONLY : nn_dttrc ! !: frequency of step on passive tracers 33 USE icb_oce, ONLY : class_num ! !: iceberg classes 33 34 USE domngb ! ocean space and time domain 34 35 USE phycst ! physical constants … … 99 100 clname = "nemo" 100 101 IF( TRIM(Agrif_CFixed()) /= '0' ) clname = TRIM(Agrif_CFixed())//"_"//TRIM(clname) 102 # if defined key_mpp_mpi 101 103 CALL xios_context_initialize(TRIM(clname), mpi_comm_opa) 104 # else 105 CALL xios_context_initialize(TRIM(clname), 0) 106 # endif 102 107 CALL iom_swap 103 108 … … 124 129 CALL iom_set_axis_attr( "depthw", gdepw_0 ) 125 130 # if defined key_floats 126 CALL iom_set_axis_attr( "nfloat", ( ji, ji=1,nfloat) )131 CALL iom_set_axis_attr( "nfloat", (/ (REAL(ji,wp), ji=1,nfloat) /) ) 127 132 # endif 133 CALL iom_set_axis_attr( "icbcla", class_num ) 128 134 129 135 ! automatic definitions of some of the xml attributs -
branches/2013/dev_CMCC_2013/NEMOGCM/NEMO/OPA_SRC/LBC/mppini_2.h90
r3818 r4175 122 122 irestj = 1 + MOD( jpjglo - nrecj -1 , jpnj ) 123 123 124 #if defined key_nemocice_decomp 125 ! Change padding to be consistent with CICE 126 ilci(1:jpni-1 ,:) = jpi 127 ilci(jpni ,:) = jpiglo - (jpni - 1) * (jpi - nreci) 128 129 ilcj(:, 1:jpnj-1) = jpj 130 ilcj(:, jpnj) = jpjglo - (jpnj - 1) * (jpj - nrecj) 131 #else 124 132 ilci(1:iresti ,:) = jpi 125 133 ilci(iresti+1:jpni ,:) = jpi-1 … … 127 135 ilcj(:, 1:irestj) = jpj 128 136 ilcj(:, irestj+1:jpnj) = jpj-1 137 #endif 129 138 130 139 IF(lwp) WRITE(numout,*) -
branches/2013/dev_CMCC_2013/NEMOGCM/NEMO/OPA_SRC/SOL/solmat.F90
r3609 r4175 30 30 USE lbclnk ! lateral boudary conditions 31 31 USE lib_mpp ! distributed memory computing 32 USE c1d ! 1D vertical configuration 32 33 USE in_out_manager ! I/O manager 33 34 USE timing ! timing … … 271 272 272 273 ! SOR and PCG solvers 274 IF( lk_c1d ) CALL lbc_lnk( gcdmat, 'T', 1._wp ) ! 1D case bmask =/0 but gcdmat not define everywhere 273 275 DO jj = 1, jpj 274 276 DO ji = 1, jpi -
branches/2013/dev_CMCC_2013/NEMOGCM/NEMO/OPA_SRC/step.F90
r3769 r4175 271 271 ! 272 272 #if defined key_iomput 273 IF( kstp == nitend 273 IF( kstp == nitend .OR. indic < 0 ) CALL xios_context_finalize() ! needed for XIOS+AGRIF 274 274 #endif 275 275 ! -
branches/2013/dev_CMCC_2013/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zfechem.F90
r3904 r4175 129 129 zoxy = trn(ji,jj,jk,jpoxy) * ( rhop(ji,jj,jk) / 1.e3 ) 130 130 ! Fe2+ oxydation rate from Santana-Casiano et al. (2005) 131 zkox = 35.407 - 6.7109 * zph + 0.5342 * zph * zph - 5362.6 / ( tsn(ji,jj, 1,jp_tem) + 273.15 ) &131 zkox = 35.407 - 6.7109 * zph + 0.5342 * zph * zph - 5362.6 / ( tsn(ji,jj,jk,jp_tem) + 273.15 ) & 132 132 & - 0.04406 * SQRT( tsn(ji,jj,jk,jp_sal) ) - 0.002847 * tsn(ji,jj,jk,jp_sal) 133 133 zkox = ( 10.** zkox ) * spd -
branches/2013/dev_CMCC_2013/NEMOGCM/NEMO/TOP_SRC/PISCES/P4Z/p4zsms.F90
r3882 r4175 392 392 #endif 393 393 & + trn(:,:,:,jpsfe) & 394 & + trn(:,:,:,jpzoo) 394 & + trn(:,:,:,jpzoo) * ferat3 & 395 395 & + trn(:,:,:,jpmes) * ferat3 ) * cvol(:,:,:) ) 396 396 -
branches/2013/dev_CMCC_2013/NEMOGCM/SETTE/iodef_sette.xml
r3764 r4175 21 21 --> 22 22 23 <file_definition type="multiple_file" sync_freq="1d" min_digits="4">23 <file_definition type="multiple_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="1d" min_digits="4"> 24 24 25 25 <file_group id="1h" output_freq="1h" output_level="10" enabled=".FALSE."/> <!-- 1h files --> … … 54 54 55 55 <axis_definition> 56 <axis id="deptht" long_name="Vertical T levels" unit="m" /><!-- positive=".FALSE." -->57 <axis id="depthu" long_name="Vertical U levels" unit="m" /><!-- positive=".FALSE." -->58 <axis id="depthv" long_name="Vertical V levels" unit="m" /><!-- positive=".FALSE." -->59 <axis id="depthw" long_name="Vertical W levels" unit="m" /><!-- positive=".FALSE." -->56 <axis id="deptht" long_name="Vertical T levels" unit="m" positive="down" /> 57 <axis id="depthu" long_name="Vertical U levels" unit="m" positive="down" /> 58 <axis id="depthv" long_name="Vertical V levels" unit="m" positive="down" /> 59 <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 60 60 <axis id="nfloat" long_name="Float number" unit="-" /> 61 <axis id="icbcla" long_name="Iceberg class" unit="-" /> 61 62 </axis_definition> 62 63 -
branches/2013/dev_CMCC_2013/NEMOGCM/TOOLS/MISCELLANEOUS/chk_iomput.sh
r2404 r4175 35 35 echo ' --insrc only print all variable definitions found in the source code' 36 36 echo 'Examples' 37 echo ' chk_iomput.sh'38 echo ' chk_iomput.sh --help'39 echo ' chk_iomput.sh ../../CONFIG/ORCA2_LIM/EXP00/iodef.xml "../../NEMO/OPA_SRC/ ../../NEMO/LIM_SRC_2/"'37 echo ' ./chk_iomput.sh' 38 echo ' ./chk_iomput.sh --help' 39 echo ' ./chk_iomput.sh ../../CONFIG/ORCA2_LIM/EXP00/iodef.xml "../../NEMO/OPA_SRC/ ../../NEMO/LIM_SRC_2/"' 40 40 echo 41 41 exit ;; … … 59 59 #------------------------------------------------ 60 60 # 61 [ $inxml -eq 1 ] && grep "< *field * id *=" $xmlfile 61 external=$( grep -c "<field_definition.* src=" $xmlfile ) 62 if [ $external -eq 1 ] 63 then 64 xmlfield_def=$( grep "<field_definition.* src=" $xmlfile | sed -e 's/.*src="\([^"]*\)".*/\1/' ) 65 xmlfield_def=$( dirname $xmlfile )/$xmlfield_def 66 else 67 xmlfield_def=$xmlfile 68 fi 69 [ $inxml -eq 1 ] && grep "< *field * id *=" $xmlfield_def 62 70 [ $insrc -eq 1 ] && find $srcdir -name "*.[Ffh]90" -exec grep -iH "^[^\!]*call *iom_put *(" {} \; 63 71 [ $(( $insrc + $inxml )) -ge 1 ] && exit … … 71 79 # list of variables used in "CALL iom_put" 72 80 # 73 varlistsrc=$( find $srcdir -name "*.[Ffh]90" -exec grep -i "^[^\!]*call *iom_put *(" {} \; | sed -e "s/.*iom_put *( *[\"\']\([^\"\']*\)[\"\'] *,.*/\1/" | sort -d ) 81 badvarsrc=$( find $srcdir -name "*.[Ffh]90" -exec grep -i "^[^\!]*call *iom_put *(" {} \; | sed -e "s/.*iom_put *( *[\"\']\([^\"\']*\)[\"\'] *,.*/\1/" | grep -ic iom_put ) 82 if [ $badvarsrc -ne 0 ] 83 then 84 echo "The following call to iom_put cannot be checked" 85 echo 86 find $srcdir -name "*.[Ffh]90" -exec grep -i "^[^\!]*call *iom_put *(" {} \; | sed -e "s/.*iom_put *( *[\"\']\([^\"\']*\)[\"\'] *,.*/\1/" | grep -i iom_put | sort -d 87 echo 88 fi 89 varlistsrc=$( find $srcdir -name "*.[Ffh]90" -exec grep -i "^[^\!]*call *iom_put *(" {} \; | sed -e "s/.*iom_put *( *[\"\']\([^\"\']*\)[\"\'] *,.*/\1/" | grep -vi iom_put | sort -d ) 74 90 # 75 91 # list of variables defined in the xml file 76 92 # 77 varlistxml=$( grep "< *field * id *=" $xmlfile | sed -e "s/^.*< *field* id *= *[\"\']\([^\"\']*\)[\"\'].*/\1/" | sort -d )93 varlistxml=$( grep "< *field.* id *=" $xmlfield_def | sed -e "s/^.*< *field.* id *= *[\"\']\([^\"\']*\)[\"\'].*/\1/" | sort -d ) 78 94 # 79 95 # list of variables to be outputed in the xml file 80 96 # 81 varlistout=$( grep "< *field * ref *=" $xmlfile | sed -e "s/^.*< *field *ref *= *[\"\']\([^\"\']*\)[\"\'].*/\1/" | sort -d )97 varlistout=$( grep "< *field.* field_ref *=" $xmlfile | sed -e "s/^.*< *field.* field_ref *= *[\"\']\([^\"\']*\)[\"\'].*/\1/" | sort -d ) 82 98 # 83 99 echo "--------------------------------------------------" 84 100 echo check if all iom_put found in $srcdir 85 echo have a corresponding variable definition in $xmlfi le101 echo have a corresponding variable definition in $xmlfield_def 86 102 echo "--------------------------------------------------" 87 103 for var in $varlistsrc … … 90 106 if [ $tst -ne 1 ] 91 107 then 92 echo "problem with $var: $tst lines corresponding to its definition in $xmlfi le, but defined in the code in"108 echo "problem with $var: $tst lines corresponding to its definition in $xmlfield_def, but defined in the code in" 93 109 for f in $srclist 94 110 do
Note: See TracChangeset
for help on using the changeset viewer.