- Timestamp:
- May 26, 2016 2:44:07 PM (9 years ago)
- Location:
- palm/trunk
- Files:
-
- 32 edited
- 7 copied
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk
- Property svn:mergeinfo changed
/palm/branches/forwind (added) merged: 1564,1578,1617,1687,1689,1803,1819-1821,1839-1840,1843-1844,1847,1864-1865,1868-1870,1912-1913
- Property svn:mergeinfo changed
-
palm/trunk/EXAMPLES/dvr
- Property svn:mergeinfo changed
/palm/branches/forwind/EXAMPLES/dvr (added) merged: 1578,1617,1689,1803,1819,1839,1843,1864,1868,1912
- Property svn:mergeinfo changed
-
palm/trunk/SCRIPTS/.mrun.config.csc_sisu
r1446 r1914 79 79 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 80 80 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 81 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 81 82 BININ in:loc:flpe d3f $base_data/$fname/RESTART _d3d 82 83 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt … … 104 105 CPU_MEASURES out:loc:tr d3# $base_data/$fname/MONITORING _cpu 105 106 CPU_MEASURES out:loc:tra d3f $base_data/$fname/MONITORING _cpu 107 TURBINE_PARAMETERS01 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters01 108 TURBINE_PARAMETERS02 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters02 109 TURBINE_PARAMETERS03 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters03 110 TURBINE_PARAMETERS04 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters04 106 111 # 107 112 DATA_1D_PR_NETCDF out:loc:tr pr#:prf $base_data/$fname/OUTPUT _pr nc -
palm/trunk/SCRIPTS/.mrun.config.cuhk
r1657 r1914 84 84 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 85 85 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 86 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 86 87 BININ in:loc:flpe d3f $base_data/$fname/RESTART _d3d 87 88 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt … … 109 110 CPU_MEASURES out:loc:tr d3# $base_data/$fname/MONITORING _cpu 110 111 CPU_MEASURES out:loc:tra d3f $base_data/$fname/MONITORING _cpu 112 TURBINE_PARAMETERS01 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters01 113 TURBINE_PARAMETERS02 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters02 114 TURBINE_PARAMETERS03 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters03 115 TURBINE_PARAMETERS04 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters04 111 116 # 112 117 DATA_1D_PR_NETCDF out:loc:tr pr#:prf $base_data/$fname/OUTPUT _pr nc -
palm/trunk/SCRIPTS/.mrun.config.dkrz
r1625 r1914 86 86 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 87 87 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 88 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 88 89 BININ in:loc:flpe d3f $base_data/$fname/RESTART _d3d 89 90 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt … … 111 112 CPU_MEASURES out:loc:tr d3# $base_data/$fname/MONITORING _cpu 112 113 CPU_MEASURES out:loc:tra d3f $base_data/$fname/MONITORING _cpu 114 TURBINE_PARAMETERS01 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters01 115 TURBINE_PARAMETERS02 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters02 116 TURBINE_PARAMETERS03 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters03 117 TURBINE_PARAMETERS04 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters04 113 118 # 114 119 DATA_1D_PR_NETCDF out:loc:tr pr#:prf $base_data/$fname/OUTPUT _pr nc -
palm/trunk/SCRIPTS/.mrun.config.forwind_flow
r1848 r1914 113 113 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 114 114 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 115 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 115 116 BININ in:loc:flpe d3f:rec $base_data/$fname/RESTART _d3d 116 117 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt -
palm/trunk/SCRIPTS/.mrun.config.forwind_hlrnIII
r1547 r1914 137 137 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 138 138 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 139 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 139 140 BININ in:loc:flpe d3f:rec $base_data/$fname/RESTART _d3d 140 141 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt -
palm/trunk/SCRIPTS/.mrun.config.gfortran
r1657 r1914 99 99 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 100 100 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 101 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 101 102 BININ in:loc:flpe d3f $base_data/$fname/RESTART _d3d 102 103 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt … … 124 125 CPU_MEASURES out:loc:tr d3# $base_data/$fname/MONITORING _cpu 125 126 CPU_MEASURES out:loc:tra d3f $base_data/$fname/MONITORING _cpu 127 TURBINE_PARAMETERS01 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters01 128 TURBINE_PARAMETERS02 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters02 129 TURBINE_PARAMETERS03 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters03 130 TURBINE_PARAMETERS04 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters04 126 131 # 127 132 DATA_1D_PR_NETCDF out:loc:tr pr#:prf $base_data/$fname/OUTPUT _pr nc -
palm/trunk/SCRIPTS/.mrun.config.hayaka
r1446 r1914 71 71 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 72 72 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 73 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 73 74 BININ in:loc:flpe d3f $base_data/$fname/RESTART _d3d 74 75 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt … … 96 97 CPU_MEASURES out:loc:tr d3# $base_data/$fname/MONITORING _cpu 97 98 CPU_MEASURES out:loc:tra d3f $base_data/$fname/MONITORING _cpu 99 TURBINE_PARAMETERS01 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters01 100 TURBINE_PARAMETERS02 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters02 101 TURBINE_PARAMETERS03 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters03 102 TURBINE_PARAMETERS04 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters04 98 103 # 99 104 DATA_1D_PR_NETCDF out:loc:tr pr#:prf $base_data/$fname/OUTPUT _pr nc -
palm/trunk/SCRIPTS/.mrun.config.hlrnIII
r1656 r1914 138 138 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 139 139 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 140 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 140 141 BININ in:loc:flpe d3f $base_data/$fname/RESTART _d3d 141 142 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt … … 163 164 CPU_MEASURES out:loc:tr d3# $base_data/$fname/MONITORING _cpu 164 165 CPU_MEASURES out:loc:tra d3f $base_data/$fname/MONITORING _cpu 166 TURBINE_PARAMETERS01 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters01 167 TURBINE_PARAMETERS02 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters02 168 TURBINE_PARAMETERS03 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters03 169 TURBINE_PARAMETERS04 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters04 165 170 # 166 171 DATA_1D_PR_NETCDF out:loc:tr pr#:prf $base_data/$fname/OUTPUT _pr nc -
palm/trunk/SCRIPTS/.mrun.config.ibmh
r1446 r1914 84 84 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 85 85 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 86 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 86 87 BININ in:loc:flpe d3f $base_data/$fname/RESTART _d3d 87 88 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt … … 109 110 CPU_MEASURES out:loc:tr d3# $base_data/$fname/MONITORING _cpu 110 111 CPU_MEASURES out:loc:tra d3f $base_data/$fname/MONITORING _cpu 112 TURBINE_PARAMETERS01 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters01 113 TURBINE_PARAMETERS02 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters02 114 TURBINE_PARAMETERS03 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters03 115 TURBINE_PARAMETERS04 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters04 111 116 # 112 117 DATA_1D_PR_NETCDF out:loc:tr pr#:prf $output_data/$fname/OUTPUT _pr nc -
palm/trunk/SCRIPTS/.mrun.config.ifort
r1657 r1914 99 99 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 100 100 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 101 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 101 102 BININ in:loc:flpe d3f $base_data/$fname/RESTART _d3d 102 103 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt … … 124 125 CPU_MEASURES out:loc:tr d3# $base_data/$fname/MONITORING _cpu 125 126 CPU_MEASURES out:loc:tra d3f $base_data/$fname/MONITORING _cpu 127 TURBINE_PARAMETERS01 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters01 128 TURBINE_PARAMETERS02 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters02 129 TURBINE_PARAMETERS03 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters03 130 TURBINE_PARAMETERS04 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters04 126 131 # 127 132 DATA_1D_PR_NETCDF out:loc:tr pr#:prf $base_data/$fname/OUTPUT _pr nc -
palm/trunk/SCRIPTS/.mrun.config.imuk
r1446 r1914 74 74 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 75 75 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 76 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 76 77 BININ in:loc:flpe d3f $base_data/$fname/RESTART _d3d 77 78 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt … … 99 100 CPU_MEASURES out:loc:tr d3# $base_data/$fname/MONITORING _cpu 100 101 CPU_MEASURES out:loc:tra d3f $base_data/$fname/MONITORING _cpu 102 TURBINE_PARAMETERS01 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters01 103 TURBINE_PARAMETERS02 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters02 104 TURBINE_PARAMETERS03 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters03 105 TURBINE_PARAMETERS04 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters04 101 106 # 102 107 DATA_1D_PR_NETCDF out:loc:tr pr#:prf $base_data/$fname/OUTPUT _pr nc -
palm/trunk/SCRIPTS/.mrun.config.imuk_gpu
r1446 r1914 86 86 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 87 87 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 88 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 88 89 BININ in:loc:flpe d3f $base_data/$fname/RESTART _d3d 89 90 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt … … 111 112 CPU_MEASURES out:loc:tr d3# $base_data/$fname/MONITORING _cpu 112 113 CPU_MEASURES out:loc:tra d3f $base_data/$fname/MONITORING _cpu 114 TURBINE_PARAMETERS01 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters01 115 TURBINE_PARAMETERS02 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters02 116 TURBINE_PARAMETERS03 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters03 117 TURBINE_PARAMETERS04 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters04 113 118 # 114 119 DATA_1D_PR_NETCDF out:loc:tr pr#:prf $base_data/$fname/OUTPUT _pr nc -
palm/trunk/SCRIPTS/.mrun.config.imuk_hlrnIII
r1713 r1914 135 135 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 136 136 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 137 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 137 138 BININ in:loc:flpe d3f $base_data/$fname/RESTART _d3d 138 139 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt … … 160 161 CPU_MEASURES out:loc:tr d3# $base_data/$fname/MONITORING _cpu 161 162 CPU_MEASURES out:loc:tra d3f $base_data/$fname/MONITORING _cpu 163 TURBINE_PARAMETERS01 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters01 164 TURBINE_PARAMETERS02 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters02 165 TURBINE_PARAMETERS03 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters03 166 TURBINE_PARAMETERS04 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters04 162 167 # 163 168 DATA_1D_PR_NETCDF out:loc:tr pr#:prf $base_data/$fname/OUTPUT _pr nc -
palm/trunk/SCRIPTS/.mrun.config.imuk_hlrnIII_rrtmg
r1713 r1914 138 138 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 139 139 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 140 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 140 141 BININ in:loc:flpe d3f $base_data/$fname/RESTART _d3d 141 142 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt … … 163 164 CPU_MEASURES out:loc:tr d3# $base_data/$fname/MONITORING _cpu 164 165 CPU_MEASURES out:loc:tra d3f $base_data/$fname/MONITORING _cpu 166 TURBINE_PARAMETERS01 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters01 167 TURBINE_PARAMETERS02 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters02 168 TURBINE_PARAMETERS03 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters03 169 TURBINE_PARAMETERS04 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters04 165 170 # 166 171 DATA_1D_PR_NETCDF out:loc:tr pr#:prf $base_data/$fname/OUTPUT _pr nc -
palm/trunk/SCRIPTS/.mrun.config.imuknb
r1446 r1914 83 83 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 84 84 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 85 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 85 86 BININ in:loc:flpe d3f $base_data/$fname/RESTART _d3d 86 87 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt … … 108 109 CPU_MEASURES out:loc:tr d3# $base_data/$fname/MONITORING _cpu 109 110 CPU_MEASURES out:loc:tra d3f $base_data/$fname/MONITORING _cpu 111 TURBINE_PARAMETERS01 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters01 112 TURBINE_PARAMETERS02 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters02 113 TURBINE_PARAMETERS03 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters03 114 TURBINE_PARAMETERS04 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters04 110 115 # 111 116 DATA_1D_PR_NETCDF out:loc:tr pr#:prf $base_data/$fname/OUTPUT _pr nc -
palm/trunk/SCRIPTS/.mrun.config.kiaps
r1446 r1914 72 72 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 73 73 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 74 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 74 75 BININ in:loc:flpe d3f $base_data/$fname/RESTART _d3d 75 76 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt … … 97 98 CPU_MEASURES out:loc:tr d3# $base_data/$fname/MONITORING _cpu 98 99 CPU_MEASURES out:loc:tra d3f $base_data/$fname/MONITORING _cpu 100 TURBINE_PARAMETERS01 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters01 101 TURBINE_PARAMETERS02 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters02 102 TURBINE_PARAMETERS03 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters03 103 TURBINE_PARAMETERS04 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters04 99 104 # 100 105 DATA_1D_PR_NETCDF out:loc:tr pr#:prf $base_data/$fname/OUTPUT _pr nc -
palm/trunk/SCRIPTS/.mrun.config.lcxe6
r1446 r1914 95 95 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 96 96 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 97 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 97 98 BININ in:loc:flpe d3f $base_data/$fname/RESTART _d3d 98 99 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt … … 120 121 CPU_MEASURES out:loc:tr d3# $base_data/$fname/MONITORING _cpu 121 122 CPU_MEASURES out:loc:tra d3f $base_data/$fname/MONITORING _cpu 123 TURBINE_PARAMETERS01 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters01 124 TURBINE_PARAMETERS02 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters02 125 TURBINE_PARAMETERS03 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters03 126 TURBINE_PARAMETERS04 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters04 122 127 # 123 128 DATA_1D_PR_NETCDF out:loc:tr pr#:prf $base_data/$fname/OUTPUT _pr nc -
palm/trunk/SCRIPTS/.mrun.config.riam
r1446 r1914 81 81 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 82 82 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 83 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 83 84 BININ in:loc:flpe d3f $base_data/$fname/RESTART _d3d 84 85 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt … … 106 107 CPU_MEASURES out:loc:tr d3# $base_data/$fname/MONITORING _cpu 107 108 CPU_MEASURES out:loc:tra d3f $base_data/$fname/MONITORING _cpu 109 TURBINE_PARAMETERS01 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters01 110 TURBINE_PARAMETERS02 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters02 111 TURBINE_PARAMETERS03 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters03 112 TURBINE_PARAMETERS04 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters04 108 113 # 109 114 DATA_1D_PR_NETCDF out:loc:tr pr#:prf $base_data/$fname/OUTPUT _pr nc -
palm/trunk/SCRIPTS/.mrun.config.tatara
r1446 r1914 70 70 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 71 71 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 72 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 72 73 BININ in:loc:flpe d3f $base_data/$fname/RESTART _d3d 73 74 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt … … 95 96 CPU_MEASURES out:loc:tr d3# $base_data/$fname/MONITORING _cpu 96 97 CPU_MEASURES out:loc:tra d3f $base_data/$fname/MONITORING _cpu 98 TURBINE_PARAMETERS01 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters01 99 TURBINE_PARAMETERS02 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters02 100 TURBINE_PARAMETERS03 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters03 101 TURBINE_PARAMETERS04 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters04 97 102 # 98 103 DATA_1D_PR_NETCDF out:loc:tr pr#:prf $base_data/$fname/OUTPUT _pr nc -
palm/trunk/SCRIPTS/.mrun.config.yonsei2011
r1446 r1914 83 83 NUDGING_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _nudge 84 84 LSF_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _lsf 85 WTM_DATA in:locopt d3#:d3f $base_data/$fname/INPUT _wtm 85 86 BININ in:loc:flpe d3f:rec $base_data/$fname/RESTART _d3d 86 87 PARTICLE_RESTART_DATA_IN in:loc:flpe prtf $base_data/$fname/RESTART _rprt … … 108 109 CPU_MEASURES out:loc:tr d3#:pcr $base_data/$fname/MONITORING _cpu 109 110 CPU_MEASURES out:loc:tra d3f $base_data/$fname/MONITORING _cpu 111 TURBINE_PARAMETERS01 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters01 112 TURBINE_PARAMETERS02 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters02 113 TURBINE_PARAMETERS03 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters03 114 TURBINE_PARAMETERS04 out:loc:tr d3#:d3f $base_data/$fname/MONITORING _turbine_parameters04 110 115 DVRP_LOG out:loc:tr dv# $base_data/$fname/MONITORING _dvrp_log 111 116 DVRP_LOG out:loc:tra dvf $base_data/$fname/MONITORING _dvrp_log -
palm/trunk/SCRIPTS/mrun
r1867 r1914 918 918 919 919 920 921 920 # PROVIDE VALUES OF ENVIRONMENT-VARIABLE FOR interpret_config VIA NAMELIST-FILE 922 921 cat > .mrun_environment << %%END%% … … 927 926 localhost = '$localhost', output_list = '$output_list' / 928 927 928 929 929 %%END%% 930 930 … … 958 958 rm .mrun_environment 959 959 960 961 960 # EXECUTE SHELL-COMMANDS GENERATED BY interpret_config WITHIN THIS SHELL 962 961 chmod u+x $interpreted_config_file … … 966 965 967 966 fi 968 969 967 970 968 # VALUES OF MRUN-OPTIONS OVERWRITE THOSE FROM THE CONFIGURATION-FILE -
palm/trunk/SCRIPTS/subjob
r1867 r1914 907 907 if [[ $numprocs != 0 ]] 908 908 then 909 pe_set="#$ -pe impi $numprocs"910 else 911 pe_set="#$ -pe impi 1"909 pe_set="#$ -pe openmpi $numprocs" 910 else 911 pe_set="#$ -pe openmpi 1" 912 912 fi 913 913 if [[ $queue = default ]] -
palm/trunk/SOURCE
- Property svn:mergeinfo changed
/palm/branches/forwind/SOURCE (added) merged: 1578,1617,1687,1689,1803,1819-1821,1839-1840,1843-1844,1864-1865,1868,1912-1913
- Property svn:mergeinfo changed
-
palm/trunk/SOURCE/Makefile
- Property svn:mergeinfo changed
/palm/branches/forwind/SOURCE/Makefile (added) merged: 1578,1617,1687,1689,1803,1819,1821,1839,1843,1864,1868,1912
r1901 r1914 56 56 # Tails removed. lpm_release_set removed. calc_precipitation, impact_of_latent_heat 57 57 # removed. 58 # 59 # 1819 2016-04-06 21:05:15Z witha 60 # Added wind turbine model and renamed it from wind_turbine_model to 61 # wind_turbine_model_mod 58 62 # 59 63 # 1817 2016-04-06 15:44:20Z maronga … … 330 334 user_parin.f90 user_read_restart_data.f90 \ 331 335 user_spectra.f90 user_statistics.f90 wall_fluxes.f90 \ 332 w rite_3d_binary.f90 write_var_list.f90336 wind_turbine_model_mod.f90 write_3d_binary.f90 write_var_list.f90 333 337 334 338 … … 383 387 check_parameters.o: modules.o mod_kinds.o land_surface_model_mod.o \ 384 388 netcdf_interface_mod.o plant_canopy_model_mod.o pmc_interface_mod.o radiation_model_mod.o \ 385 spectra_mod.o subsidence_mod.o microphysics_mod.o 389 spectra_mod.o subsidence_mod.o microphysics_mod.o wind_turbine_model_mod.o 386 390 close_file.o: modules.o mod_kinds.o netcdf_interface_mod.o 387 391 compute_vpt.o: modules.o mod_kinds.o … … 429 433 lpm_init.o ls_forcing_mod.o netcdf_interface_mod.o plant_canopy_model_mod.o \ 430 434 radiation_model_mod.o random_function_mod.o random_generator_parallel_mod.o \ 431 surface_layer_fluxes_mod.o microphysics_mod.o mod_particle_attributes.o 435 surface_layer_fluxes_mod.o microphysics_mod.o mod_particle_attributes.o \ 436 wind_turbine_model_mod.o 432 437 init_advec.o: modules.o mod_kinds.o 433 438 init_cloud_physics.o: modules.o mod_kinds.o … … 486 491 parin.o: modules.o cpulog_mod.o land_surface_model_mod.o mod_kinds.o netcdf_interface_mod.o \ 487 492 plant_canopy_model_mod.o pmc_interface_mod.o progress_bar_mod.o spectra_mod.o \ 488 radiation_model_mod.o microphysics_mod.o 493 radiation_model_mod.o microphysics_mod.o wind_turbine_model_mod.o 489 494 plant_canopy_model_mod.o: modules.o mod_kinds.o 490 495 pmc_interface_mod.o: modules.o mod_kinds.o pmc_client_mod.o pmc_general_mod.o\ … … 508 513 eqn_state_seawater.o mod_kinds.o microphysics_mod.o \ 509 514 nudging_mod.o plant_canopy_model_mod.o production_e.o radiation_model_mod.o \ 510 subsidence_mod.o user_actions.o 515 subsidence_mod.o user_actions.o wind_turbine_model_mod.o 511 516 progress_bar_mod.o: modules.o mod_kinds.o 512 517 radiation_model_mod.o : modules.o mod_particle_attributes.o microphysics_mod.o … … 536 541 ls_forcing_mod.o mod_kinds.o nudging_mod.o pmc_interface_mod.o production_e.o \ 537 542 prognostic_equations.o progress_bar_mod.o radiation_model_mod.o \ 538 spectra_mod.o user_actions.o surface_layer_fluxes_mod.o microphysics_mod.o 543 spectra_mod.o user_actions.o surface_layer_fluxes_mod.o microphysics_mod.o \ 544 wind_turbine_model_mod.o 539 545 time_to_string.o: mod_kinds.o 540 546 timestep.o: modules.o cpulog_mod.o mod_kinds.o microphysics_mod.o … … 572 578 user_statistics.o: modules.o mod_kinds.o netcdf_interface_mod.o user_module.o 573 579 wall_fluxes.o: modules.o mod_kinds.o 580 wind_turbine_model_mod.o: modules.o cpulog_mod.o mod_kinds.o 574 581 write_3d_binary.o: modules.o cpulog_mod.o mod_kinds.o land_surface_model_mod.o \ 575 582 radiation_model_mod.o random_function_mod.o random_generator_parallel_mod.o \ - Property svn:mergeinfo changed
-
palm/trunk/SOURCE/check_parameters.f90
- Property svn:mergeinfo changed
/palm/branches/forwind/SOURCE/check_parameters.f90 (added) merged: 1578,1617,1687,1689,1803,1819,1839,1843,1864,1868,1912
r1842 r1914 389 389 USE statistics 390 390 USE transpose_indices 391 USE wind_turbine_model_mod, & 392 ONLY: wtm_check_parameters, wind_turbine 391 393 392 394 … … 1057 1059 1058 1060 ! 1061 !-- If wind turbine model is used, perform additional checks 1062 IF ( wind_turbine ) CALL wtm_check_parameters 1063 ! 1059 1064 !-- When radiation model is used, peform addtional checks 1060 1065 IF ( radiation ) CALL radiation_check_parameters 1066 1061 1067 1062 1068 IF ( .NOT. ( loop_optimization == 'cache' .OR. & - Property svn:mergeinfo changed
-
palm/trunk/SOURCE/init_3d_model.f90
- Property svn:mergeinfo changed
/palm/branches/forwind/SOURCE/init_3d_model.f90 (added) merged: 1578,1617,1687,1689,1803,1819,1821,1839-1840,1843,1864,1868,1912
r1879 r1914 37 37 ! nzb_2d replaced by nzb_u|v_inner 38 38 ! 39 ! 1839 2016-04-07 18:48:14Z witha 40 ! Renamed calls for wind turbine model 41 ! 39 42 ! 1833 2016-04-07 14:23:03Z raasch 40 43 ! initialization of spectra quantities moved to spectra_mod … … 50 53 ! icloud_scheme replaced by microphysics_* 51 54 ! 55 ! 1819 2016-04-06 21:05:15Z witha 56 ! Added initialization of the wind turbine model 57 ! 52 58 ! 1817 2016-04-06 15:44:20Z maronga 53 59 ! Renamed lsm calls. … … 331 337 332 338 USE transpose_indices 339 340 USE wind_turbine_model_mod, & 341 ONLY: wtm_init, wtm_init_arrays, wind_turbine 333 342 334 343 IMPLICIT NONE … … 688 697 689 698 ! 699 !-- Allocate wind turbine model arrays 700 IF ( wind_turbine ) THEN 701 CALL wtm_init_arrays 702 ENDIF 703 704 ! 690 705 !-- Allocate arrays containing the RK coefficient for calculation of 691 706 !-- perturbation pressure and turbulent fluxes. At this point values are … … 1675 1690 CALL location_message( 'finished', .TRUE. ) 1676 1691 ENDIF 1692 1693 ! 1694 !-- If required, initialize quantities needed for the wind turbine model 1695 IF ( wind_turbine ) THEN 1696 CALL location_message( 'initializing wind turbine model', .FALSE. ) 1697 CALL wtm_init 1698 CALL location_message( 'finished', .TRUE. ) 1699 ENDIF 1700 1677 1701 1678 1702 ! - Property svn:mergeinfo changed
-
palm/trunk/SOURCE/package_parin.f90
r1872 r1914 28 28 ! Initialization of aerosols added. 29 29 ! 30 ! 1839 2016-04-07 18:48:14Z witha 31 ! Reading of &wind_turbine_par moved to wind_turbine_model_mod 32 ! 30 33 ! 1833 2016-04-07 14:23:03Z raasch 31 34 ! reading of spectra_par moved to spectra_mod … … 41 44 ! +collision_algorithm 42 45 ! Tails removed. 46 47 ! 1819 2016-04-06 21:05:15Z witha 48 ! Added namelist for wind turbine model 43 49 ! 44 50 ! 1817 2016-04-06 15:44:20Z maronga -
palm/trunk/SOURCE/parin.f90
r1879 r1914 27 27 ! 1849 2016-04-08 11:33:18Z hoffmann 28 28 ! Adapted for modularization of microphysics 29 ! 30 ! 1839 2016-04-07 18:48:14Z witha 31 ! Added call to wind turbine model for reading of &wind_turbine_par 29 32 ! 30 33 ! 1833 2016-04-07 14:23:03Z raasch … … 259 262 USE statistics, & 260 263 ONLY: hom, hom_sum, pr_palm, region, statistic_regions 264 265 USE wind_turbine_model_mod, & 266 ONLY: wtm_parin 261 267 262 268 … … 504 510 505 511 ! 512 !-- Check if wind turbine model is used and read &wind_turbine_par if 513 !-- required 514 CALL wtm_parin 515 516 ! 506 517 !-- Read user-defined variables 507 518 CALL user_parin -
palm/trunk/SOURCE/prognostic_equations.f90
r1875 r1914 28 28 ! Module renamed (removed _mod) 29 29 ! 30 !31 30 ! 1850 2016-04-08 13:29:27Z maronga 32 31 ! Module renamed 33 !34 32 ! 35 33 ! 1826 2016-04-07 12:01:39Z maronga … … 38 36 ! 1822 2016-04-07 07:49:42Z hoffmann 39 37 ! Kessler microphysics scheme moved to microphysics. 38 39 ! 1819 2016-04-06 21:05:15Z witha 40 ! Added calls for wind turbine model 40 41 ! 41 42 ! 1757 2016-02-22 15:49:32Z maronga … … 313 314 ONLY: user_actions 314 315 316 USE wind_turbine_model_mod, & 317 ONLY: wind_turbine, wtm_tendencies 318 315 319 316 320 PRIVATE … … 428 432 IF ( nudging ) CALL nudge( i, j, simulated_time, 'u' ) 429 433 434 ! 435 !-- Forces by wind turbines 436 IF ( wind_turbine ) CALL wtm_tendencies( i, j, 1 ) 437 430 438 CALL user_actions( i, j, 'u-tendency' ) 431 439 ! … … 487 495 IF ( nudging ) CALL nudge( i, j, simulated_time, 'v' ) 488 496 497 ! 498 !-- Forces by wind turbines 499 IF ( wind_turbine ) CALL wtm_tendencies( i, j, 2 ) 500 489 501 CALL user_actions( i, j, 'v-tendency' ) 490 502 ! … … 543 555 !-- Drag by plant canopy 544 556 IF ( plant_canopy ) CALL pcm_tendency( i, j, 3 ) 557 558 ! 559 !-- Forces by wind turbines 560 IF ( wind_turbine ) CALL wtm_tendencies( i, j, 3 ) 545 561 546 562 CALL user_actions( i, j, 'w-tendency' ) … … 1011 1027 IF ( nudging ) CALL nudge( simulated_time, 'u' ) 1012 1028 1029 ! 1030 !-- Forces by wind turbines 1031 IF ( wind_turbine ) CALL wtm_tendencies( 1 ) 1032 1013 1033 CALL user_actions( 'u-tendency' ) 1014 1034 … … 1087 1107 IF ( nudging ) CALL nudge( simulated_time, 'v' ) 1088 1108 1109 ! 1110 !-- Forces by wind turbines 1111 IF ( wind_turbine ) CALL wtm_tendencies( 2 ) 1112 1089 1113 CALL user_actions( 'v-tendency' ) 1090 1114 … … 1158 1182 !-- Drag by plant canopy 1159 1183 IF ( plant_canopy ) CALL pcm_tendency( 3 ) 1184 1185 ! 1186 !-- Forces by wind turbines 1187 IF ( wind_turbine ) CALL wtm_tendencies( 3 ) 1160 1188 1161 1189 CALL user_actions( 'w-tendency' ) … … 1847 1875 IF ( nudging ) CALL nudge( simulated_time, 'u' ) 1848 1876 1877 ! 1878 !-- Forces by wind turbines 1879 IF ( wind_turbine ) CALL wtm_tendencies( 1 ) 1880 1849 1881 CALL user_actions( 'u-tendency' ) 1850 1882 … … 1914 1946 IF ( nudging ) CALL nudge( simulated_time, 'v' ) 1915 1947 1948 ! 1949 !-- Forces by wind turbines 1950 IF ( wind_turbine ) CALL wtm_tendencies( 2 ) 1951 1916 1952 CALL user_actions( 'v-tendency' ) 1917 1953 … … 1976 2012 !-- Drag by plant canopy 1977 2013 IF ( plant_canopy ) CALL pcm_tendency( 3 ) 2014 2015 ! 2016 !-- Forces by wind turbines 2017 IF ( wind_turbine ) CALL wtm_tendencies( 3 ) 1978 2018 1979 2019 CALL user_actions( 'w-tendency' ) -
palm/trunk/SOURCE/time_integration.f90
r1879 r1914 42 42 ! 1822 2016-04-07 07:49:42Z hoffmann 43 43 ! icloud_scheme replaced by microphysics_* 44 ! 45 ! 1819 2016-04-06 21:05:15Z witha 46 ! Added call for wind turbine model and moved it 44 47 ! 45 48 ! 1808 2016-04-05 19:44:00Z raasch … … 316 319 ONLY: user_actions 317 320 321 USE wind_turbine_model_mod, & 322 ONLY: wind_turbine, wtm_forces 323 318 324 IMPLICIT NONE 319 325 … … 405 411 CALL user_actions( 'before_timestep' ) 406 412 413 ! 414 !-- Calculate forces by wind turbines 415 IF ( wind_turbine ) THEN 416 417 CALL cpu_log( log_point(55), 'wind_turbine', 'start' ) 418 419 CALL wtm_forces 420 421 CALL cpu_log( log_point(55), 'wind_turbine', 'stop' ) 422 423 ENDIF 424 407 425 ! 408 426 !-- Start of intermediate step loop
Note: See TracChangeset
for help on using the changeset viewer.